Changeset 657490af in sasview

Timestamp:

Oct 21, 2011 3:08:45 PM (13 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

5531a46

Parents:

18476d6

Message:

make sure data selection dialog is well formatted for mac

File:

• fittingview/src/sans/perspectives/fitting/fitting_widgets.py (modified) (6 diffs)

fittingview/src/sans/perspectives/fitting/fitting_widgets.py

@@ -14 +14 @@
 from wx.lib.scrolledpanel import ScrolledPanel
 
-WIDTH = 400
-HEIGHT = 300
+
 MAX_NBR_DATA = 4
+WIDTH = 430
+HEIGHT = 350
 
+class DialogPanel(ScrolledPanel):
+    def __init__(self, *args, **kwds):
+        ScrolledPanel.__init__(self, *args, **kwds)
+        self.SetupScrolling()
+        
 class BatchDataDialog(wx.Dialog):
     """
@@ -26 +32 @@
     def __init__(self, parent=None,  *args, **kwds):
         wx.Dialog.__init__(self, parent, *args, **kwds)
-        self.SetSize((WIDTH, 250))
+        self.SetSize((WIDTH, HEIGHT))
         self.data_1d_selected = None
         self.data_2d_selected = None
@@ -70 +76 @@
         vbox.Add(button_sizer, 0 , wx.TOP|wx.BOTTOM, 10)
         self.SetSizer(vbox)
+        self.Layout()
         
     def get_data(self):
@@ -99 +106 @@
         select_data_text = " %s Data selected.\n" % str(self._nb_selected_data)
         self._data_text_ctrl = wx.StaticText(self, -1, str(select_data_text))
+                               
         self._data_text_ctrl.SetForegroundColour('blue')
         self._sizer_main = wx.BoxSizer(wx.VERTICAL)
@@ -104 +112 @@
         self._sizer_button = wx.BoxSizer(wx.HORIZONTAL)
         self._choice_sizer = wx.GridBagSizer(5, 5)
-        self._panel = ScrolledPanel(self, style=wx.RAISED_BORDER,
-                               size=(WIDTH-20, HEIGHT-50))
-        self._panel.SetupScrolling()
+        self._panel = DialogPanel(self, style=wx.RAISED_BORDER,
+                               size=(WIDTH-20, HEIGHT/3))
         self.__do_layout(data_list, text=text)
         
@@ -150 +157 @@
         static_line = wx.StaticLine(self, -1)
         
-        self._sizer_txt.Add(self._panel, 1, wx.EXPAND|wx.LEFT|wx.RIGHT, 5)
-        self._sizer_main.Add(self._sizer_txt, 1, wx.EXPAND|wx.ALL, 10)
-        self._sizer_main.Add(self._data_text_ctrl, 0, 
-                             wx.EXPAND|wx.LEFT|wx.RIGHT, 10)
+        self._sizer_txt.Add(self._panel, 0, wx.EXPAND|wx.ALL, 10)
+        self._sizer_main.Add(self._sizer_txt, 0, wx.EXPAND|wx.ALL, 10)
+        self._sizer_main.Add(self._data_text_ctrl, 0,  wx.EXPAND|wx.ALL, 10)
         self._sizer_main.Add(static_line, 0, wx.EXPAND, 0)
         self._sizer_main.Add(self._sizer_button, 0, wx.EXPAND|wx.ALL, 10)