Menu
▾
▴
[Hugin-cvs] hugin/src/hugin/xrc images_panel-2.5.xrc,1.2,1.3 lens_panel-2.5.xrc,1.2,1.3
|
From: Pablo d'A. <da...@us...> - 2005-05-05 21:48:54
|
Update of /cvsroot/hugin/hugin/src/hugin/xrc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26493/src/hugin/xrc Modified Files: images_panel-2.5.xrc lens_panel-2.5.xrc Log Message: removed xp style on splitters, else they are invisible, and users will never find them Index: images_panel-2.5.xrc =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/xrc/images_panel-2.5.xrc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- images_panel-2.5.xrc 12 Feb 2005 07:24:24 -0000 1.2 +++ images_panel-2.5.xrc 5 May 2005 21:48:40 -0000 1.3 @@ -1,4 +1,4 @@ -<?xml version="1.0" ?> +<?xml version="1.0" encoding="ISO-8859-1"?> <resource> <object class="wxPanel" name="images_panel"> <title/> @@ -20,40 +20,80 @@ <orient>wxVERTICAL</orient> <object class="sizeritem"> <object class="wxButton" name="action_add_images"> + + <label>Add individual images...</label> + + <tooltip>load one or more photos for this project</tooltip> </object> + + <flag>wxALL|wxEXPAND</flag> + + <border>5</border> </object> <object class="sizeritem"> <object class="wxButton" name="action_add_time_images"> + + <label>Add time-series of images...</label> + + <tooltip>load a set of photos taken at the same time</tooltip> </object> + + <flag>wxALL|wxEXPAND</flag> + + <border>5</border> </object> <object class="sizeritem"> <object class="wxButton" name="action_add_dir_images"> + + <label>Add all images from a folder...</label> + + <enabled>0</enabled> + + <tooltip>load all photos stored in the same subdirectory</tooltip> </object> + + <flag>wxALL|wxEXPAND</flag> + + <border>5</border> </object> <object class="sizeritem"> <object class="wxButton" name="action_remove_images"> + + <label>Remove this image</label> + + <tooltip>dismiss the current photo from this project</tooltip> </object> + + <flag>wxALL|wxEXPAND</flag> + + <border>5</border> </object> </object> + + <option>1</option> + + <flag>wxALL|wxEXPAND</flag> + + <border>5</border> </object> <object class="sizeritem"> @@ -62,42 +102,82 @@ <orient>wxVERTICAL</orient> <object class="sizeritem"> <object class="wxButton" name="images_opt_anchor_button"> + + <label>Anchor this image for position</label> + + <style></style> + + <tooltip>use currently selected image as anchor image. That is, do not optimize the (complete) position of this image.</tooltip> </object> + + <flag>wxALL|wxEXPAND</flag> + + <border>5</border> </object> <object class="sizeritem"> <object class="wxButton" name="images_set_orientation_button"> + + <label>Adjust the anchor spot...</label> + + <tooltip>opens a window to select the anchor orientation graphically</tooltip> </object> + + <flag>wxALL|wxEXPAND</flag> + + <border>5</border> </object> <object class="sizeritem"> <object class="wxStaticLine"> + + <style>wxLI_HORIZONTAL</style> </object> + + <flag>wxEXPAND</flag> </object> <object class="sizeritem"> <object class="wxButton" name="images_color_anchor_button"> + + <label>Anchor this image for exposure</label> + + <enabled>0</enabled> + + <tooltip>use the currently selected images as color correction anchor image</tooltip> </object> + + <flag>wxALL|wxEXPAND</flag> + + <border>5</border> </object> </object> + + <option>1</option> + + <flag>wxALL|wxEXPAND</flag> + + <border>5</border> </object> </object> + + <flag>wxEXPAND</flag> </object> <object class="sizeritem"> @@ -106,43 +186,81 @@ <orient>wxHORIZONTAL</orient> <object class="sizeritem"> <object class="wxStaticText"> + + <label>Points per Overlap:</label> </object> + + <flag>wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag> + + <border>5</border> </object> <object class="sizeritem"> <object class="wxSpinCtrl" name="images_points_per_overlap"> + + <value>10</value> + + <min>1</min> + + <tooltip>number of points created at each overlap</tooltip> </object> + + <flag>wxALIGN_CENTRE_VERTICAL</flag> </object> <object class="sizeritem"> <object class="wxButton" name="images_feature_matching"> + + <label>Create Ctrl Points</label> + + <tooltip>Run external autopano program on the selected images</tooltip> </object> + + <flag>wxALL|wxEXPAND</flag> + + <border>5</border> </object> <object class="sizeritem"> <object class="wxStaticLine"> + + <style>wxLI_VERTICAL</style> </object> + + <flag>wxEXPAND</flag> </object> <object class="sizeritem"> <object class="wxButton" name="images_remove_cp"> + + <label>Remove Points</label> + + <tooltip>Remove control points connecting the selected images</tooltip> </object> + + <flag>wxLEFT|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> + + <border>5</border> </object> </object> + + <flag>wxALL|wxEXPAND</flag> + + <border>5</border> </object> <object class="sizeritem"> @@ -154,64 +272,124 @@ <orient>wxHORIZONTAL</orient> <object class="sizeritem"> <object class="wxStaticText" name=""> + + <label>yaw:</label> </object> + + <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> + + <border>5</border> </object> <object class="sizeritem"> <object class="wxTextCtrl" name="images_text_yaw"> + + <style>wxTE_PROCESS_ENTER</style> + + <tooltip>set yaw for selected image(s)</tooltip> </object> + + <flag>wxRIGHT|wxEXPAND|wxGROW</flag> + + <minsize>55,20</minsize> </object> <object class="sizeritem"> <object class="wxStaticText" name=""> + + <label>pitch:</label> </object> + + <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> + + <border>5</border> </object> <object class="sizeritem"> <object class="wxTextCtrl" name="images_text_pitch"> + + <style>wxTE_PROCESS_ENTER</style> + + <tooltip>set pitch for selected image(s)</tooltip> </object> + + <flag>wxRIGHT|wxEXPAND|wxGROW</flag> + + <minsize>55,20</minsize> </object> <object class="sizeritem"> <object class="wxStaticText" name=""> + + <label>roll:</label> </object> + + <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> + + <border>5</border> </object> <object class="sizeritem"> <object class="wxTextCtrl" name="images_text_roll"> + + <style>wxTE_PROCESS_ENTER</style> + + <tooltip>set roll for selected image(s)</tooltip> </object> + + <flag>wxRIGHT|wxEXPAND|wxGROW</flag> + + <border>5</border> + + <minsize>55,20</minsize> </object> <object class="sizeritem"> <object class="wxButton" name="images_reset_pos"> + + <label>Reset</label> + + <tooltip>Reset position of selected image(s)</tooltip> </object> + + <flag>wxLEFT|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> + + <border>5</border> </object> </object> + + <flag>wxALL|wxEXPAND</flag> + + <border>5</border> </object> </object> + + <flag>wxALL|wxEXPAND</flag> + + <border>5</border> </object> <object class="sizeritem"> @@ -219,20 +397,25 @@ <label>This Image</label> <orient>wxVERTICAL</orient> <object class="sizeritem"> - <object class="wxPanel" name="images_selected_image_panel"> - <object class="wxStaticBitmap" name="images_selected_image"> - <bitmap>data/druid.images.128.png</bitmap> - <style></style> + <object class="wxStaticBitmap" name="images_selected_image"> + + + <bitmap>data/druid.images.128.png</bitmap> + + + <style></style> </object> - </object> - <option>1</option> - <flag>wxALL|wxEXPAND|wxALIGN_CENTRE|wxALIGN_CENTRE_VERTICAL</flag> - <border>5</border> </object> <border>5</border> </object> + + <option>1</option> + + <flag>wxALL|wxEXPAND</flag> + + <border>5</border> </object> </object> @@ -240,8 +423,10 @@ </object> <orientation>vertical</orientation> <sashpos>0</sashpos> - <style>wxSP_3DSASH</style> + <style>wxSP_3DSASH|wxSP_NO_XP_THEME</style> </object> + + <flag>wxEXPAND</flag> </object> </object> Index: lens_panel-2.5.xrc =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/xrc/lens_panel-2.5.xrc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- lens_panel-2.5.xrc 8 Mar 2005 20:17:26 -0000 1.2 +++ lens_panel-2.5.xrc 5 May 2005 21:48:40 -0000 1.3 @@ -1,4 +1,4 @@ -<?xml version="1.0" ?> +<?xml version="1.0" encoding="ISO-8859-1"?> <resource> <object class="wxPanel" name="lens_panel"> <style>wxTAB_TRAVERSAL</style> @@ -9,7 +9,7 @@ <object class="unknown" name="lenses_list_unknown"/> <orientation>vertical</orientation> <sashpos>0</sashpos> - <style>wxSP_3DSASH</style> + <style>wxSP_3DSASH|wxSP_NO_XP_THEME</style> <object class="wxScrolledWindow" name="lens_control_panel"> <object class="wxStaticBoxSizer"> <object class="sizeritem"> @@ -17,14 +17,19 @@ <orient>wxHORIZONTAL</orient> <object class="sizeritem"> <object class="wxStaticText"> + <label>Lens type:</label> + <style>wxALIGN_RIGHT</style> </object> + <flag>wxLEFT|wxALL|wxALIGN_CENTRE_VERTICAL</flag> + <border>5</border> </object> <object class="sizeritem"> <object class="wxComboBox" name="lens_val_projectionFormat"> + <content> <item>Normal (rectilinear)</item> <item>Panoramic (cylindrical)</item> @@ -32,14 +37,20 @@ <item>Full frame fisheye</item> <item>Equirectangular</item> </content> + <selection>0</selection> + <style></style> </object> + <option>1</option> + <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag> </object> </object> + <flag>wxALL|wxEXPAND</flag> + <border>5</border> </object> <object class="sizeritem"> @@ -51,70 +62,101 @@ <cols>3</cols> <object class="sizeritem"> <object class="wxStaticText"> + <label>degrees of view (v):</label> </object> + <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> </object> <object class="sizeritem"> <object class="wxTextCtrl" name="lens_val_v"> + <help>Horizontal Field of View</help> + <longhelp>Horizontal Field of View</longhelp> + <tooltip>Horizontal Field of View</tooltip> + <value></value> + <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style> </object> + <flag>wxEXPAND</flag> </object> <object class="sizeritem"> <object class="wxCheckBox" name="lens_inherit_v"> + <label>Inherit</label> </object> + <flag>wxEXPAND|wxGROW</flag> </object> <object class="sizeritem"> <object class="wxStaticText"> + <label>focal length:</label> </object> + <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> </object> <object class="sizeritem"> <object class="wxTextCtrl" name="lens_val_focalLength"> + <help>real focal length of the optic</help> + <longhelp>real focal length of the optic</longhelp> + <tooltip>true focal length in mm</tooltip> + <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style> </object> + <flag>wxEXPAND</flag> </object> <vgap>5</vgap> <hgap>5</hgap> <growablecols>0</growablecols> <object class="spacer"> + <size>0,0</size> </object> <object class="sizeritem"> <object class="wxStaticText"> + <label>crop factor:</label> + <help>35mm film diameter / ccd diameter</help> + <longhelp>35mm film diameter / ccd diameter</longhelp> </object> + <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> </object> <object class="sizeritem"> <object class="wxTextCtrl" name="lens_val_flFactor"> + <help>equivalent to 35mm film optics</help> + <longhelp>equivalent to 35mm film optics</longhelp> + <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style> + <tooltip>35mm film diameter / ccd diameter</tooltip> </object> + <flag>wxEXPAND</flag> </object> </object> + <flag>wxALL|wxEXPAND</flag> + <border>5</border> </object> </object> + <flag>wxALL|wxEXPAND|wxGROW</flag> + <border>5</border> </object> <object class="sizeritem"> @@ -126,67 +168,89 @@ <cols>3</cols> <object class="sizeritem"> <object class="wxStaticText"> + <label>distortion (a):</label> </object> + <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> </object> <object class="sizeritem"> <object class="wxTextCtrl" name="lens_val_a"> + <style>wxTE_PROCESS_ENTER</style> </object> + <flag>wxEXPAND</flag> </object> <object class="sizeritem"> <object class="wxCheckBox" name="lens_inherit_a"> + <label>Inherit</label> </object> + <flag>wxALL|wxEXPAND|wxGROW</flag> </object> <object class="sizeritem"> <object class="wxStaticText"> + <label>barrel (b):</label> </object> + <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> </object> <object class="sizeritem"> <object class="wxTextCtrl" name="lens_val_b"> + <style>wxTE_PROCESS_ENTER</style> </object> + <flag>wxALL|wxEXPAND</flag> </object> <object class="sizeritem"> <object class="wxCheckBox" name="lens_inherit_b"> + <label>Inherit</label> </object> + <flag>wxALL|wxEXPAND|wxGROW</flag> </object> <object class="sizeritem"> <object class="wxStaticText"> + <label>distortion (c):</label> </object> + <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> </object> <object class="sizeritem"> <object class="wxTextCtrl" name="lens_val_c"> + <style>wxTE_PROCESS_ENTER</style> </object> + <flag>wxEXPAND</flag> </object> <object class="sizeritem"> <object class="wxCheckBox" name="lens_inherit_c"> + <label>Inherit</label> </object> + <flag>wxALL|wxEXPAND|wxGROW</flag> </object> <vgap>5</vgap> <hgap>5</hgap> <growablecols>0</growablecols> </object> + <flag>wxALL|wxEXPAND</flag> + <border>5</border> </object> </object> + <flag>wxALL|wxEXPAND|wxGROW</flag> + <border>5</border> </object> <object class="sizeritem"> @@ -198,58 +262,79 @@ <cols>3</cols> <object class="sizeritem"> <object class="wxStaticText"> + <label>horizontal (d):</label> </object> + <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> </object> <object class="sizeritem"> <object class="wxTextCtrl" name="lens_val_d"> + <style>wxTE_PROCESS_ENTER</style> </object> + <flag>wxEXPAND|wxGROW</flag> </object> <object class="sizeritem"> <object class="wxCheckBox" name="lens_inherit_d"> + <label>Inherit</label> + <style></style> </object> + <flag>wxEXPAND|wxGROW</flag> </object> <object class="sizeritem"> <object class="wxStaticText"> + <label>vertical (e):</label> </object> + <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> </object> <object class="sizeritem"> <object class="wxTextCtrl" name="lens_val_e"> + <style>wxTE_PROCESS_ENTER</style> </object> + <flag>wxEXPAND|wxGROW</flag> </object> <object class="sizeritem"> <object class="wxCheckBox" name="lens_inherit_e"> + <label>Inherit</label> </object> + <flag>wxEXPAND|wxGROW</flag> </object> <vgap>5</vgap> <hgap>5</hgap> <growablecols>0</growablecols> </object> + <flag>wxALL|wxEXPAND</flag> + <border>4</border> </object> <object class="sizeritem"> <object class="wxButton" name="lens_button_center"> + <label>Set Crop</label> + <tooltip>Set crop and image center</tooltip> </object> + <flag>wxALL|wxEXPAND|wxGROW</flag> + <border>5</border> </object> </object> + <flag>wxALL|wxEXPAND|wxGROW</flag> + <border>5</border> </object> <label>Camera and Lens Information</label> @@ -263,50 +348,67 @@ <cols>3</cols> <object class="sizeritem"> <object class="wxStaticText"> + <label>horizontal (g):</label> </object> + <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> </object> <object class="sizeritem"> <object class="wxTextCtrl" name="lens_val_g"> + <style>wxTE_PROCESS_ENTER</style> </object> + <flag>wxEXPAND|wxGROW</flag> </object> <object class="sizeritem"> <object class="wxCheckBox" name="lens_inherit_g"> + <label>Inherit</label> + <style></style> </object> + <flag>wxEXPAND|wxGROW</flag> </object> <object class="sizeritem"> <object class="wxStaticText"> + <label>vertical (t):</label> </object> + <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> </object> <object class="sizeritem"> <object class="wxTextCtrl" name="lens_val_t"> + <style>wxTE_PROCESS_ENTER</style> </object> + <flag>wxEXPAND|wxGROW</flag> </object> <object class="sizeritem"> <object class="wxCheckBox" name="lens_inherit_t"> + <label>Inherit</label> </object> + <flag>wxEXPAND|wxGROW</flag> </object> <vgap>5</vgap> <hgap>5</hgap> <growablecols>0</growablecols> </object> + <flag>wxALL|wxEXPAND</flag> + <border>4</border> </object> </object> + <flag>wxALL|wxEXPAND|wxGROW</flag> + <border>5</border> </object> <object class="sizeritem"> @@ -318,19 +420,28 @@ <orient>wxHORIZONTAL</orient> <object class="sizeritem"> <object class="wxButton" name="lens_button_load"> + <label>Load</label> + <tooltip>Load lens parameters from a file</tooltip> </object> + <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> + <border>5</border> </object> <object class="sizeritem"> <object class="wxButton" name="lens_button_save"> + <label>Save</label> + <tooltip>Save lens parameters to an file</tooltip> </object> + <option>1</option> + <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag> + <border>5</border> </object> </object> @@ -340,17 +451,23 @@ <orient>wxHORIZONTAL</orient> <object class="sizeritem"> <object class="wxButton" name="lens_button_loadEXIF"> + <label>Load EXIF</label> + <tooltip>Try to read HFOV from the EXIF data</tooltip> </object> + <option>1</option> + <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag> + <border>5</border> </object> </object> </object> <object class="sizeritem"> <object class="wxStaticLine"/> + <flag>wxEXPAND</flag> </object> <object class="sizeritem"> @@ -358,33 +475,45 @@ <orient>wxHORIZONTAL</orient> <object class="sizeritem"> <object class="wxButton" name="lens_button_newlens"> + <label>New Lens</label> + <tooltip>Create a new lens and assign it to selected images</tooltip> </object> + <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> + <border>5</border> </object> <object class="sizeritem"> <object class="wxButton" name="lens_button_changelens"> + <label>Change lens</label> + <tooltip>change lens of selected images</tooltip> </object> + <option>1</option> + <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag> + <border>5</border> </object> </object> </object> </object> + <flag>wxALL|wxEXPAND</flag> + <border>5</border> </object> </object> <size>200,200</size> </object> </object> + <flag>wxEXPAND</flag> </object> </object> </object> -</resource> +</resource> \ No newline at end of file |