Changeset 519c693 in sasview

Timestamp:

Nov 16, 2010 6:41:15 AM (14 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:

effce1d

Parents:

1db4a53

Message:

redesign the dialog sizer for better fit on MAC and PC platforms

File:

• guiframe/local_perspectives/plotting/profile_dialog.py (modified) (9 diffs)

guiframe/local_perspectives/plotting/profile_dialog.py

@@ -14 +14 @@
 
 #SLD panel size 
-if sys.platform.count("win32")>0:
+if sys.platform.count("win32") > 0:
     _STATICBOX_WIDTH = 570
     PANEL_SIZE = 475
     FONT_VARIANT = 0
 else:
-    _STATICBOX_WIDTH = 810
-    PANEL_SIZE = 505
+    _STATICBOX_WIDTH = 610
+    PANEL_SIZE = 500
     FONT_VARIANT = 1
     
@@ -40 +40 @@
         kwds["size"] = wx.Size(_STATICBOX_WIDTH,PANEL_SIZE) 
         wx.Dialog.__init__(self, parent, id = id,  *args, **kwds)
+
         if data != None:
             
@@ -56 +57 @@
             # Panel for plot
             self.plotpanel    = SLDplotpanel(self, axes, -1, 
-                                             style=wx.TRANSPARENT_WINDOW)
+                                             style = wx.TRANSPARENT_WINDOW)
             self.cmap = DEFAULT_CMAP
             ## Create Artist and bind it
@@ -71 +72 @@
             self.Centre()
             self.Layout()
+
             
     def _set_dy_data(self): 
@@ -86 +88 @@
         Set up the layout
         """
-        #  panel
-        sizer = wx.GridBagSizer(14,14)
-        
-        sizer.Add(self.plotpanel,(0, 0), (13, 13), 
-                  wx.EXPAND | wx.LEFT| wx.RIGHT, 1)
-
+        # panel sizer
+        sizer = wx.BoxSizer(wx.VERTICAL)
+        sizer.Add(self.plotpanel,-1, wx.LEFT|wx.RIGHT,  5)
+        sizer.Add((0,10))
         #-----Button------------1
         id = wx.NewId()
@@ -98 +98 @@
         button_reset.Bind(wx.EVT_BUTTON, self._close, 
                           id = button_reset.GetId()) 
-        sizer.Add(button_reset, (13, 12), flag=wx.RIGHT | wx.BOTTOM, border=15)
-
-        sizer.AddGrowableCol(2)
-        sizer.AddGrowableRow(3)
+        sizer.Add(button_reset, 0, wx.LEFT, _STATICBOX_WIDTH - 80) 
+        sizer.Add((0,10))
+        
         self.SetSizerAndFit(sizer)
-        button_reset.SetFocus()
+        
         self.Centre()
         self.Show(True)
-
+        button_reset.SetFocus()
+        
     def _close(self, event):
         """
@@ -136 +136 @@
     Panel
     """
-    def __init__(self, parent,axes=[], id = -1, color = None, dpi = None,
+    def __init__(self, parent,axes = [], id = -1, color = None, dpi = None,
                   **kwargs):
         """
         """
-        PlotPanel.__init__(self, parent, id=id, xtransform='x', ytransform='y', 
-                           color=color, dpi=dpi, **kwargs)
+        PlotPanel.__init__(self, parent, id=id, xtransform = 'x', ytransform = 'y', 
+                           color = color, dpi = dpi, 
+                           size = (_STATICBOX_WIDTH, PANEL_SIZE-100), **kwargs)
+
         # Keep track of the parent Frame
         self.parent = parent
@@ -149 +151 @@
         self.graph = Graph()
         self.axes_label = []
-        for idx in range(0,len(axes)):
+        for idx in range(0, len(axes)):
             self.axes_label.append(axes[idx])
         
@@ -199 +201 @@
         # Initialize the Frame object
         wx.Frame.__init__(self, parent, id, title, wx.DefaultPosition, 
-                          wx.Size(950,850))
+                          wx.Size(_STATICBOX_WIDTH,PANEL_SIZE))
         
         # Panel for 1D plot
-        self.plotpanel    = SLDplotpanel(self, -1, style=wx.RAISED_BORDER)
+        self.plotpanel    = SLDplotpanel(self, -1, style = wx.RAISED_BORDER)
 
 class ViewApp(wx.App):