Changeset 9f9bb88 in sasview

Timestamp:

May 4, 2012 8:52:32 AM (12 years ago)

Author:

Robert Whitley <robert.whitley@…>

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:

805bfe9

Parents:

bf0acea

Message:

Refs #54. Make window 90% of the screen as default.

Files:

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

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -174 +174 @@
 DEFAULT_STYLE = config.DEFAULT_STYLE
 
-
-PLOPANEL_HEIGTH = config.PLOPANEL_HEIGTH
-DATAPANEL_HEIGHT = config.DATAPANEL_HEIGHT
 PLUGIN_STATE_EXTENSIONS =  config.PLUGIN_STATE_EXTENSIONS
 OPEN_SAVE_MENU = config.OPEN_SAVE_PROJECT_MENU
@@ -878 +875 @@
         get the proper panel width and height
         """
-        panel_height_min = self._window_height
-        panel_width_min = self._window_width 
+        ## Check and set the size
+        if DATAPANEL_WIDTH < 0:
+            panel_width = int(self._window_width * 0.22)
+        else:
+            panel_width = DATAPANEL_WIDTH
+        panel_height = int(self._window_height * 0.9)
         style = self.__gui_style & (GUIFRAME.MANAGER_ON)
         if self._data_panel is not None  and (p == self._data_panel):
-            panel_width_min = DATAPANEL_WIDTH
-            panel_height_min = self._window_height * 0.8
-            return panel_width_min, panel_height_min
+            return panel_width, panel_height
         if hasattr(p, "CENTER_PANE") and p.CENTER_PANE:
             style = self.__gui_style & (GUIFRAME.PLOTTING_ON|GUIFRAME.MANAGER_ON)
             if style == (GUIFRAME.PLOTTING_ON|GUIFRAME.MANAGER_ON):
-                panel_width_min = self._window_width -\
-                            (DATAPANEL_WIDTH +config.PLOPANEL_WIDTH)
-            return panel_width_min, panel_height_min
-        return panel_width_min, panel_height_min
+                panel_width = self._window_width - panel_width
+            return panel_width, panel_height
+        return panel_width, panel_height
     
     def _load_panels(self):
@@ -947 +945 @@
             p = panel_class
             id = wx.NewId()
-            #w, h = self._get_panels_size(p)
             # Check whether we need to put this panel
             # in the center pane
@@ -1086 +1083 @@
         style1 = self.__gui_style & GUIFRAME.FIXED_PANEL
         style2 = self.__gui_style & GUIFRAME.FLOATING_PANEL
+        
+        ## Check and set the size
+        if PLOPANEL_WIDTH < 0:
+            p_panel_width = int(self._window_width * 0.36)
+        else:
+            p_panel_width = PLOPANEL_WIDTH
+        p_panel_height = int(p_panel_width * 0.75)
+        
         if style1 == GUIFRAME.FIXED_PANEL:
             self._mgr.AddPane(p, wx.aui.AuiPaneInfo().
@@ -1098 +1103 @@
                               # Use a large best size to make sure the AUI 
                               # manager takes all the available space
-                              BestSize(wx.Size(PLOPANEL_WIDTH, 
-                                               PLOPANEL_HEIGTH)))
-        
+                              BestSize(wx.Size(p_panel_width, 
+                                               p_panel_height)))
             self._popup_fixed_panel(p)
     
@@ -1110 +1114 @@
                               # Use a large best size to make sure the AUI
                               #  manager takes all the available space
-                              BestSize(wx.Size(PLOPANEL_WIDTH, 
-                                               PLOPANEL_HEIGTH)))
+                              BestSize(wx.Size(p_panel_width, 
+                                               p_panel_height)))
             
             self._popup_floating_panel(p)
-        
         # Register for closing of panels
         self.Bind(wx.aui.EVT_AUI_PANE_CLOSE, self.on_panel_close)
@@ -2848 +2851 @@
         style = self.__gui_style & GUIFRAME.FIXED_PANEL
         if style == GUIFRAME.FIXED_PANEL:
-            self._mgr.GetPane(p.window_name).Dock()
-            self._mgr.GetPane(p.window_name).Floatable()
-            self._mgr.GetPane(p.window_name).Right()
-            self._mgr.GetPane(p.window_name).TopDockable(False)
-            self._mgr.GetPane(p.window_name).BottomDockable(False)
-            self._mgr.GetPane(p.window_name).LeftDockable(False)
-            self._mgr.GetPane(p.window_name).RightDockable(True)
+            pane = self._mgr.GetPane(p.window_name)
+            pane.Dock()
+            pane.Floatable()
+            pane.Right()
+            pane.TopDockable(False)
+            pane.BottomDockable(False)
+            pane.LeftDockable(False)
+            pane.RightDockable(True)
             self._mgr.Update()
             
@@ -2862 +2866 @@
         style = self.__gui_style &  GUIFRAME.FLOATING_PANEL
         if style == GUIFRAME.FLOATING_PANEL: 
-            self._mgr.GetPane(p.window_name).Floatable(True)
-            self._mgr.GetPane(p.window_name).Float()
-            self._mgr.GetPane(p.window_name).Dockable(False)
+            pane = self._mgr.GetPane(p.window_name)
+            pane.Floatable(True)
+            pane.Float()
+            pane.Dockable(False)
             self._mgr.Update()
             
@@ -3478 +3483 @@
         customWidth, customHeight = size
         
-        # If the custom screen is bigger than the 
-        # window screen than make maximum size
-        if customWidth > displayWidth:
-            customWidth = displayWidth
-        if customHeight > displayHeight:
-            customHeight = displayHeight
+        # If the custom size is default, set 90% of the screen size
+        if customWidth < 0 and customHeight < 0:
+            customWidth = displayWidth * 0.9
+            customHeight = displayHeight * 0.9
+        else:
+            # If the custom screen is bigger than the 
+            # window screen than make maximum size
+            if customWidth > displayWidth:
+                customWidth = displayWidth
+            if customHeight > displayHeight:
+                customHeight = displayHeight
             
         # Note that when running Linux and using an Xming (X11) server on a PC
@@ -3494 +3504 @@
         # If dual screen registered as 1 screen. Make width half.
         if displayWidth > (displayHeight*2):
-            customWidth = displayWidth/2
+            if (customWidth == displayWidth):
+                customWidth = displayWidth/2
+            # and set the position to be the corner of the screen.
             posX = 0
             posY = 0
@@ -3504 +3516 @@
         
         # Return the suggested position and size for the application frame.    
-        return (posX, posY), (min(displayWidth, customWidth), min(displayHeight, customHeight))
+        return (posX, posY), (customWidth, customHeight)
 
     

sansview/custom_config.py

@@ -2 +2 @@
     Application appearance custom configuration
 """
-DATAPANEL_WIDTH = 260
+DATAPANEL_WIDTH = -1
 CLEANUP_PLOT = False
 FIXED_PANEL = True
-PLOPANEL_WIDTH = 420
+PLOPANEL_WIDTH = -1
 DATALOADER_SHOW = True
-GUIFRAME_HEIGHT = 840
-GUIFRAME_WIDTH = 1180
+GUIFRAME_HEIGHT = -1 
+GUIFRAME_WIDTH = -1
 DEFAULT_OPEN_FOLDER = None
 WELCOME_PANEL_SHOW = False