Commit [11ab92] default Maximize Restore History

Merged with gui_overhaul branch

tmodes tmodes 2012-07-25

1 2 3 .. 8 > >> (Page 1 of 8)
added src/hugin1/hugin/xrc/data/hugin_small.png
removed src/hugin1/hugin/xrc/lens_panel.xrc
removed src/hugin1/hugin/xrc/crop_panel.xrc
changed CMakeModules/win_bundle.cmake
changed CMakeModules/FindExiv2.cmake
changed src/hugin_cpfind/cpfind/CMakeLists.txt
changed src/hugin1/PT/Panorama.h
changed src/hugin1/PT/PanoCommand.h
changed src/hugin1/ptbatcher/FindPanoDialog.cpp
changed src/hugin1/ptbatcher/PTBatcherGUI.cpp
changed src/hugin1/hugin/xrc/preview_frame.xrc
changed src/hugin1/hugin/xrc/pref_dialog.xrc
changed src/hugin1/hugin/xrc/CMakeLists.txt
changed src/hugin1/hugin/xrc/batch_frame.xrc
changed src/hugin1/hugin/xrc/edit_script_dialog.xrc
changed src/hugin1/hugin/xrc/images_panel.xrc
changed src/hugin1/hugin/xrc/optimize_photo_panel.xrc
changed src/hugin1/hugin/xrc/optimize_panel.xrc
changed src/hugin1/hugin/xrc/pano_panel.xrc
changed src/hugin1/hugin/xrc/main_menu.xrc
changed src/hugin1/hugin/xrc/main_frame.xrc
changed src/hugin1/hugin/xrc/mask_editor_panel.xrc
changed src/hugin1/hugin/xrc/reset_dialog.xrc
copied src/hugin1/hugin/xrc/assistant_panel.xrc -> src/hugin1/hugin/xrc/image_variable_dlg.xrc
src/hugin1/hugin/xrc/data/hugin_small.png Diff Switch to side-by-side view
Loading...
CMakeModules/win_bundle.cmake Diff Switch to side-by-side view
Loading...
CMakeModules/FindExiv2.cmake Diff Switch to side-by-side view
Loading...
src/hugin_cpfind/cpfind/CMakeLists.txt Diff Switch to side-by-side view
Loading...
src/hugin1/PT/Panorama.h Diff Switch to side-by-side view
Loading...
src/hugin1/PT/PanoCommand.h Diff Switch to side-by-side view
Loading...
src/hugin1/ptbatcher/FindPanoDialog.cpp Diff Switch to side-by-side view
Loading...
src/hugin1/ptbatcher/PTBatcherGUI.cpp Diff Switch to side-by-side view
Loading...
src/hugin1/hugin/xrc/preview_frame.xrc Diff Switch to side-by-side view
Loading...
src/hugin1/hugin/xrc/pref_dialog.xrc Diff Switch to side-by-side view
Loading...
src/hugin1/hugin/xrc/CMakeLists.txt Diff Switch to side-by-side view
Loading...
src/hugin1/hugin/xrc/batch_frame.xrc Diff Switch to side-by-side view
Loading...
src/hugin1/hugin/xrc/edit_script_dialog.xrc Diff Switch to side-by-side view
Loading...
src/hugin1/hugin/xrc/images_panel.xrc Diff Switch to side-by-side view
Loading...
src/hugin1/hugin/xrc/optimize_photo_panel.xrc Diff Switch to side-by-side view
Loading...
src/hugin1/hugin/xrc/optimize_panel.xrc Diff Switch to side-by-side view
Loading...
src/hugin1/hugin/xrc/pano_panel.xrc Diff Switch to side-by-side view
Loading...
src/hugin1/hugin/xrc/main_menu.xrc Diff Switch to side-by-side view
Loading...
src/hugin1/hugin/xrc/main_frame.xrc Diff Switch to side-by-side view
Loading...
src/hugin1/hugin/xrc/mask_editor_panel.xrc Diff Switch to side-by-side view
Loading...
src/hugin1/hugin/xrc/reset_dialog.xrc Diff Switch to side-by-side view
Loading...
src/hugin1/hugin/xrc/assistant_panel.xrc to src/hugin1/hugin/xrc/image_variable_dlg.xrc
--- a/src/hugin1/hugin/xrc/assistant_panel.xrc
+++ b/src/hugin1/hugin/xrc/image_variable_dlg.xrc
@@ -1,347 +1,574 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <resource>
-  <object class="wxPanel" name="assistant_panel">
+  <object class="wxDialog" name="image_variables_dialog">
     <object class="wxBoxSizer">
