Changeset 53f9e40 in sasview

Timestamp:

Apr 30, 2013 3:43:03 PM (11 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

3704e33

Parents:

80b93da

Message:

controlpanel frame size is added in start-configuration.

Files:

• sansguiframe/src/sans/guiframe/config.py (modified) (1 diff)
• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (3 diffs)
• sansguiframe/src/sans/guiframe/startup_configuration.py (modified) (3 diffs)
• sansview/custom_config.py (modified) (1 diff)

sansguiframe/src/sans/guiframe/config.py

@@ -82 +82 @@
 GUIFRAME_WIDTH = 1000
 GUIFRAME_HEIGHT = 800
+CONTROL_WIDTH = -1
+CONTROL_HEIGHT = -1
 SetupIconFile_win = os.path.join("images", "ball.ico")
 SetupIconFile_mac = os.path.join("images", "ball.icns")

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -155 +155 @@
     GUIFRAME_WIDTH = custom_config.GUIFRAME_WIDTH 
     GUIFRAME_HEIGHT = custom_config.GUIFRAME_HEIGHT
+    CONTROL_WIDTH = custom_config.CONTROL_WIDTH 
+    CONTROL_HEIGHT = custom_config.CONTROL_HEIGHT
     DEFAULT_PERSPECTIVE = custom_config.DEFAULT_PERSPECTIVE
     CLEANUP_PLOT = custom_config.CLEANUP_PLOT
@@ -172 +174 @@
     GUIFRAME_WIDTH = config.GUIFRAME_WIDTH 
     GUIFRAME_HEIGHT = config.GUIFRAME_HEIGHT
+    CONTROL_WIDTH = -1 
+    CONTROL_HEIGHT = -1
     DEFAULT_PERSPECTIVE = None
     CLEANUP_PLOT = False
@@ -963 +967 @@
             #if style == (GUIFRAME.PLOTTING_ON|GUIFRAME.MANAGER_ON):
             panel_width = self._window_width * 0.45
+            if custom_config != None:
+                if custom_config.CONTROL_WIDTH > 0:
+                    panel_width = CONTROL_WIDTH
+                if custom_config.CONTROL_HEIGHT > 0:
+                    panel_height = CONTROL_HEIGHT
             return panel_width, panel_height
         elif p == self.defaultPanel:

sansguiframe/src/sans/guiframe/startup_configuration.py

@@ -21 +21 @@
 DEFAULT_STRINGS = {'GUIFRAME_WIDTH':-1,
                    'GUIFRAME_HEIGHT':-1,
+                   'CONTROL_WIDTH':-1,
+                   'CONTROL_HEIGHT':-1,
                    'PLOPANEL_WIDTH':-1,
                    'DATAPANEL_WIDTH':-1,
@@ -33 +35 @@
     CURRENT_STRINGS = {'GUIFRAME_WIDTH':CURRENT.GUIFRAME_WIDTH,
                        'GUIFRAME_HEIGHT':CURRENT.GUIFRAME_HEIGHT,
+                       'CONTROL_WIDTH':CURRENT.CONTROL_WIDTH,
+                       'CONTROL_HEIGHT':CURRENT.CONTROL_HEIGHT,
                        'PLOPANEL_WIDTH':CURRENT.PLOPANEL_WIDTH,
                        'DATAPANEL_WIDTH':CURRENT.DATAPANEL_WIDTH,
@@ -135 +139 @@
             self.current_string['PLOPANEL_WIDTH'] = p_size
             
+            try:
+                control_frame = self.parent.get_current_perspective().frame
+                control_w, control_h = control_frame.GetSizeTuple()
+                self.current_string['CONTROL_WIDTH'] = control_w
+                self.current_string['CONTROL_HEIGHT'] = control_h
+            except:
+                self.current_string['CONTROL_WIDTH'] = -1
+                self.current_string['CONTROL_HEIGHT'] = -1
+                
             data_pw, _ = self.parent.panels["data_panel"].frame.GetSizeTuple()
             if data_pw == None:

sansview/custom_config.py

@@ -9 +9 @@
 GUIFRAME_HEIGHT = -1 
 GUIFRAME_WIDTH = -1
+CONTROL_WIDTH = -1
+CONTROL_HEIGHT = -1
 DEFAULT_OPEN_FOLDER = None
 WELCOME_PANEL_SHOW = False