Changeset 641

Timestamp:

09/22/08 14:46:02 (4 months ago)

Author:

astraw

Message:

bugfix: camera controls window would resize to first column filling whole window

Files:

• trunk/fview/motmot/fview/fview.py (modified) (2 diffs)
• trunk/fview/motmot/fview/fview.xrc (modified) (4 diffs)

trunk/fview/motmot/fview/fview.py

@@ -1165 +1165 @@
-        #self.OnQueryCameraSettings(None) # query camera settings to initially fill window
-
+        # re-fit the camera control window
+        self.cam_control_panel.Fit()
+        self.cam_control_frame.Fit()
+
+
-        # send plugins information that camera is starting
-        format = self.cam.get_pixel_coding()
@@ -1194 +1199 @@
-        self.cam_max_width = self.cam.get_max_width()
-        self.cam_max_height = self.cam.get_max_height()
-        self.trigger_mode = self.cam.get_trigger_mode_number()
-
-        # start threads

trunk/fview/motmot/fview/fview.xrc

@@ -48 +48 @@
-  <object class="wxPanel" name="CAMERA_CONTROLS_PANEL">
-    <object class="wxFlexGridSizer">
-      <cols>2</cols>
-      <rows>2</rows>
-      <object class="sizeritem">
-        <object class="wxStaticBoxSizer">
@@ -93 +91 @@
-                    <object class="sizeritem">
-                      <object class="wxChoice" name="EXTERNAL_TRIGGER_MODE">
-content/
+size>30,-1</size
-                      </object>
-                      <option>1</option>
@@ -327 +325 @@
-        <flag>wxEXPAND</flag>
-      </object>
+      <cols>2</cols>
+      <rows>2</rows>
-      <vgap>4</vgap>
-      <hgap>4</hgap>
+      <growablecols>0</growablecols>
-      <growablecols>1</growablecols>
-      <growablecols>2</growablecols>
-      <growablerows>1</growablerows>
-    </object>
@@ -340 +340 @@
-      <object class="sizeritem">
-        <object class="wxStaticText" name="CAM_IFACE_LOADED">
-></label
+/
-        </object>
-      </object>