From: <hug...@li...> - 2010-12-27 12:33:46
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/29004b2165f6 changeset: 4754:29004b2165f6 user: Yuval Levy <yu...@us...> date: Mon Dec 27 07:33:42 2010 -0500 description: removed optimize everything option from optimizer diffstat: src/hugin1/hugin/OptimizePanel.cpp | 17 +---------------- src/hugin1/hugin/xrc/optimize_panel.xrc | 1 - 2 files changed, 1 insertions(+), 17 deletions(-) diffs (45 lines): diff -r 94bd3d0f2012 -r 29004b2165f6 src/hugin1/hugin/OptimizePanel.cpp --- a/src/hugin1/hugin/OptimizePanel.cpp Sun Dec 26 20:35:50 2010 -0500 +++ b/src/hugin1/hugin/OptimizePanel.cpp Mon Dec 27 07:33:42 2010 -0500 @@ -94,7 +94,7 @@ // local optimize definition. need to be in sync with the xrc file enum OptimizeMode { OPT_PAIRWISE=0, OPT_YRP, OPT_YRP_XYZ, OPT_YRP_V, OPT_YRP_XYZ_V, - OPT_YRP_B, OPT_YRP_XYZ_B, OPT_YRP_BV, OPT_YRP_XYZ_BV, OPT_ALL_NOTXYZ, OPT_ALL, OPT_CUSTOM, + OPT_YRP_B, OPT_YRP_XYZ_B, OPT_YRP_BV, OPT_YRP_XYZ_BV, OPT_ALL_NOTXYZ, OPT_CUSTOM, OPT_END_MARKER}; OptimizePanel::OptimizePanel() @@ -950,21 +950,6 @@ SetCheckMark(m_d_list,false); SetCheckMark(m_e_list,false); break; - case OPT_ALL_NOTXYZ: - // everything - SetCheckMark(m_yaw_list,true); - SetCheckMark(m_roll_list,true); - SetCheckMark(m_pitch_list,true); - SetCheckMark(m_x_list,false); - SetCheckMark(m_y_list,false); - SetCheckMark(m_z_list,false); - SetCheckMark(m_v_list,true); - SetCheckMark(m_a_list,true); - SetCheckMark(m_b_list,true); - SetCheckMark(m_c_list,true); - SetCheckMark(m_d_list,true); - SetCheckMark(m_e_list,true); - break; case OPT_ALL: // everything SetCheckMark(m_yaw_list,true); diff -r 94bd3d0f2012 -r 29004b2165f6 src/hugin1/hugin/xrc/optimize_panel.xrc --- a/src/hugin1/hugin/xrc/optimize_panel.xrc Sun Dec 26 20:35:50 2010 -0500 +++ b/src/hugin1/hugin/xrc/optimize_panel.xrc Mon Dec 27 07:33:42 2010 -0500 @@ -45,7 +45,6 @@ <item>Positions, View and Barrel (y,p,r,v,b)</item> <item>Positions, Translation, View and Barrel (y,p,r,x,y,z,v,b)</item> <item>Everything without translation</item> - <item>Everything</item> <item>the Custom parameters below</item> </content> <selection>0</selection> |