From: <da...@us...> - 2008-02-13 22:05:17
|
Revision: 2834 http://hugin.svn.sourceforge.net/hugin/?rev=2834&view=rev Author: dangelo Date: 2008-02-13 14:05:16 -0800 (Wed, 13 Feb 2008) Log Message: ----------- slightly better distribution of options in preferences dialog Modified Paths: -------------- hugin/trunk/src/hugin1/hugin/PreferencesDialog.cpp hugin/trunk/src/hugin1/hugin/xrc/pref_dialog.xrc Modified: hugin/trunk/src/hugin1/hugin/PreferencesDialog.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/PreferencesDialog.cpp 2008-02-13 22:03:46 UTC (rev 2833) +++ hugin/trunk/src/hugin1/hugin/PreferencesDialog.cpp 2008-02-13 22:05:16 UTC (rev 2834) @@ -598,6 +598,11 @@ wxT(HUGIN_STITCHER_EDITOR_ARGS))); // Fine tune settings + + // hdr display settings + MY_CHOICE_VAL("prefs_misc_hdr_mapping", cfg->Read(wxT("/ImageCache/Mapping"), HUGIN_IMGCACHE_MAPPING_FLOAT)); + //MY_CHOICE_VAL("prefs_misc_hdr_range", cfg->Read(wxT("/ImageCache/Range"), HUGIN_IMGCACHE_RANGE)); + MY_SPIN_VAL("prefs_ft_TemplateSize", cfg->Read(wxT("/Finetune/TemplateSize"),HUGIN_FT_TEMPLATE_SIZE)); MY_SPIN_VAL("prefs_ft_SearchAreaPercent",cfg->Read(wxT("/Finetune/SearchAreaPercent"), @@ -664,11 +669,7 @@ DEBUG_WARN("Unknown language configured"); } - // hdr display settings - MY_CHOICE_VAL("prefs_misc_hdr_mapping", cfg->Read(wxT("/ImageCache/Mapping"), HUGIN_IMGCACHE_MAPPING_FLOAT)); -// MY_CHOICE_VAL("prefs_misc_hdr_range", cfg->Read(wxT("/ImageCache/Range"), HUGIN_IMGCACHE_RANGE)); - // cursor setting // mem = cfg->Read(wxT("/CPImageCtrl/CursorType"), HUGIN_CP_CURSOR); // MY_SPIN_VAL("prefs_cp_CursorType", mem); @@ -752,9 +753,19 @@ if ( really == wxYES) { if (noteb->GetSelection() == 0) { - cfg->Write(wxT("/PTmender/Exe"), wxT(HUGIN_PT_MENDER_EXE) ); - cfg->Write(wxT("/PTmender/Custom"),HUGIN_PT_MENDER_EXE_CUSTOM); - cfg->Write(wxT("/PanoTools/ScriptFile"), wxT("PT_script.txt")); + // MISC + // cache + cfg->Write(wxT("/ImageCache/UpperBound"), HUGIN_IMGCACHE_UPPERBOUND); + // number of threads + int cpucount = wxThread::GetCPUCount(); + if (cpucount < 1) cpucount = 1; + cfg->Write(wxT("/Nona/NumberOfThreads"), cpucount); + // locale + cfg->Write(wxT("language"), HUGIN_LANGUAGE); + // druid + cfg->Write(wxT("/PreviewFrame/showDruid"), HUGIN_PREVIEW_SHOW_DRUID); + // use preview images as active images + cfg->Write(wxT("/General/UseOnlySelectedImages"), HUGIN_USE_SELECTED_IMAGES); } if (noteb->GetSelection() == 1) { cfg->Write(wxT("/Assistant/autoAlign"), HUGIN_ASS_AUTO_ALIGN); @@ -765,6 +776,9 @@ cfg->Write(wxT("/Stitcher/EditorArgs"), wxT(HUGIN_STITCHER_EDITOR_ARGS)); } if (noteb->GetSelection() == 2) { + // hdr + cfg->Write(wxT("/ImageCache/Mapping"), HUGIN_IMGCACHE_MAPPING_FLOAT); + //cfg->Write(wxT("/ImageCache/Range"), HUGIN_IMGCACHE_RANGE); // Fine tune settings cfg->Write(wxT("/Finetune/SearchAreaPercent"), HUGIN_FT_SEARCH_AREA_PERCENT); cfg->Write(wxT("/Finetune/TemplateSize"), HUGIN_FT_TEMPLATE_SIZE); @@ -779,24 +793,6 @@ cfg->Write(wxT("/Finetune/RotationSteps"), HUGIN_FT_ROTATION_STEPS); } if (noteb->GetSelection() == 3) { - // MISC - // cache - cfg->Write(wxT("/ImageCache/UpperBound"), HUGIN_IMGCACHE_UPPERBOUND); - // number of threads - int cpucount = wxThread::GetCPUCount(); - if (cpucount < 1) cpucount = 1; - cfg->Write(wxT("/Nona/NumberOfThreads"), cpucount); - // locale - cfg->Write(wxT("language"), HUGIN_LANGUAGE); - // hdr - cfg->Write(wxT("/ImageCache/Mapping"), HUGIN_IMGCACHE_MAPPING_FLOAT); - //cfg->Write(wxT("/ImageCache/Range"), HUGIN_IMGCACHE_RANGE); - // druid - cfg->Write(wxT("/PreviewFrame/showDruid"), HUGIN_PREVIEW_SHOW_DRUID); - // use preview images as active images - cfg->Write(wxT("/General/UseOnlySelectedImages"), HUGIN_USE_SELECTED_IMAGES); - } - if (noteb->GetSelection() == 4) { ///// /// AUTOPANO cfg->Write(wxT("/AutoPano/Type"), HUGIN_AP_TYPE); @@ -809,12 +805,17 @@ cfg->Write(wxT("/AutoPanoKolor/AutopanoExeCustom"), HUGIN_APKOLOR_EXE_CUSTOM); cfg->Write(wxT("/AutoPanoKolor/Args"), wxT(HUGIN_APKOLOR_ARGS)); } - if (noteb->GetSelection() == 5) { + if (noteb->GetSelection() == 4) { /// ENBLEND cfg->Write(wxT("/Enblend/Exe"), wxT(HUGIN_ENBLEND_EXE)); cfg->Write(wxT("/Enblend/Custom"), HUGIN_ENBLEND_EXE_CUSTOM); cfg->Write(wxT("/Enblend/Args"), wxT(HUGIN_ENBLEND_ARGS)); } + if (noteb->GetSelection() == 5) { + cfg->Write(wxT("/PTmender/Exe"), wxT(HUGIN_PT_MENDER_EXE) ); + cfg->Write(wxT("/PTmender/Custom"),HUGIN_PT_MENDER_EXE_CUSTOM); + cfg->Write(wxT("/PanoTools/ScriptFile"), wxT("PT_script.txt")); + } UpdateDisplayData(); } } @@ -838,6 +839,10 @@ cfg->Write(wxT("/Stitcher/Editor"), MY_G_STR_VAL("prefs_ass_editor")); cfg->Write(wxT("/Stitcher/EditorArgs"), MY_G_STR_VAL("prefs_ass_editor_args")); + // hdr display + cfg->Write(wxT("/ImageCache/Mapping"),MY_G_CHOICE_VAL("prefs_misc_hdr_mapping")); + //cfg->Write(wxT("/ImageCache/Range"),MY_G_CHOICE_VAL("prefs_misc_hdr_range")); + // Fine tune settings cfg->Write(wxT("/Finetune/SearchAreaPercent"), MY_G_SPIN_VAL("prefs_ft_SearchAreaPercent")); cfg->Write(wxT("/Finetune/TemplateSize"), MY_G_SPIN_VAL("prefs_ft_TemplateSize")); @@ -876,10 +881,6 @@ cfg->Write(wxT("language"), templ); DEBUG_INFO("Language Selection ID: " << templ); - // hdr display - cfg->Write(wxT("/ImageCache/Mapping"),MY_G_CHOICE_VAL("prefs_misc_hdr_mapping")); - //cfg->Write(wxT("/ImageCache/Range"),MY_G_CHOICE_VAL("prefs_misc_hdr_range")); - // cursor // cfg->Write(wxT("/CPImageCtrl/CursorType"), MY_G_SPIN_VAL("prefs_cp_CursorType")); // tempdir Modified: hugin/trunk/src/hugin1/hugin/xrc/pref_dialog.xrc =================================================================== --- hugin/trunk/src/hugin1/hugin/xrc/pref_dialog.xrc 2008-02-13 22:03:46 UTC (rev 2833) +++ hugin/trunk/src/hugin1/hugin/xrc/pref_dialog.xrc 2008-02-13 22:05:16 UTC (rev 2834) @@ -8,87 +8,164 @@ <object class="sizeritem"> <object class="wxNotebook" name="prefs_tab"> <object class="notebookpage"> - <label>Panotools</label> + <label>General</label> <object class="wxPanel"> <object class="wxBoxSizer"> <orient>wxVERTICAL</orient> <object class="sizeritem"> <object class="wxStaticBoxSizer"> - <label>Panorama Tools</label> + <label>Resource Usage</label> <orient>wxVERTICAL</orient> <object class="sizeritem"> - <object class="wxGridBagSizer"> - <growablecols>1</growablecols> + <object class="wxFlexGridSizer"> <object class="sizeritem"> - <object class="wxCheckBox" name="prefs_pt_PTStitcherEXE_custom"> - <label>Use alternative PTStitcher program</label> + <object class="wxStaticText"> + <label>Image cache memory:</label> </object> - <cellpos>0,0</cellpos> - <cellspan>1,3</cellspan> + <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> + <border>5</border> </object> <object class="sizeritem"> - <object class="wxStaticText" name=""> - <label>PTStitcher:</label> + <object class="wxSpinCtrl" name="prefs_cache_UpperBound"> + <min>1</min> + <max>2147483646</max> + <tooltip>Keep fullsize images in memory, until this limit is exceeded</tooltip> </object> + <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag> + <border>5</border> + </object> + <object class="sizeritem"> + <object class="wxStaticText"> + <label>MB</label> + </object> + <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag> + <border>5</border> + </object> + <cols>3</cols> + <rows>2</rows> + <object class="sizeritem"> + <object class="wxStaticText"> + <label>Number of CPUs:</label> + </object> <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> <border>5</border> - <cellpos>1,0</cellpos> </object> <object class="sizeritem"> - <object class="wxTextCtrl" name="prefs_pt_PTStitcherEXE"/> - <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag> + <object class="wxSpinCtrl" name="prefs_nona_NumberOfThreads"> + <value>1</value> + <min>1</min> + <tooltip>Nona can use multiple threads for processing.\nSet this to the number of processors or processor cores available in your system.</tooltip> + </object> + <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag> <border>5</border> - <cellpos>1,1</cellpos> </object> <object class="sizeritem"> - <object class="wxButton" name="prefs_ptstitcher_select"> - <label>Choose...</label> + <object class="wxStaticText"> + <label></label> </object> - <flag>wxALIGN_CENTRE_VERTICAL</flag> - <cellpos>1,2</cellpos> + <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> + <border>5</border> </object> + </object> + <flag>wxEXPAND</flag> + </object> + </object> + <flag>wxALL|wxEXPAND</flag> + <border>5</border> + </object> + <object class="sizeritem"> + <object class="wxStaticBoxSizer"> + <label>User Interface</label> + <orient>wxVERTICAL</orient> + <object class="sizeritem"> + <object class="wxFlexGridSizer"> + <cols>3</cols> <object class="sizeritem"> <object class="wxStaticText"> - <label>Scriptfile:</label> + <label>Language</label> </object> <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> <border>5</border> - <cellpos>2,0</cellpos> </object> <object class="sizeritem"> - <object class="wxTextCtrl" name="prefs_pt_ScriptFile"> - <tooltip>Name of the temporary script file used by Panotools</tooltip> + <object class="wxChoice" name="prefs_gui_language"> + <content/> </object> + <flag>wxALL|wxEXPAND</flag> + <border>5</border> + </object> + <object class="sizeritem"> + <object class="wxStaticText"> + <label>requires restarting hugin</label> + <style></style> + </object> <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag> <border>5</border> - <cellpos>2,1</cellpos> - <cellspan>1,2</cellspan> </object> + <rows>2</rows> + <growablecols>1</growablecols> + </object> + <flag>wxEXPAND</flag> + </object> + <object class="sizeritem"> + <object class="wxCheckBox" name="prefs_misc_UseSelectedImages"> + <label>Optimize and stitch only images selected in preview window</label> + </object> + <flag>wxALL</flag> + <border>5</border> + </object> + </object> + <flag>wxALL|wxEXPAND</flag> + <border>5</border> + </object> + <object class="sizeritem"> + <object class="wxStaticBoxSizer"> + <label>File options</label> + <orient>wxVERTICAL</orient> + <object class="sizeritem"> + <object class="wxBoxSizer"> + <orient>wxHORIZONTAL</orient> <object class="sizeritem"> <object class="wxStaticText"> - <label>Panotools:</label> + <label>Tempdir:</label> </object> <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> <border>5</border> - <cellpos>3,0</cellpos> </object> <object class="sizeritem"> - <object class="wxStaticText" name="prefs_panotools_version"> - <label>Panotools</label> + <object class="wxTextCtrl" name="prefs_misc_tempdir"/> + <option>1</option> + <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag> + <border>5</border> + </object> + <object class="sizeritem"> + <object class="wxStaticText"> + <label>leave empty for OS default</label> </object> <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag> <border>5</border> - <cellpos>3,1</cellpos> </object> + </object> + <flag>wxEXPAND</flag> + </object> + </object> + <flag>wxALL|wxEXPAND</flag> + <border>5</border> + </object> + <object class="sizeritem"> + <object class="wxStaticBoxSizer"> + <label>Preview</label> + <orient>wxVERTICAL</orient> + <object class="sizeritem"> + <object class="wxBoxSizer"> + <orient>wxHORIZONTAL</orient> <object class="sizeritem"> - <object class="wxButton" name="prefs_panotools_details"> - <label>Details</label> - <enabled>0</enabled> + <object class="wxCheckBox" name="prefs_misc_showDruid"> + <label>Show Druid (requires restarting hugin)</label> </object> - <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> - <cellpos>3,2</cellpos> </object> </object> + <option>1</option> <flag>wxEXPAND</flag> </object> </object> @@ -256,18 +333,59 @@ </object> </object> <object class="notebookpage"> - <label>Finetune</label> + <label>Control Points Editor</label> <object class="wxPanel"> <object class="wxBoxSizer"> <orient>wxVERTICAL</orient> <object class="sizeritem"> <object class="wxStaticBoxSizer"> - <label>Basic Settings</label> + <label>HDR and 16 Bit display</label> <orient>wxVERTICAL</orient> <object class="sizeritem"> <object class="wxFlexGridSizer"> <cols>3</cols> + <rows>2</rows> + <growablecols>1</growablecols> <object class="sizeritem"> + <object class="wxStaticText"> + <label>Curve</label> + </object> + <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> + <border>5</border> + </object> + <object class="sizeritem"> + <object class="wxChoice" name="prefs_misc_hdr_mapping"> + <content> + <item>linear</item> + <item>logarithmic</item> + <item>gamma 2.2</item> + </content> + </object> + <flag>wxALL|wxEXPAND</flag> + <border>5</border> + </object> + <object class="sizeritem"> + <object class="wxStaticText"> + <label>used for display in GUI</label> + </object> + <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag> + <border>5</border> + </object> + </object> + <flag>wxEXPAND</flag> + </object> + </object> + <flag>wxALL|wxEXPAND</flag> + <border>5</border> + </object> + <object class="sizeritem"> + <object class="wxStaticBoxSizer"> + <label>Finetune</label> + <orient>wxVERTICAL</orient> + <object class="sizeritem"> + <object class="wxFlexGridSizer"> + <cols>3</cols> + <object class="sizeritem"> <object class="wxStaticText" name=""> <label>Patch width:</label> </object> @@ -463,239 +581,6 @@ </object> </object> <object class="notebookpage"> - <label>Misc</label> - <object class="wxPanel"> - <object class="wxBoxSizer"> - <orient>wxVERTICAL</orient> - <object class="sizeritem"> - <object class="wxStaticBoxSizer"> - <label>Resource Usage</label> - <orient>wxVERTICAL</orient> - <object class="sizeritem"> - <object class="wxFlexGridSizer"> - <object class="sizeritem"> - <object class="wxStaticText"> - <label>Image cache memory:</label> - </object> - <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> - <border>5</border> - </object> - <object class="sizeritem"> - <object class="wxSpinCtrl" name="prefs_cache_UpperBound"> - <min>1</min> - <max>2147483646</max> - <tooltip>Keep fullsize images in memory, until this limit is exceeded</tooltip> - </object> - <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag> - <border>5</border> - </object> - <object class="sizeritem"> - <object class="wxStaticText"> - <label>MB</label> - </object> - <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag> - <border>5</border> - </object> - <cols>3</cols> - <rows>2</rows> - <object class="sizeritem"> - <object class="wxStaticText"> - <label>Number of CPUs:</label> - </object> - <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> - <border>5</border> - </object> - <object class="sizeritem"> - <object class="wxSpinCtrl" name="prefs_nona_NumberOfThreads"> - <value>1</value> - <min>1</min> - <tooltip>Nona can use multiple threads for processing.\nSet this to the number of processors or processor cores available in your system.</tooltip> - </object> - <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag> - <border>5</border> - </object> - <object class="sizeritem"> - <object class="wxStaticText"> - <label></label> - </object> - <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> - <border>5</border> - </object> - </object> - <flag>wxEXPAND</flag> - </object> - </object> - <flag>wxALL|wxEXPAND</flag> - <border>5</border> - </object> - <object class="sizeritem"> - <object class="wxStaticBoxSizer"> - <label>User Interface</label> - <orient>wxVERTICAL</orient> - <object class="sizeritem"> - <object class="wxFlexGridSizer"> - <cols>3</cols> - <object class="sizeritem"> - <object class="wxStaticText"> - <label>Language</label> - </object> - <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> - <border>5</border> - </object> - <object class="sizeritem"> - <object class="wxChoice" name="prefs_gui_language"> - <content/> - </object> - <flag>wxALL|wxEXPAND</flag> - <border>5</border> - </object> - <object class="sizeritem"> - <object class="wxStaticText"> - <label>requires restarting hugin</label> - <style></style> - </object> - <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag> - <border>5</border> - </object> - <rows>2</rows> - <growablecols>1</growablecols> - </object> - <flag>wxEXPAND</flag> - </object> - <object class="sizeritem"> - <object class="wxCheckBox" name="prefs_misc_UseSelectedImages"> - <label>Optimize and stitch only images selected in preview window</label> - </object> - <flag>wxALL</flag> - <border>5</border> - </object> - </object> - <flag>wxALL|wxEXPAND</flag> - <border>5</border> - </object> - <object class="sizeritem"> - <object class="wxStaticBoxSizer"> - <label>HDR and 16 Bit display mode</label> - <orient>wxVERTICAL</orient> - <object class="sizeritem"> - <object class="wxFlexGridSizer"> - <cols>3</cols> - <object class="sizeritem"> - <object class="wxStaticText"> - <label>Range</label> - </object> - <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> - <border>5</border> - </object> - <object class="sizeritem"> - <object class="wxChoice" name="prefs_misc_hdr_range"> - <content> - <item>fixed</item> - <item>auto</item> - </content> - </object> - <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag> - <border>5</border> - </object> - <object class="sizeritem"> - <object class="wxStaticText"> - <label>use fixed for 16 bit\nand auto for HDR</label> - </object> - <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag> - <border>5</border> - </object> - <object class="sizeritem"> - <object class="wxStaticText"> - <label>Mapping</label> - </object> - <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> - <border>5</border> - </object> - <object class="sizeritem"> - <object class="wxChoice" name="prefs_misc_hdr_mapping"> - <content> - <item>linear</item> - <item>logarithmic</item> - <item>gamma 2.2</item> - </content> - </object> - <flag>wxALL|wxEXPAND</flag> - <border>5</border> - </object> - <object class="sizeritem"> - <object class="wxStaticText"> - <label>used for display in GUI</label> - </object> - <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag> - <border>5</border> - </object> - <rows>2</rows> - <growablecols>1</growablecols> - </object> - <flag>wxEXPAND</flag> - </object> - </object> - <flag>wxALL|wxEXPAND</flag> - <border>5</border> - </object> - <object class="sizeritem"> - <object class="wxStaticBoxSizer"> - <label>File options</label> - <orient>wxVERTICAL</orient> - <object class="sizeritem"> - <object class="wxBoxSizer"> - <orient>wxHORIZONTAL</orient> - <object class="sizeritem"> - <object class="wxStaticText"> - <label>Tempdir:</label> - </object> - <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> - <border>5</border> - </object> - <object class="sizeritem"> - <object class="wxTextCtrl" name="prefs_misc_tempdir"/> - <option>1</option> - <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag> - <border>5</border> - </object> - <object class="sizeritem"> - <object class="wxStaticText"> - <label>leave empty for OS default</label> - </object> - <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag> - <border>5</border> - </object> - </object> - <flag>wxEXPAND</flag> - </object> - </object> - <flag>wxALL|wxEXPAND</flag> - <border>5</border> - </object> - <object class="sizeritem"> - <object class="wxStaticBoxSizer"> - <label>Preview</label> - <orient>wxVERTICAL</orient> - <object class="sizeritem"> - <object class="wxBoxSizer"> - <orient>wxHORIZONTAL</orient> - <object class="sizeritem"> - <object class="wxCheckBox" name="prefs_misc_showDruid"> - <label>Show Druid (requires restarting hugin)</label> - </object> - </object> - </object> - <option>1</option> - <flag>wxEXPAND</flag> - </object> - </object> - <flag>wxALL|wxEXPAND</flag> - <border>5</border> - </object> - </object> - </object> - </object> - <object class="notebookpage"> <label>Autopano</label> <object class="wxPanel"> <object class="wxBoxSizer"> @@ -867,6 +752,8 @@ <label>following patterns will be substituted before running: %o -- output project (0.oto will be appended when using Autopano) %p -- number of control points between each pair +%v -- HFOV of first image +%t -- projection of first image (0-4, as in panotools) %i -- image files %namefile -- file that contains image filenames</label> </object> @@ -951,22 +838,98 @@ <flag>wxBOTTOM|wxLEFT|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag> <border>10</border> </object> - <object class="sizeritem"> - <object class="wxCheckBox" name="prefs_enblend_DeleteRemapped"> - <label>Delete remapped tiff files</label> - </object> - <flag>wxLEFT</flag> - <border>5</border> + </object> + </object> + <flag>wxEXPAND</flag> + </object> + </object> + <flag>wxALL|wxEXPAND</flag> + <border>5</border> + </object> + </object> + </object> + </object> + <object class="notebookpage"> + <label>Panotools</label> + <object class="wxPanel"> + <object class="wxBoxSizer"> + <orient>wxVERTICAL</orient> + <object class="sizeritem"> + <object class="wxStaticBoxSizer"> + <label>Panorama Tools</label> + <orient>wxVERTICAL</orient> + <object class="sizeritem"> + <object class="wxGridBagSizer"> + <growablecols>1</growablecols> + <object class="sizeritem"> + <object class="wxCheckBox" name="prefs_pt_PTStitcherEXE_custom"> + <label>Use alternative PTStitcher program</label> </object> - <object class="sizeritem"> - <object class="wxCheckBox" name="prefs_enblend_UseCroppedFiles"> - <label>Use cropped TIFF files (enblend 2.4 or higher required)</label> - <tooltip>Save cropped images, requires less disk space and memory.</tooltip> - </object> - <flag>wxTOP|wxLEFT</flag> - <border>5</border> + <cellpos>0,0</cellpos> + <cellspan>1,3</cellspan> + </object> + <object class="sizeritem"> + <object class="wxStaticText" name=""> + <label>PTStitcher:</label> </object> + <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> + <border>5</border> + <cellpos>1,0</cellpos> </object> + <object class="sizeritem"> + <object class="wxTextCtrl" name="prefs_pt_PTStitcherEXE"/> + <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag> + <border>5</border> + <cellpos>1,1</cellpos> + </object> + <object class="sizeritem"> + <object class="wxButton" name="prefs_ptstitcher_select"> + <label>Choose...</label> + </object> + <flag>wxALIGN_CENTRE_VERTICAL</flag> + <cellpos>1,2</cellpos> + </object> + <object class="sizeritem"> + <object class="wxStaticText"> + <label>Scriptfile:</label> + </object> + <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> + <border>5</border> + <cellpos>2,0</cellpos> + </object> + <object class="sizeritem"> + <object class="wxTextCtrl" name="prefs_pt_ScriptFile"> + <tooltip>Name of the temporary script file used by Panotools</tooltip> + </object> + <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag> + <border>5</border> + <cellpos>2,1</cellpos> + <cellspan>1,2</cellspan> + </object> + <object class="sizeritem"> + <object class="wxStaticText"> + <label>Panotools:</label> + </object> + <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> + <border>5</border> + <cellpos>3,0</cellpos> + </object> + <object class="sizeritem"> + <object class="wxStaticText" name="prefs_panotools_version"> + <label>Panotools</label> + </object> + <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag> + <border>5</border> + <cellpos>3,1</cellpos> + </object> + <object class="sizeritem"> + <object class="wxButton" name="prefs_panotools_details"> + <label>Details</label> + <enabled>0</enabled> + </object> + <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> + <cellpos>3,2</cellpos> + </object> </object> <flag>wxEXPAND</flag> </object> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |