Changeset 64f9fa6 in sasview for sansguiframe/src/sans

Timestamp:

Oct 15, 2011 5:45:41 PM (13 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:

108470e6

Parents:

9a56619

Message:

vertical sizer for batch radio buttons

File:

• sansguiframe/src/sans/guiframe/data_panel.py (modified) (7 diffs)

sansguiframe/src/sans/guiframe/data_panel.py

@@ -152 +152 @@
         self.layout_selection()
         self.layout_data_list()
+        self.layout_batch()
         self.layout_button()
-        self.layout_batch()
+        
    
     def define_panel_structure(self):
@@ -166 +167 @@
         self.sizer2 = wx.BoxSizer(wx.VERTICAL)
         self.sizer3 = wx.FlexGridSizer(7, 2, 4, 1)
-        self.sizer4 = wx.BoxSizer(wx.HORIZONTAL)
+        self.sizer4 = wx.BoxSizer(wx.VERTICAL)
         self.sizer5 = wx.BoxSizer(wx.VERTICAL)
        
@@ -173 +174 @@
         self.vbox.Add(self.sizer2, 0, wx.EXPAND|wx.ALL,1)
         self.vbox.Add(self.sizer3, 0, wx.EXPAND|wx.ALL,10)
-        self.vbox.Add(self.sizer4, 0, wx.EXPAND|wx.ALL,5)
+        #self.vbox.Add(self.sizer4, 0, wx.EXPAND|wx.ALL,5)
         
         self.SetSizer(self.vbox)
@@ -263 +264 @@
         self.perspective_cbox = wx.ComboBox(self, -1,
                                 style=wx.CB_READONLY)
-        #self.perspective_cbox.SetMinSize((CBOX_WIDTH, -1))
+        self.perspective_cbox.SetMinSize((BUTTON_WIDTH*1.6, -1))
         wx.EVT_COMBOBOX(self.perspective_cbox,-1, 
                         self._on_perspective_selection)
@@ -292 +293 @@
         self.cb_plotpanel = wx.ComboBox(self, -1, 
                                 style=wx.CB_READONLY|wx.CB_SORT)
-        #self.cb_plotpanel.SetMinSize((CBOX_WIDTH, -1))
+        #self.cb_plotpanel.SetMinSize((BUTTON_WIDTH*2, -1))
         wx.EVT_COMBOBOX(self.cb_plotpanel,-1, self._on_plot_selection)
         self.cb_plotpanel.Disable()
@@ -306 +307 @@
                              (self.bt_append_plot),
                              (self.cb_plotpanel, wx.EXPAND|wx.ADJUST_MINSIZE, 5),
+                             ((5, 5)),
+                             ((5, 5)),
+                             (self.bt_import, 0, wx.EXPAND|wx.RIGHT, 5),
+                             (self.perspective_cbox, wx.EXPAND|wx.ADJUST_MINSIZE, 5),
                              ((10, 10)),
-                             ((10, 10)),
-                             (self.bt_import, 0, wx.EXPAND|wx.RIGHT, 5),
-                             (self.perspective_cbox, wx.EXPAND|wx.ADJUST_MINSIZE, 5)])
+                             (self.sizer4),
+                             ((10, 40)),
+                             ((10, 40))])
 
         self.sizer3.AddGrowableCol(1, 1)
@@ -333 +338 @@
         self.rb_single_mode.SetValue(not self.parent.batch_on)
         self.rb_batch_mode.SetValue(self.parent.batch_on)
-        self.sizer4.AddMany([((5, 5)),
-                             (self.rb_single_mode,0, wx.ALL,5),
-                            (self.rb_batch_mode,0, wx.ALL,5),
-                            (20,80)])
+        self.sizer4.AddMany([(self.rb_single_mode,0, wx.ALL, 4),
+                             (self.rb_batch_mode,0, wx.ALL, 4)])
         
     def on_single_mode(self, event):