-      <orient>wxHORIZONTAL</orient>
+      <orient>wxVERTICAL</orient>
       <object class="sizeritem">
-        <object class="wxPanel" name="ass_control_panel">
-          <object class="wxBoxSizer">
-            <orient>wxVERTICAL</orient>
-            <object class="spacer">
-              <size>0,12</size>
-            </object>
-            <object class="sizeritem">
+        <object class="wxNotebook">
+          <object class="notebookpage">
+            <object class="wxPanel">
               <object class="wxBoxSizer">
                 <object class="sizeritem">
-                  <object class="wxButton" name="ass_load_images_button">
-                    <label>1. Load images...</label>
-                    <tooltip>Load a series of images</tooltip>
+                  <object class="wxGridBagSizer">
+                    <object class="sizeritem">
+                      <object class="wxStaticText">
+                        <label>Yaw:</label>
+                      </object>
+                      <flag>wxALIGN_CENTRE_VERTICAL</flag>
+                      <cellpos>0,0</cellpos>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxTextCtrl" name="image_variable_y">
+                        <size>65,-1</size>
+                      </object>
+                      <cellpos>0,1</cellpos>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxStaticText">
+                        <label>Pitch:</label>
+                      </object>
+                      <flag>wxALIGN_CENTRE_VERTICAL</flag>
+                      <cellpos>1,0</cellpos>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxTextCtrl" name="image_variable_p">
+                        <size>65,-1</size>
+                      </object>
+                      <cellpos>1,1</cellpos>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxStaticText">
+                        <label>Roll:</label>
+                      </object>
+                      <flag>wxALIGN_CENTRE_VERTICAL</flag>
+                      <cellpos>2,0</cellpos>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxTextCtrl" name="image_variable_r">
+                        <size>65,-1</size>
+                      </object>
+                      <cellpos>2,1</cellpos>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxStaticText" name="image_variable_text_translation">
+                        <label>Translation parameter</label>
+                        <font>
+                          <style platform="mac">normal</style>
+                          <family platform="mac">swiss</family>
+                          <weight>bold</weight>
+                          <size platform="mac">12</size>
+                        </font>
+                      </object>
+                      <flag>wxTOP</flag>
+                      <border>12</border>
+                      <cellpos>3,0</cellpos>
+                      <cellspan>1,2</cellspan>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxStaticText" name="image_variable_text_translation_x">
+                        <label>X:</label>
+                      </object>
+                      <flag>wxALIGN_CENTRE_VERTICAL</flag>
+                      <cellpos>4,0</cellpos>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxTextCtrl" name="image_variable_TrX">
+                        <size>65,-1</size>
+                      </object>
+                      <cellpos>4,1</cellpos>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxStaticText" name="image_variable_text_translation_y">
+                        <label>Y:</label>
+                      </object>
+                      <flag>wxALIGN_CENTRE_VERTICAL</flag>
+                      <cellpos>5,0</cellpos>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxTextCtrl" name="image_variable_TrY">
+                        <size>65,-1</size>
+                      </object>
+                      <cellpos>5,1</cellpos>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxStaticText" name="image_variable_text_translation_z">
+                        <label>Z:</label>
+                      </object>
+                      <flag>wxALIGN_CENTRE_VERTICAL</flag>
+                      <cellpos>6,0</cellpos>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxTextCtrl" name="image_variable_TrZ">
+                        <size>65, -1</size>
+                      </object>
+                      <cellpos>6,1</cellpos>
+                    </object>
+                    <vgap>3</vgap>
+                    <hgap>6</hgap>
                   </object>
-                  <flag>wxBOTTOM</flag>
-                  <border>12</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxBoxSizer">
-                    <orient>wxVERTICAL</orient>
-                    <object class="sizeritem">
-                      <object class="wxStaticText" name="ass_load_images_text">
-                        <label>no images loaded</label>
-                      </object>
-                      <flag>wxBOTTOM|wxEXPAND|wxADJUST_MINSIZE</flag>
-                      <border>6</border>
-                    </object>
-                  </object>
-                  <flag>wxLEFT|wxEXPAND</flag>
+                  <option>1</option>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>15</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxStaticBoxSizer">
-                    <orient>wxVERTICAL</orient>
-                    <object class="sizeritem">
-                      <object class="wxCheckBox" name="ass_exif_cb">
-                        <label>Automatic (use EXIF data)</label>
-                        <hidden>1</hidden>
-                      </object>
-                      <flag>wxTOP|wxBOTTOM</flag>
-                      <border>6</border>
-                    </object>
-                    <object class="sizeritem">
-                      <object class="wxPanel" name="ass_lens_group">
-                        <object class="wxBoxSizer">
-                          <orient>wxVERTICAL</orient>
-                          <object class="sizeritem">
-                            <object class="wxFlexGridSizer">
-                              <object class="sizeritem">
-                                <object class="wxStaticText">
-                                  <label>Lens type:</label>
-                                  <style>wxALIGN_RIGHT</style>
-                                </object>
-                                <flag>wxALIGN_CENTRE_VERTICAL</flag>
-                              </object>
-                              <object class="sizeritem">
-                                <object class="wxChoice" name="ass_lens_proj_choice">
-                                  <size>200,-1</size>
-                                  <content>
-                                    <item/></content>
-                                </object>
-                                <flag>wxALIGN_CENTRE_VERTICAL</flag>
-                              </object>
-                              <cols>2</cols>
-                              <hgap>6</hgap>
-                            </object>
-                            <flag>wxTOP|wxEXPAND</flag>
-                            <border>1</border>
-                          </object>
-                          <object class="spacer">
-                            <size>0,6</size>
-                          </object>
-                          <object class="sizeritem">
-                            <object class="wxFlexGridSizer">
-                              <object class="sizeritem">
-                                <object class="wxStaticText">
-                                  <label>Focal length:</label>
-                                  <style>wxALIGN_RIGHT</style>
-                                </object>
-                                <flag>wxALIGN_CENTRE_VERTICAL</flag>
-                              </object>
-                              <object class="sizeritem">
-                                <object class="wxTextCtrl" name="ass_focallength_text"/>
-                                <minsize>60,-1</minsize>
-                              </object>
-                              <cols>6</cols>
-                              <hgap>6</hgap>
-                              <object class="sizeritem">
-                                <object class="wxStaticText">
-                                  <label>mm</label>
-                                </object>
-                                <flag>wxALIGN_CENTRE_VERTICAL</flag>
-                              </object>
-                              <object class="sizeritem">
-                                <object class="wxStaticText">
-                                  <label>Focal length multiplier:</label>
-                                </object>
-                                <flag>wxLEFT|wxALIGN_CENTRE_VERTICAL</flag>
-                                <border>20</border>
-                              </object>
-                              <object class="sizeritem">
-                                <object class="wxTextCtrl" name="ass_cropfactor_text"/>
-                                <minsize>60,-1</minsize>
-                              </object>
-                              <object class="sizeritem">
-                                <object class="wxStaticText">
-                                  <label>x</label>
-                                </object>
-                                <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                              </object>
-                            </object>
-                            <flag>wxEXPAND</flag>
-                          </object>
-                          <object class="spacer">
-                            <size>0,6</size>
-                          </object>
-                          <object class="sizeritem">
-                            <object class="wxButton" name="ass_load_lens_button">
-                              <label>Load lens...</label>
-                            </object>
-                            <flag>wxBOTTOM</flag>
-                            <border>3</border>
-                          </object>
-                        </object>
-                      </object>
-                      <flag>wxLEFT|wxEXPAND</flag>
-                      <border>12</border>
-                    </object>
-                    <label>Camera and Lens</label>
-                  </object>
-                  <flag>wxLEFT</flag>
-                  <border>15</border>
-                </object>
-                <object class="spacer">
-                  <size>0,20</size>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxBoxSizer">
-                    <orient>wxHORIZONTAL</orient>
-                    <object class="sizeritem">
-                      <object class="wxButton" name="ass_align_button">
-                        <label>2. Align...</label>
-                        <tooltip>Align all images. Creates control points and optimizes the image positions</tooltip>
-                      </object>
-                      <flag>wxALL</flag>
-                      <border>6</border>
-                    </object>
-                    <object class="sizeritem">
-                      <object class="wxButton" name="ass_align_batch_button">
-                        <label>Send to assistant queue</label>
-                      </object>
-                      <flag>wxALL</flag>
-                      <border>6</border>
-                    </object>
-                  </object>
-                  <flag>wxBOTTOM</flag>
-                  <border>12</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxStaticText" name="ass_align_text">
-                    <label></label>
-                    <style></style>
-                  </object>
-                  <flag>wxLEFT|wxEXPAND|wxADJUST_MINSIZE</flag>
-                  <border>15</border>
-                </object>
-                <object class="spacer">
-                  <size>0,12</size>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxButton" name="ass_create_button">
-                    <label>3. Create panorama...</label>
-                    <tooltip>Create a high resolution panorama</tooltip>
-                  </object>
                 </object>
                 <orient>wxVERTICAL</orient>
               </object>
-              <option>1</option>
-              <flag>wxLEFT|wxEXPAND</flag>
-              <border>10</border>
-              <ratio>1</ratio>
             </object>
-            <object class="spacer">
-              <size>0,12</size>
+            <label>Positions</label>
+          </object>
+          <object class="notebookpage">
+            <object class="wxPanel">
+              <object class="wxBoxSizer">
+                <orient>wxHORIZONTAL</orient>
+                <object class="sizeritem">
+                  <object class="wxGridBagSizer">
+                    <object class="sizeritem">
+                      <object class="wxStaticText">
+                        <label>Lens</label>
+                        <font>
+                          <style platform="mac">normal</style>
+                          <family platform="mac">swiss</family>
+                          <weight>bold</weight>
+                          <size platform="mac">12</size>
+                        </font>
+                      </object>
+                      <cellpos>0,0</cellpos>
+                      <cellspan>1,2</cellspan>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxStaticText">
+                        <label>degrees of view (v):</label>
+                      </object>
+                      <flag>wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                      <border>3</border>
+                      <cellpos>1,0</cellpos>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxTextCtrl" name="image_variable_v">
+                        <size>65,-1</size>
+                      </object>
+                      <cellpos>1,1</cellpos>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxStaticText">
+                        <label>Radial Distortion</label>
+                        <font>
+                          <style platform="mac">normal</style>
+                          <family platform="mac">swiss</family>
+                          <weight>bold</weight>
+                          <size platform="mac">12</size>
+                        </font>
+                      </object>
+                      <flag>wxTOP</flag>
+                      <border>12</border>
+                      <cellpos>2,0</cellpos>
+                      <cellspan>1,2</cellspan>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxStaticText">
+                        <label>distortion (a):</label>
+                      </object>
+                      <flag>wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                      <border>3</border>
+                      <cellpos>3,0</cellpos>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxTextCtrl" name="image_variable_a">
+                        <size>65,-1</size>
+                      </object>
+                      <cellpos>3,1</cellpos>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxStaticText">
+                        <label>barrel (b):</label>
+                      </object>
+                      <flag>wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                      <border>3</border>
+                      <cellpos>4,0</cellpos>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxTextCtrl" name="image_variable_b">
+                        <size>65,-1</size>
+                      </object>
+                      <cellpos>4,1</cellpos>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxStaticText">
+                        <label>distortion (c):</label>
+                      </object>
+                      <flag>wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                      <border>3</border>
+                      <cellpos>5,0</cellpos>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxTextCtrl" name="image_variable_c">
+                        <size>65,-1</size>
+                      </object>
+                      <cellpos>5,1</cellpos>
+                    </object>
+                    <vgap>6</vgap>
+                  </object>
+                  <flag>wxEXPAND|wxALL</flag>
+                  <border>6</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticLine">
+                    <style>wxLI_VERTICAL</style>
+                  </object>
+                  <flag>wxEXPAND</flag>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxGridBagSizer">
+                    <object class="sizeritem">
+                      <object class="wxStaticText">
+                        <label>Image Center Shift</label>
+                        <font>
+                          <style platform="mac">normal</style>
+                          <family platform="mac">swiss</family>
+                          <weight>bold</weight>
+                          <size platform="mac">12</size>
+                        </font>
+                      </object>
+                      <cellpos>0,0</cellpos>
+                      <cellspan>1,2</cellspan>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxStaticText">
+                        <label>horizontal (d):</label>
+                      </object>
+                      <flag>wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                      <border>3</border>
+                      <cellpos>1,0</cellpos>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxTextCtrl" name="image_variable_d">
+                        <size>65,-1</size>
+                      </object>
+                      <cellpos>1,1</cellpos>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxStaticText">
+                        <label>vertical (e):</label>
+                      </object>
+                      <flag>wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                      <border>3</border>
+                      <cellpos>2,0</cellpos>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxTextCtrl" name="image_variable_e">
+                        <size>65,-1</size>
+                      </object>
+                      <cellpos>2,1</cellpos>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxStaticText" name="image_variable_text_shear">
+                        <label>Image Shearing</label>
+                        <font>
+                          <style platform="mac">normal</style>
+                          <family platform="mac">swiss</family>
+                          <weight>bold</weight>
+                          <size platform="mac">12</size>
+                        </font>
+                      </object>
+                      <flag>wxTOP</flag>
+                      <border>12</border>
+                      <cellpos>3,0</cellpos>
+                      <cellspan>1,2</cellspan>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxStaticText" name="image_variable_text_shear_g">
+                        <label>horizontal (g):</label>
+                      </object>
+                      <flag>wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                      <border>3</border>
+                      <cellpos>4,0</cellpos>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxTextCtrl" name="image_variable_g">
+                        <size>65,-1</size>
+                      </object>
+                      <cellpos>4,1</cellpos>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxStaticText" name="image_variable_text_shear_t">
+                        <label>vertical (t):</label>
+                      </object>
+                      <flag>wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                      <border>3</border>
+                      <cellpos>5,0</cellpos>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxTextCtrl" name="image_variable_t">
+                        <size>65,-1</size>
+                      </object>
+                      <cellpos>5,1</cellpos>
+                    </object>
+                    <vgap>6</vgap>
+                  </object>
+                  <flag>wxEXPAND|wxALL</flag>
+                  <border>6</border>
+                </object>
+              </object>
             </object>
-            <object class="sizeritem">
-              <object class="unknown" name="ass_druid">
-                <hidden>1</hidden>
+            <label>Lens</label>
+          </object>
+          <object class="notebookpage">
+            <object class="wxPanel">
+              <object class="wxBoxSizer">
+                <orient>wxVERTICAL</orient>
+                <object class="sizeritem">
+                  <object class="wxBoxSizer">
+                    <object class="sizeritem">
+                      <object class="wxStaticText">
+                        <label>Exposure and Color</label>
+                        <font>
+                          <style platform="mac">normal</style>
+                          <family platform="mac">swiss</family>
+                          <weight>bold</weight>
+                          <size platform="mac">12</size>
+                        </font>
+                      </object>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxFlexGridSizer">
+                        <object class="sizeritem">
+                          <object class="wxStaticText">
+                            <label>Exposure (Eev):</label>
+                          </object>
+                          <flag>wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                          <border>3</border>
+                        </object>
+                        <object class="sizeritem">
+                          <object class="wxTextCtrl" name="image_variable_Eev">
+                            <size>65,-1</size>
+                          </object>
+                        </object>
+                        <object class="sizeritem">
+                          <object class="wxStaticText">
+                            <label>Red multiplier (Er):</label>
+                          </object>
+                          <flag>wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                          <border>3</border>
+                        </object>
+                        <object class="sizeritem">
+                          <object class="wxTextCtrl" name="image_variable_Er">
+                            <size>65,-1</size>
+                          </object>
+                        </object>
+                        <object class="sizeritem">
+                          <object class="wxStaticText">
+                            <label>Blue multiplier (Eb):</label>
+                          </object>
+                          <flag>wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                          <border>3</border>
+                        </object>
+                        <object class="sizeritem">
+                          <object class="wxTextCtrl" name="image_variable_Eb">
+                            <size>65,-1</size>
+                          </object>
+                        </object>
+                        <cols>2</cols>
+                        <vgap>6</vgap>
+                      </object>
+                      <flag>wxEXPAND|wxALL</flag>
+                      <border>6</border>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxStaticLine">
+                        <style>wxLI_HORIZONTAL</style>
+                      </object>
+                      <flag>wxEXPAND</flag>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxStaticText">
+                        <label>Vignetting</label>
+                        <font>
+                          <style platform="mac">normal</style>
+                          <family platform="mac">swiss</family>
+                          <weight>bold</weight>
+                          <size platform="mac">12</size>
+                        </font>
+                      </object>
+                      <flag>wxTOP</flag>
+                      <border>12</border>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxBoxSizer">
+                        <object class="sizeritem">
+                          <object class="wxBoxSizer">
+                            <object class="sizeritem">
+                              <object class="wxTextCtrl" name="image_variable_Vb">
+                                <size>65,-1</size>
+                              </object>
+                            </object>
+                            <object class="sizeritem">
+                              <object class="wxStaticText">
+                                <label>* r^2 +</label>
+                              </object>
+                              <flag>wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                              <border>3</border>
+                            </object>
+                            <object class="sizeritem">
+                              <object class="wxTextCtrl" name="image_variable_Vc">
+                                <size>65,-1</size>
+                              </object>
+                            </object>
+                            <object class="sizeritem">
+                              <object class="wxStaticText">
+                                <label>* r^4 +</label>
+                              </object>
+                              <flag>wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                              <border>3</border>
+                            </object>
+                            <object class="sizeritem">
+                              <object class="wxTextCtrl" name="image_variable_Vd">
+                                <size>65,-1</size>
+                              </object>
+                            </object>
+                            <object class="sizeritem">
+                              <object class="wxStaticText">
+                                <label>* r^6</label>
+                              </object>
+                              <flag>wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                              <border>3</border>
+                            </object>
+                            <orient>wxHORIZONTAL</orient>
+                          </object>
+                        </object>
+                        <object class="sizeritem">
+                          <object class="wxStaticText">
+                            <label>Vignetting Center Shift</label>
+                          </object>
+                          <flag>wxTOP</flag>
+                          <border>6</border>
+                        </object>
+                        <object class="sizeritem">
+                          <object class="wxBoxSizer">
+                            <object class="sizeritem">
+                              <object class="wxStaticText">
+                                <label>x:</label>
+                              </object>
+                              <flag>wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                              <border>3</border>
+                            </object>
+                            <object class="sizeritem">
+                              <object class="wxTextCtrl" name="image_variable_Vx">
+                                <size>65,-1</size>
+                              </object>
+                            </object>
+                            <object class="sizeritem">
+                              <object class="wxStaticText">
+                                <label>y:</label>
+                              </object>
+                              <flag>wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                              <border>3</border>
+                            </object>
+                            <object class="sizeritem">
+                              <object class="wxTextCtrl" name="image_variable_Vy">
+                                <size>65,-1</size>
+                              </object>
+                            </object>
+                            <orient>wxHORIZONTAL</orient>
+                          </object>
+                        </object>
+                        <orient>wxVERTICAL</orient>
+                      </object>
+                      <flag>wxEXPAND|wxALL</flag>
+                      <border>6</border>
+                    </object>
+                    <orient>wxVERTICAL</orient>
+                  </object>
+                  <flag>wxALL</flag>
+                  <border>3</border>
+                </object>
               </object>
-              <flag>wxRIGHT</flag>
-              <border>10</border>
             </object>
+            <label>Photometrics</label>
+          </object>
+          <object class="notebookpage">
+            <object class="wxPanel">
+              <object class="wxBoxSizer">
+                <orient>wxVERTICAL</orient>
+                <object class="sizeritem">
+                  <object class="wxBoxSizer">
+                    <object class="sizeritem">
+                      <object class="wxBoxSizer">
+                        <object class="sizeritem">
+                          <object class="wxStaticText">
+                            <label>Type:</label>
+                            <style>wxALIGN_RIGHT</style>
+                          </object>
+                          <flag>wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                          <border>3</border>
+                        </object>
+                        <object class="spacer">
+                          <size>6,-1</size>
+                        </object>
+                        <object class="sizeritem">
+                          <object class="wxChoice" name="image_variable_responseType">
+                            <content>
+                              <item>custom (EMoR)</item>
+                              <item>Linear</item>
+                            </content>
+                          </object>
+                        </object>
+                        <orient>wxHORIZONTAL</orient>
+                      </object>
+                      <flag>wxALL|wxEXPAND</flag>
+                      <border>6</border>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxStaticText">
+                        <label>Parameters:</label>
+                      </object>
+                      <flag>wxLEFT|wxTOP|wxEXPAND</flag>
+                      <border>6</border>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxFlexGridSizer">
+                        <object class="sizeritem">
+                          <object class="wxTextCtrl" name="image_variable_Ra">
+                            <size>65,-1</size>
+                          </object>
+                        </object>
+                        <object class="sizeritem">
+                          <object class="wxTextCtrl" name="image_variable_Rb">
+                            <size>65,-1</size>
+                          </object>
+                        </object>
+                        <object class="sizeritem">
+                          <object class="wxTextCtrl" name="image_variable_Rc">
+                            <size>65,-1</size>
+                          </object>
+                        </object>
+                        <object class="sizeritem">
+                          <object class="wxTextCtrl" name="image_variable_Rd">
+                            <size>65,-1</size>
+                          </object>
+                        </object>
+                        <object class="sizeritem">
+                          <object class="wxTextCtrl" name="image_variable_Re">
+                            <size>65,-1</size>
+                          </object>
+                        </object>
+                        <cols>2</cols>
+                        <vgap>5</vgap>
+                        <hgap>6</hgap>
+                      </object>
+                      <flag>wxALL|wxEXPAND</flag>
+                      <border>6</border>
+                    </object>
+                    <orient>wxVERTICAL</orient>
+                  </object>
+                  <flag>wxALL</flag>
+                  <border>12</border>
+                </object>
+              </object>
+            </object>
+            <label>Camera response</label>
           </object>
         </object>
