From: <tm...@us...> - 2009-07-27 05:26:10
|
Revision: 4112 http://hugin.svn.sourceforge.net/hugin/?rev=4112&view=rev Author: tmodes Date: 2009-07-27 05:25:59 +0000 (Mon, 27 Jul 2009) Log Message: ----------- Added option to select which preview window is used after align Modified Paths: -------------- hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp hugin/trunk/src/hugin1/hugin/PreferencesDialog.cpp hugin/trunk/src/hugin1/hugin/xrc/pref_dialog.xrc Modified: hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp 2009-07-27 05:24:38 UTC (rev 4111) +++ hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp 2009-07-27 05:25:59 UTC (rev 4112) @@ -721,7 +721,16 @@ // show preview frame wxCommandEvent dummy; - MainFrame::Get()->OnToggleGLPreviewFrame(dummy); + long preview=wxConfigBase::Get()->Read(wxT("/Assistant/PreviewWindow"),1l); + switch(preview) + { + case 1: + MainFrame::Get()->OnToggleGLPreviewFrame(dummy); + break; + case 2: + MainFrame::Get()->OnTogglePreviewFrame(dummy); + break; + }; // enable stitch button m_createButton->Enable(); Modified: hugin/trunk/src/hugin1/hugin/PreferencesDialog.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/PreferencesDialog.cpp 2009-07-27 05:24:38 UTC (rev 4111) +++ hugin/trunk/src/hugin1/hugin/PreferencesDialog.cpp 2009-07-27 05:25:59 UTC (rev 4112) @@ -647,6 +647,7 @@ wxT(HUGIN_STITCHER_EDITOR))); MY_STR_VAL("prefs_ass_editor_args", cfg->Read(wxT("/Stitcher/EditorArgs"), wxT(HUGIN_STITCHER_EDITOR_ARGS))); + MY_CHOICE_VAL("prefs_ass_preview", cfg->Read(wxT("/Assistant/PreviewWindow"), 1l)); } // Fine tune settings @@ -794,6 +795,7 @@ cfg->Write(wxT("/Stitcher/RunEditor"), HUGIN_STITCHER_RUN_EDITOR); cfg->Write(wxT("/Stitcher/Editor"), wxT(HUGIN_STITCHER_EDITOR)); cfg->Write(wxT("/Stitcher/EditorArgs"), wxT(HUGIN_STITCHER_EDITOR_ARGS)); + cfg->Write(wxT("/Assistant/PreviewWindow"), 1l); } if (noteb->GetSelection() == 2) { // hdr @@ -862,6 +864,7 @@ cfg->Write(wxT("/Assistant/autoAlign"),MY_G_BOOL_VAL("prefs_ass_autoAlign")); cfg->Write(wxT("/Assistant/nControlPoints"), MY_G_SPIN_VAL("prefs_ass_nControlPoints")); cfg->Write(wxT("/Assistant/panoDownsizeFactor"), MY_G_SPIN_VAL("prefs_ass_panoDownsizeFactor") / 100.0); + cfg->Write(wxT("/Assistant/PreviewWindow"), MY_G_CHOICE_VAL("prefs_ass_preview")); // editor cfg->Write(wxT("/Stitcher/RunEditor"), MY_G_BOOL_VAL("prefs_ass_run_editor")); cfg->Write(wxT("/Stitcher/Editor"), MY_G_STR_VAL("prefs_ass_editor")); Modified: hugin/trunk/src/hugin1/hugin/xrc/pref_dialog.xrc =================================================================== --- hugin/trunk/src/hugin1/hugin/xrc/pref_dialog.xrc 2009-07-27 05:24:38 UTC (rev 4111) +++ hugin/trunk/src/hugin1/hugin/xrc/pref_dialog.xrc 2009-07-27 05:25:59 UTC (rev 4112) @@ -236,6 +236,53 @@ <border>5</border> </object> <object class="sizeritem"> + <object class="wxStaticBoxSizer"> + <label>Show Preview</label> + <orient>wxVERTICAL</orient> + <object class="sizeritem"> + <object class="wxBoxSizer"> + <object class="sizeritem"> + <object class="wxBoxSizer"> + <orient>wxHORIZONTAL</orient> + <object class="sizeritem"> + <object class="wxStaticText"> + <label>After align open</label> + </object> + <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> + <border>5</border> + </object> + <object class="sizeritem"> + <object class="wxChoice" name="prefs_ass_preview"> + <content> + <item>Nothing</item> + <item>Fast Preview window</item> + <item>Preview window</item> + </content> + </object> + <flag>wxLEFT|wxRIGHT|wxEXPAND</flag> + <border>5</border> + </object> + </object> + <flag>wxEXPAND</flag> + </object> + <orient>wxVERTICAL</orient> + <object class="sizeritem"> + <object class="wxStaticText"> + <label>Use Fast Preview window for general use, +for HDR panoramas use Preview window.</label> + </object> + <flag>wxALL|wxEXPAND</flag> + <border>5</border> + </object> + </object> + <flag>wxEXPAND</flag> + <border>5</border> + </object> + </object> + <flag>wxALL|wxEXPAND</flag> + <border>5</border> + </object> + <object class="sizeritem"> <object class="wxPanel"> <object class="wxStaticBoxSizer"> <label>Create</label> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |