Menu
▾
▴
[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Optimizer tab: added toggles to tick/...
|
From: <hug...@li...> - 2010-12-26 18:28:45
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/07772186a685 changeset: 4750:07772186a685 user: Yuval Levy <yu...@us...> date: Sun Dec 26 13:28:34 2010 -0500 description: Optimizer tab: added toggles to tick/untick all v a b c d e parameters diffstat: src/hugin1/hugin/OptimizePanel.cpp | 73 ++++++++++++ src/hugin1/hugin/xrc/optimize_panel.xrc | 193 ++++++++++++++++++++++++++++++++ 2 files changed, 266 insertions(+), 0 deletions(-) diffs (437 lines): diff -r 658b7fa9c08f -r 07772186a685 src/hugin1/hugin/OptimizePanel.cpp --- a/src/hugin1/hugin/OptimizePanel.cpp Sun Dec 26 12:51:16 2010 -0500 +++ b/src/hugin1/hugin/OptimizePanel.cpp Sun Dec 26 13:28:34 2010 -0500 @@ -63,6 +63,18 @@ EVT_BUTTON(XRCID("opt_y_clear"), OptimizePanel::OnListButton) EVT_BUTTON(XRCID("opt_z_select"), OptimizePanel::OnListButton) EVT_BUTTON(XRCID("opt_z_clear"), OptimizePanel::OnListButton) + EVT_BUTTON(XRCID("opt_v_select"), OptimizePanel::OnListButton) + EVT_BUTTON(XRCID("opt_v_clear"), OptimizePanel::OnListButton) + EVT_BUTTON(XRCID("opt_a_select"), OptimizePanel::OnListButton) + EVT_BUTTON(XRCID("opt_a_clear"), OptimizePanel::OnListButton) + EVT_BUTTON(XRCID("opt_b_select"), OptimizePanel::OnListButton) + EVT_BUTTON(XRCID("opt_b_clear"), OptimizePanel::OnListButton) + EVT_BUTTON(XRCID("opt_c_select"), OptimizePanel::OnListButton) + EVT_BUTTON(XRCID("opt_c_clear"), OptimizePanel::OnListButton) + EVT_BUTTON(XRCID("opt_d_select"), OptimizePanel::OnListButton) + EVT_BUTTON(XRCID("opt_d_clear"), OptimizePanel::OnListButton) + EVT_BUTTON(XRCID("opt_e_select"), OptimizePanel::OnListButton) + EVT_BUTTON(XRCID("opt_e_clear"), OptimizePanel::OnListButton) EVT_CHOICE(XRCID("optimize_panel_mode"), OptimizePanel::OnChangeMode) // EVT_BUTTON(XRCID("opt_roll_equalize"), OptimizePanel::OnEqRoll) @@ -209,6 +221,31 @@ SetCheckMark(m_z_list,true); } else if (e.GetId() == XRCID("opt_z_clear")) { SetCheckMark(m_z_list,false); + } else if (e.GetId() == XRCID("opt_v_select")) { + SetCheckMark(m_v_list,true); + } else if (e.GetId() == XRCID("opt_v_clear")) { + SetCheckMark(m_v_list,false); + } else if (e.GetId() == XRCID("opt_a_select")) { + SetCheckMark(m_a_list,true); + } else if (e.GetId() == XRCID("opt_a_clear")) { + SetCheckMark(m_a_list,false); + } else if (e.GetId() == XRCID("opt_b_select")) { + SetCheckMark(m_b_list,true); + } else if (e.GetId() == XRCID("opt_b_clear")) { + SetCheckMark(m_b_list,false); + } else if (e.GetId() == XRCID("opt_c_select")) { + SetCheckMark(m_c_list,true); + } else if (e.GetId() == XRCID("opt_c_clear")) { + SetCheckMark(m_c_list,false); + } else if (e.GetId() == XRCID("opt_d_select")) { + SetCheckMark(m_d_list,true); + } else if (e.GetId() == XRCID("opt_d_clear")) { + SetCheckMark(m_d_list,false); + } else if (e.GetId() == XRCID("opt_e_select")) { + SetCheckMark(m_e_list,true); + } else if (e.GetId() == XRCID("opt_e_clear")) { + SetCheckMark(m_e_list,false); + } else { DEBUG_FATAL("An error has occured"); } @@ -758,12 +795,24 @@ XRCCTRL(*this, "opt_x_select", wxButton)->Disable(); XRCCTRL(*this, "opt_y_select", wxButton)->Disable(); XRCCTRL(*this, "opt_z_select", wxButton)->Disable(); + XRCCTRL(*this, "opt_v_select", wxButton)->Disable(); + XRCCTRL(*this, "opt_a_select", wxButton)->Disable(); + XRCCTRL(*this, "opt_b_select", wxButton)->Disable(); + XRCCTRL(*this, "opt_c_select", wxButton)->Disable(); + XRCCTRL(*this, "opt_d_select", wxButton)->Disable(); + XRCCTRL(*this, "opt_e_select", wxButton)->Disable(); XRCCTRL(*this, "opt_yaw_clear", wxButton)->Disable(); XRCCTRL(*this, "opt_roll_clear", wxButton)->Disable(); XRCCTRL(*this, "opt_pitch_clear", wxButton)->Disable(); XRCCTRL(*this, "opt_x_clear", wxButton)->Disable(); XRCCTRL(*this, "opt_y_clear", wxButton)->Disable(); XRCCTRL(*this, "opt_z_clear", wxButton)->Disable(); + XRCCTRL(*this, "opt_v_clear", wxButton)->Disable(); + XRCCTRL(*this, "opt_a_clear", wxButton)->Disable(); + XRCCTRL(*this, "opt_b_clear", wxButton)->Disable(); + XRCCTRL(*this, "opt_c_clear", wxButton)->Disable(); + XRCCTRL(*this, "opt_d_clear", wxButton)->Disable(); + XRCCTRL(*this, "opt_e_clear", wxButton)->Disable(); } else { switch (mode) { case OPT_PAIRWISE: @@ -1034,12 +1083,24 @@ XRCCTRL(*this, "opt_x_select", wxButton)->Disable(); XRCCTRL(*this, "opt_y_select", wxButton)->Disable(); XRCCTRL(*this, "opt_z_select", wxButton)->Disable(); + XRCCTRL(*this, "opt_v_select", wxButton)->Disable(); + XRCCTRL(*this, "opt_a_select", wxButton)->Disable(); + XRCCTRL(*this, "opt_b_select", wxButton)->Disable(); + XRCCTRL(*this, "opt_c_select", wxButton)->Disable(); + XRCCTRL(*this, "opt_d_select", wxButton)->Disable(); + XRCCTRL(*this, "opt_e_select", wxButton)->Disable(); XRCCTRL(*this, "opt_yaw_clear", wxButton)->Disable(); XRCCTRL(*this, "opt_roll_clear", wxButton)->Disable(); XRCCTRL(*this, "opt_pitch_clear", wxButton)->Disable(); XRCCTRL(*this, "opt_x_clear", wxButton)->Disable(); XRCCTRL(*this, "opt_y_clear", wxButton)->Disable(); XRCCTRL(*this, "opt_z_clear", wxButton)->Disable(); + XRCCTRL(*this, "opt_v_clear", wxButton)->Disable(); + XRCCTRL(*this, "opt_a_clear", wxButton)->Disable(); + XRCCTRL(*this, "opt_b_clear", wxButton)->Disable(); + XRCCTRL(*this, "opt_c_clear", wxButton)->Disable(); + XRCCTRL(*this, "opt_d_clear", wxButton)->Disable(); + XRCCTRL(*this, "opt_e_clear", wxButton)->Disable(); } else { m_yaw_list->Enable(); m_pitch_list->Enable(); @@ -1059,12 +1120,24 @@ XRCCTRL(*this, "opt_x_select", wxButton)->Enable(); XRCCTRL(*this, "opt_y_select", wxButton)->Enable(); XRCCTRL(*this, "opt_z_select", wxButton)->Enable(); + XRCCTRL(*this, "opt_v_select", wxButton)->Enable(); + XRCCTRL(*this, "opt_a_select", wxButton)->Enable(); + XRCCTRL(*this, "opt_b_select", wxButton)->Enable(); + XRCCTRL(*this, "opt_c_select", wxButton)->Enable(); + XRCCTRL(*this, "opt_d_select", wxButton)->Enable(); + XRCCTRL(*this, "opt_e_select", wxButton)->Enable(); XRCCTRL(*this, "opt_yaw_clear", wxButton)->Enable(); XRCCTRL(*this, "opt_roll_clear", wxButton)->Enable(); XRCCTRL(*this, "opt_pitch_clear", wxButton)->Enable(); XRCCTRL(*this, "opt_x_clear", wxButton)->Enable(); XRCCTRL(*this, "opt_y_clear", wxButton)->Enable(); XRCCTRL(*this, "opt_z_clear", wxButton)->Enable(); + XRCCTRL(*this, "opt_v_clear", wxButton)->Enable(); + XRCCTRL(*this, "opt_a_clear", wxButton)->Enable(); + XRCCTRL(*this, "opt_b_clear", wxButton)->Enable(); + XRCCTRL(*this, "opt_c_clear", wxButton)->Enable(); + XRCCTRL(*this, "opt_d_clear", wxButton)->Enable(); + XRCCTRL(*this, "opt_e_clear", wxButton)->Enable(); } } m_edit_cb->Enable(mode != OPT_PAIRWISE); diff -r 658b7fa9c08f -r 07772186a685 src/hugin1/hugin/xrc/optimize_panel.xrc --- a/src/hugin1/hugin/xrc/optimize_panel.xrc Sun Dec 26 12:51:16 2010 -0500 +++ b/src/hugin1/hugin/xrc/optimize_panel.xrc Sun Dec 26 13:28:34 2010 -0500 @@ -335,6 +335,7 @@ <option>1</option> <flag>wxEXPAND</flag> </object> + <object class="sizeritem"> <object class="wxBoxSizer"> <orient>wxVERTICAL</orient> @@ -377,6 +378,7 @@ <option>1</option> <flag>wxEXPAND</flag> </object> + </object> <option>1</option> <flag>wxLEFT|wxEXPAND</flag> @@ -386,6 +388,7 @@ <option>3</option> <flag>wxEXPAND</flag> </object> + <object class="sizeritem"> <object class="wxBoxSizer"> <orient>wxVERTICAL</orient> @@ -407,6 +410,7 @@ </object> <object class="sizeritem"> <object class="wxGridSizer"> + <object class="sizeritem"> <object class="wxBoxSizer"> <orient>wxVERTICAL</orient> @@ -420,13 +424,53 @@ <content/> </object> <option>1</option> + + + <flag>wxALL|wxEXPAND</flag> + <border>3</border> + </object> + <object class="sizeritem"> + <object class="wxGridSizer"> + <object class="sizeritem"> + <object class="wxBitmapButton" name="opt_v_select"> + <bitmap stock_id="wxART_TICK_MARK"></bitmap> + </object> + <flag>wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL|wxALIGN_CENTRE_HORIZONTAL</flag> + <border>3</border> + </object> + <object class="sizeritem"> + <object class="wxBitmapButton" name="opt_v_clear"> + <bitmap stock_id="wxART_CROSS_MARK"></bitmap> + </object> + <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL|wxALIGN_CENTRE_HORIZONTAL</flag> + <border>3</border> + </object> + <cols>2</cols> + <rows>1</rows> + <hgap>12</hgap> + </object> + <flag>wxALIGN_CENTRE_HORIZONTAL</flag> + + + +<!-- <flag>wxEXPAND</flag> <minsize>60,40</minsize> +--> </object> </object> <option>1</option> <flag>wxEXPAND</flag> </object> + + + + + + + + + <object class="sizeritem"> <object class="wxBoxSizer"> <orient>wxVERTICAL</orient> @@ -440,13 +484,43 @@ <content/> </object> <option>1</option> + + <flag>wxALL|wxEXPAND</flag> + <border>3</border> + </object> + <object class="sizeritem"> + <object class="wxGridSizer"> + <object class="sizeritem"> + <object class="wxBitmapButton" name="opt_a_select"> + <bitmap stock_id="wxART_TICK_MARK"></bitmap> + </object> + <flag>wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL|wxALIGN_CENTRE_HORIZONTAL</flag> + <border>3</border> + </object> + <object class="sizeritem"> + <object class="wxBitmapButton" name="opt_a_clear"> + <bitmap stock_id="wxART_CROSS_MARK"></bitmap> + </object> + <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL|wxALIGN_CENTRE_HORIZONTAL</flag> + <border>3</border> + </object> + <cols>2</cols> + <rows>1</rows> + <hgap>12</hgap> + </object> + <flag>wxALIGN_CENTRE_HORIZONTAL</flag> + + +<!-- <flag>wxEXPAND</flag> <minsize>60,40</minsize> +--> </object> </object> <option>1</option> <flag>wxEXPAND</flag> </object> + <object class="sizeritem"> <object class="wxBoxSizer"> <orient>wxVERTICAL</orient> @@ -460,13 +534,43 @@ <content/> </object> <option>1</option> + + <flag>wxALL|wxEXPAND</flag> + <border>3</border> + </object> + <object class="sizeritem"> + <object class="wxGridSizer"> + <object class="sizeritem"> + <object class="wxBitmapButton" name="opt_b_select"> + <bitmap stock_id="wxART_TICK_MARK"></bitmap> + </object> + <flag>wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL|wxALIGN_CENTRE_HORIZONTAL</flag> + <border>3</border> + </object> + <object class="sizeritem"> + <object class="wxBitmapButton" name="opt_b_clear"> + <bitmap stock_id="wxART_CROSS_MARK"></bitmap> + </object> + <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL|wxALIGN_CENTRE_HORIZONTAL</flag> + <border>3</border> + </object> + <cols>2</cols> + <rows>1</rows> + <hgap>12</hgap> + </object> + <flag>wxALIGN_CENTRE_HORIZONTAL</flag> + + +<!-- <flag>wxEXPAND</flag> <minsize>60,40</minsize> +--> </object> </object> <option>1</option> <flag>wxEXPAND</flag> </object> + <object class="sizeritem"> <object class="wxBoxSizer"> <orient>wxVERTICAL</orient> @@ -480,13 +584,43 @@ <content/> </object> <option>1</option> + + <flag>wxALL|wxEXPAND</flag> + <border>3</border> + </object> + <object class="sizeritem"> + <object class="wxGridSizer"> + <object class="sizeritem"> + <object class="wxBitmapButton" name="opt_c_select"> + <bitmap stock_id="wxART_TICK_MARK"></bitmap> + </object> + <flag>wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL|wxALIGN_CENTRE_HORIZONTAL</flag> + <border>3</border> + </object> + <object class="sizeritem"> + <object class="wxBitmapButton" name="opt_c_clear"> + <bitmap stock_id="wxART_CROSS_MARK"></bitmap> + </object> + <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL|wxALIGN_CENTRE_HORIZONTAL</flag> + <border>3</border> + </object> + <cols>2</cols> + <rows>1</rows> + <hgap>12</hgap> + </object> + <flag>wxALIGN_CENTRE_HORIZONTAL</flag> + + +<!-- <flag>wxEXPAND</flag> <minsize>60,40</minsize> +--> </object> </object> <option>1</option> <flag>wxEXPAND</flag> </object> + <object class="sizeritem"> <object class="wxBoxSizer"> <orient>wxVERTICAL</orient> @@ -500,13 +634,42 @@ <content/> </object> <option>1</option> + + <flag>wxALL|wxEXPAND</flag> + <border>3</border> + </object> + <object class="sizeritem"> + <object class="wxGridSizer"> + <object class="sizeritem"> + <object class="wxBitmapButton" name="opt_d_select"> + <bitmap stock_id="wxART_TICK_MARK"></bitmap> + </object> + <flag>wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL|wxALIGN_CENTRE_HORIZONTAL</flag> + <border>3</border> + </object> + <object class="sizeritem"> + <object class="wxBitmapButton" name="opt_d_clear"> + <bitmap stock_id="wxART_CROSS_MARK"></bitmap> + </object> + <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL|wxALIGN_CENTRE_HORIZONTAL</flag> + <border>3</border> + </object> + <cols>2</cols> + <rows>1</rows> + <hgap>12</hgap> + </object> + <flag>wxALIGN_CENTRE_HORIZONTAL</flag> + +<!-- <flag>wxEXPAND</flag> <minsize>60,40</minsize> +--> </object> </object> <option>1</option> <flag>wxEXPAND</flag> </object> + <object class="sizeritem"> <object class="wxBoxSizer"> <orient>wxVERTICAL</orient> @@ -520,13 +683,43 @@ <content/> </object> <option>1</option> + + <flag>wxALL|wxEXPAND</flag> + <border>3</border> + </object> + <object class="sizeritem"> + <object class="wxGridSizer"> + <object class="sizeritem"> + <object class="wxBitmapButton" name="opt_e_select"> + <bitmap stock_id="wxART_TICK_MARK"></bitmap> + </object> + <flag>wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL|wxALIGN_CENTRE_HORIZONTAL</flag> + <border>3</border> + </object> + <object class="sizeritem"> + <object class="wxBitmapButton" name="opt_e_clear"> + <bitmap stock_id="wxART_CROSS_MARK"></bitmap> + </object> + <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL|wxALIGN_CENTRE_HORIZONTAL</flag> + <border>3</border> + </object> + <cols>2</cols> + <rows>1</rows> + <hgap>12</hgap> + </object> + <flag>wxALIGN_CENTRE_HORIZONTAL</flag> + + +<!-- <flag>wxEXPAND</flag> <minsize>60,40</minsize> +--> </object> </object> <option>1</option> <flag>wxEXPAND</flag> </object> + <cols>6</cols> <rows>1</rows> <vgap>6</vgap> |