Menu
▾
▴
[Hugin-cvs] hugin/src/hugin/xrc pano_panel.xrc,1.48,1.49
|
From: Pablo d'A. <da...@us...> - 2007-05-10 23:47:21
|
Update of /cvsroot/hugin/hugin/src/hugin/xrc
In directory sc8-pr-cvs17:/tmp/cvs-serv18427
Modified Files:
pano_panel.xrc
Log Message:
forgot to replace with wx 2.5 or later version...
Index: pano_panel.xrc
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/xrc/pano_panel.xrc,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- pano_panel.xrc 28 Apr 2006 06:57:17 -0000 1.48
+++ pano_panel.xrc 10 May 2007 23:47:16 -0000 1.49
@@ -9,18 +9,23 @@
<object class="wxStaticText">
+
<label>Panorama</label>
+
<font>
+
<style platform="mac">normal</style>
+
<family platform="mac">swiss</family>
+
<weight>bold</weight>
@@ -30,9 +35,11 @@
</object>
+
<flag></flag>
+
<border>6</border>
</object>
<object class="sizeritem">
@@ -42,34 +49,34 @@
<object class="wxStaticText">
+
<label>projection (f):</label>
</object>
+
<flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+
<border>6</border>
</object>
<object class="sizeritem">
<object class="wxChoice" name="pano_choice_pano_type">
- <content>
- <item>Rectilinear</item>
- <item>Cylindrical</item>
- <item>Equirectangular</item>
- <item>Full frame fisheye</item>
- <item>Stereographic</item>
- <item>Mercator</item>
- <item>Transverse mercator</item>
- <item>Sinusiodal</item>
- </content>
+
+
+ <content/>
+
+
<selection>2</selection>
</object>
- <flag>wxALL|wxLEFT|wxALIGN_CENTRE_VERTICAL</flag>
+
+ <flag>wxRIGHT|wxTOP|wxBOTTOM|wxALIGN_CENTRE_VERTICAL</flag>
+
<border>6</border>
@@ -77,9 +84,11 @@
</object>
+
<flag>wxLEFT</flag>
+
<border>6</border>
</object>
<object class="sizeritem">
@@ -89,18 +98,23 @@
<object class="wxStaticText">
+
<label>Field of View</label>
+
<font>
+
<style platform="mac">normal</style>
+
<family platform="mac">swiss</family>
+
<weight>bold</weight>
@@ -110,22 +124,24 @@
</object>
+
<flag></flag>
+
<border>6</border>
</object>
<object class="sizeritem">
- <object class="wxFlexGridSizer">
- <hgap>5</hgap>
- <cols>3</cols>
- <vgap>2</vgap>
+ <object class="wxGridBagSizer">
+ <hgap>6</hgap>
+ <vgap>6</vgap>
<object class="sizeritem">
<cellpos>0,0</cellpos>
<flag>wxALIGN_CENTRE_VERTICAL</flag>
<object class="wxStaticText">
+
<label>horizontal (v):</label>
</object>
</object>
@@ -136,9 +152,6 @@
-
-
-
<size>60,-1</size>
</object>
</object>
@@ -148,16 +161,20 @@
<object class="wxButton" name="pano_button_calc_fov">
+
<label>Calculate Field of View</label>
</object>
+
<border>6</border>
+
<flag>wxALL</flag>
+
<cellspan>2,1</cellspan>
</object>
<object class="sizeritem">
@@ -166,6 +183,7 @@
<object class="wxStaticText">
+
<label>vertical:</label>
</object>
</object>
@@ -176,37 +194,41 @@
-
-
-
<size>60,-1</size>
</object>
</object>
</object>
+
<option>1</option>
+
<flag>wxLEFT|wxEXPAND</flag>
+
<border>12</border>
</object>
</object>
+
<border>12</border>
+
<flag>wxALL</flag>
</object>
</object>
+
<flag>wxALL|wxEXPAND</flag>
+
<border>6</border>
</object>
<object class="sizeritem">
@@ -216,18 +238,23 @@
<object class="wxStaticText">
+
<label>Quick Stitcher</label>
+
<font>
+
<style platform="mac">normal</style>
+
<family platform="mac">swiss</family>
+
<weight>bold</weight>
@@ -237,9 +264,11 @@
</object>
+
<flag></flag>
+
<border>6</border>
</object>
<object class="sizeritem">
@@ -249,19 +278,23 @@
<object class="wxStaticText">
+
<label>Stitch the images</label>
</object>
+
<flag>wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+
<border>6</border>
</object>
<object class="sizeritem">
<object class="wxChoice" name="stitch_quick_mode">
+
<content>
<item>with custom settings below</item>
<item>into a high quality TIFF file</item>
@@ -272,40 +305,50 @@
</content>
+
<selection>0</selection>
</object>
+
<option>1</option>
+
<flag>wxALL|wxLEFT|wxALIGN_CENTRE_VERTICAL</flag>
+
<border>6</border>
</object>
<object class="sizeritem">
<object class="wxButton" name="pano_button_stitch">
+
<label>Stitch now!</label>
+
<tooltip>execute the PTStitcher engine</tooltip>
</object>
+
<flag>wxLEFT|wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+
<border>6</border>
</object>
</object>
+
<flag>wxLEFT</flag>
+
<border>6</border>
</object>
<object class="sizeritem">
@@ -314,236 +357,278 @@
<object class="spacer">
+
<size>0,5</size>
</object>
<object class="sizeritem">
- <object class="wxBoxSizer">
- <orient>wxVERTICAL</orient>
- <object class="sizeritem">
- <object class="wxBoxSizer">
- <orient>wxVERTICAL</orient>
- <object class="sizeritem">
- <object class="wxStaticText">
-
-
- <label>Panorama Image Size</label>
-
-
- <font>
-
-
- <style platform="mac">normal</style>
-
-
- <family platform="mac">swiss</family>
-
-
- <weight>bold</weight>
-
-
-
- <size platform="mac">12</size>
- </font>
- </object>
-
-
- <flag></flag>
-
-
- <border>6</border>
- </object>
- <object class="sizeritem">
+ <object class="wxScrolledWindow" name="pano_controls_panel">
+ <object class="wxBoxSizer">
+ <orient>wxVERTICAL</orient>
+ <object class="sizeritem">
+ <object class="wxPanel" name="pano_ctrl_fixed">
<object class="wxBoxSizer">
- <orient>wxHORIZONTAL</orient>
- <object class="sizeritem">
- <object class="wxStaticText">
-
-
- <label>pixel width:</label>
- </object>
-
-
- <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-
-
- <border>6</border>
- </object>
- <object class="sizeritem">
- <object class="wxTextCtrl" name="pano_val_width">
-
-
- <size>50,-1</size>
-
-
- <style>wxTE_PROCESS_ENTER</style>
- </object>
-
-
- <flag>wxRIGHT|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-
-
- <border>10</border>
- </object>
- <object class="sizeritem">
- <object class="wxStaticText">
-
-
- <label>pixel height:</label>
-
-
- <style>wxALIGN_RIGHT</style>
- </object>
-
-
- <flag>wxRIGHT|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-
-
- <border>5</border>
- </object>
+ <orient>wxVERTICAL</orient>
<object class="sizeritem">
- <object class="wxStaticText" name="pano_static_height">
-
-
- <label>0</label>
-
-
- <style>wxALIGN_LEFT</style>
+ <object class="wxBoxSizer">
+ <orient>wxVERTICAL</orient>
+ <object class="sizeritem">
+ <object class="wxStaticText">
+
+
+
+ <label>Panorama Image Size</label>
+
+
+
+ <font>
+
+
+
+ <style platform="mac">normal</style>
+
+
+
+ <family platform="mac">swiss</family>
+
+
+
+ <weight>bold</weight>
+
+
+
+ <size platform="mac">12</size>
+ </font>
+ </object>
+
+
+
+ <flag></flag>
+
+
+
+ <border>6</border>
+ </object>
+ <object class="sizeritem">
+ <object class="wxBoxSizer">
+ <orient>wxHORIZONTAL</orient>
+ <object class="sizeritem">
+ <object class="wxStaticText">
+
+
+
+ <label>width:</label>
+ </object>
+
+
+
+ <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+
+
+
+ <border>6</border>
+ </object>
+ <object class="sizeritem">
+ <object class="wxTextCtrl" name="pano_val_width">
+
+
+
+ <size>50,-1</size>
+
+
+
+ <style>wxTE_PROCESS_ENTER</style>
+ </object>
+
+
+
+ <flag>wxRIGHT|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+
+
+
+ <border>10</border>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText">
+
+
+
+ <label>height:</label>
+
+
+
+ <style>wxALIGN_RIGHT</style>
+ </object>
+
+
+
+ <flag>wxRIGHT|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+
+
+
+ <border>5</border>
+ </object>
+ <object class="sizeritem">
+ <object class="wxTextCtrl" name="pano_val_height">
+
+
+
+ <size>50,-1</size>
+
+
+
+ <style>wxTE_PROCESS_ENTER</style>
+ </object>
+
+
+
+ <flag>wxRIGHT|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+
+
+
+ <border>10</border>
+ </object>
+ <object class="sizeritem">
+ <object class="wxButton" name="pano_button_opt_width">
+
+
+
+ <label>Calculate Optimal Size</label>
+
+
+
+ <tooltip>calculate highest sensible width. (uses every image pixel)</tooltip>
+ </object>
+
+
+
+ <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+ </object>
+ </object>
+
+
+
+ <border>6</border>
+
+
+
+ <flag>wxALL</flag>
+ </object>
</object>
-
-
- <flag>wxRIGHT|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL|wxADJUST_MINSIZE</flag>
-
-
- <border>15</border>
</object>
<object class="sizeritem">
- <object class="wxButton" name="pano_button_opt_width">
-
-
- <label>Calculate Optimal Size</label>
-
-
- <tooltip>calculate highest sensible width. (uses every image pixel)</tooltip>
+ <object class="wxBoxSizer">
+ <orient>wxVERTICAL</orient>
+ <object class="sizeritem">
+ <object class="wxBoxSizer">
+ <orient>wxHORIZONTAL</orient>
+ <object class="sizeritem">
+ <object class="wxStaticText">
+
+
+
+ <label>Stitching engine:</label>
+ </object>
+
+
+
+ <flag>wxALIGN_CENTRE_VERTICAL</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxChoice" name="pano_choice_stitcher">
+
+
+
+ <content>
+ <item>PTStitcher</item>
+ <item>nona</item>
+ </content>
+
+
+
+ <selection>0</selection>
+ </object>
+
+
+
+ <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+
+
+
+ <border>6</border>
+ </object>
+ </object>
+
+
+
+ <flag>wxEXPAND|wxADJUST_MINSIZE</flag>
+
+
+
+ <border>6</border>
+ </object>
+ <object class="spacer">
+
+
+
+ <size>0,10</size>
+ </object>
</object>
-
-
- <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
</object>
</object>
-
-
- <border>6</border>
-
-
- <flag>wxALL</flag>
</object>
</object>
-
-
- <flag>wxALL|wxEXPAND</flag>
-
-
- <border>6</border>
- </object>
- <object class="sizeritem">
- <object class="wxBoxSizer">
- <orient>wxVERTICAL</orient>
- <object class="sizeritem">
- <object class="wxBoxSizer">
- <orient>wxHORIZONTAL</orient>
- <object class="sizeritem">
- <object class="wxStaticText">
-
-
- <label>Stitching engine:</label>
- </object>
-
-
- <flag>wxALIGN_CENTRE_VERTICAL</flag>
- </object>
- <object class="sizeritem">
- <object class="wxChoice" name="pano_choice_stitcher">
-
-
- <content>
- <item>PTStitcher</item>
- <item>nona</item>
- </content>
-
-
- <selection>0</selection>
- </object>
-
-
- <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-
-
- <border>6</border>
- </object>
- </object>
-
-
- <flag>wxEXPAND|wxADJUST_MINSIZE</flag>
-
-
- <border>6</border>
- </object>
- <object class="spacer">
-
-
- <size>0,10</size>
- </object>
- <object class="sizeritem">
- <object class="unknown" name="pano_stitcher_unknown"/>
-
-
- <option>1</option>
-
-
- <flag>wxLEFT|wxEXPAND</flag>
-
-
- <border>6</border>
- </object>
+ <object class="sizeritem">
+ <object class="unknown" name="pano_stitcher_unknown"/>
+
+
+
+ <option>1</option>
+
+
+
+ <flag>wxLEFT|wxEXPAND</flag>
+
+
+
+ <border>6</border>
</object>
-
-
- <option>1</option>
-
-
- <flag>wxLEFT|wxRIGHT|wxEXPAND|wxADJUST_MINSIZE</flag>
-
-
- <border>6</border>
</object>
</object>
+
<option>1</option>
+
<flag>wxEXPAND</flag>
</object>
</object>
+
<option>1</option>
+
<flag>wxLEFT|wxEXPAND</flag>
+
<border>6</border>
</object>
</object>
+
<option>1</option>
+
<flag>wxALL|wxEXPAND</flag>
+
<border>6</border>
</object>
<orient>wxVERTICAL</orient>
|