-        <option>1</option>
-        <flag>wxEXPAND</flag>
-      </object>
-    </object>
-  </object>
-  <object class="wxDialog" name="dlg_focallength">
-    <title>Camera and Lens data</title>
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <orient>wxVERTICAL</orient>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="lensdlg_message">
-              <label>a0123456789012345678901234567890123456789
-b
-c
-d
-e</label>
-            </object>
-            <flag>wxEXPAND|wxADJUST_MINSIZE</flag>
-          </object>
-          <object class="spacer">
-            <size>0,10</size>
-          </object>
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Lens type:</label>
-                  <style>wxALIGN_RIGHT</style>
-                </object>
-                <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                <border>6</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxChoice" name="lensdlg_type_choice">
-                  <content>
-                    <item/></content>
-                </object>
-              </object>
-              <object class="spacer">
-                <option>1</option>
-                <flag>wxEXPAND</flag>
-              </object>
-              <object class="sizeritem">
-                <object class="wxButton" name="lensdlg_load_lens_button">
-                  <label>Load lens data...</label>
-                  <style></style>
-                </object>
-                <flag>wxLEFT|wxALIGN_RIGHT</flag>
-                <border>12</border>
-              </object>
-              <orient>wxHORIZONTAL</orient>
-            </object>
-            <flag>wxLEFT|wxEXPAND</flag>
-            <border>12</border>
-          </object>
-          <object class="spacer">
-            <size>0,10</size>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Enter horizontal field of view (HFOV) or focal length and crop factor:</label>
-            </object>
-            <flag>wxEXPAND</flag>
-          </object>
-          <object class="spacer">
-            <size>0,6</size>
-          </object>
-          <object class="sizeritem">
-            <object class="wxFlexGridSizer">
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>HFOV (v):</label>
-                  <style>wxALIGN_RIGHT</style>
-                </object>
-                <flag>wxALIGN_CENTRE_VERTICAL</flag>
-              </object>
-              <object class="sizeritem">
-                <object class="wxTextCtrl" name="lensdlg_hfov_text"/>
-                <minsize>60,-1</minsize>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>degrees</label>
-                </object>
-                <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-              </object>
-              <object class="spacer">
-                <size>0,0</size>
-              </object>
-              <object class="spacer">
-                <size>0,0</size>
-              </object>
-              <object class="spacer">
-                <size>0,0</size>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Focal length:</label>
-                  <style>wxALIGN_RIGHT</style>
-                </object>
-                <flag>wxALIGN_CENTRE_VERTICAL</flag>
-              </object>
-              <object class="sizeritem">
-                <object class="wxTextCtrl" name="lensdlg_focallength_text"/>
-                <minsize>60,-1</minsize>
-              </object>
-              <cols>6</cols>
-              <vgap>6</vgap>
-              <hgap>6</hgap>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>mm</label>
-                </object>
-                <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Focal length multiplier:</label>
-                </object>
-                <flag>wxLEFT|wxALIGN_CENTRE_VERTICAL</flag>
-                <border>20</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxTextCtrl" name="lensdlg_cropfactor_text"/>
-                <minsize>60,-1</minsize>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>x</label>
-                </object>
-                <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-              </object>
-            </object>
-            <flag>wxLEFT|wxEXPAND</flag>
-            <border>12</border>
-          </object>
-          <object class="spacer">
-            <size>0,6</size>
-          </object>
-        </object>
-        <flag>wxALL</flag>
-        <border>10</border>
+        <flag>wxEXPAND|wxALL</flag>
+        <border>6</border>
       </object>
       <object class="sizeritem">
         <object class="wxStdDialogButtonSizer">
@@ -358,9 +585,10 @@
           </object>
         </object>
         <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
+        <border>6</border>
       </object>
     </object>
-    <style>wxCAPTION|wxRESIZE_BORDER</style>
+    <title>Image variables</title>
+    <style>wxDEFAULT_DIALOG_STYLE</style>
   </object>
-</resource>
+</resource>
1 2 3 .. 8 > >> (Page 1 of 8)