Changeset 0f7c930 in sasview for src/sas/sasgui/perspectives/calculator

Timestamp:

Oct 10, 2016 11:04:50 PM (8 years ago)

Author:

butler

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

46dfee9

Parents:

278178b

Message:

force resize of panel (self.FitInside?()) when the button sizer expands
due to user action. Also puts buttons in two rows so not usually a
problem anyway now. Fixes #616

File:

• src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified) (3 diffs)

src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py

@@ -181 +181 @@
         self.hint_sizer = wx.BoxSizer(wx.HORIZONTAL)
         self.qrange_sizer = wx.BoxSizer(wx.HORIZONTAL)
-        self.button_sizer = wx.BoxSizer(wx.HORIZONTAL)
+        self.button_sizer = wx.BoxSizer(wx.VERTICAL)
+        self.button_sizer1 = wx.BoxSizer(wx.HORIZONTAL)
+        self.button_sizer2 = wx.BoxSizer(wx.HORIZONTAL)
 
     def _layout_data_name(self):
@@ -392 +394 @@
         self.bt_close.SetToolTipString("Close this window")
 
-        self.button_sizer.AddMany([(self.time_text , 0, wx.LEFT, 20),
-                                   (self.orient_combo , 0, wx.LEFT, 20),
-                                   (self.bt_compute, 0, wx.LEFT, 20),
+        self.button_sizer1.AddMany([(self.bt_compute, 0, wx.LEFT, 20),
+                                   (self.orient_combo , 0, wx.LEFT, 20)])
+        self.button_sizer2.AddMany([(self.time_text , 0, wx.LEFT, 20),
                                    (self.bt_help, 0, wx.LEFT, 20),
-                                   (self.bt_close, 0, wx.LEFT, 5)])
+                                   (self.bt_close, 0, wx.LEFT, 20)])
+        self.button_sizer.AddMany([(self.button_sizer1 , 0, wx.BOTTOM|wx.LEFT, 10),
+                                   (self.button_sizer2 , 0, wx.LEFT, 10)])
 
     def estimate_ctime(self):
@@ -600 +604 @@
                 raise
             self.orient_combo.Show(is_pdbdata)
-            self.button_sizer.Layout()
+            #self.button_sizer.Layout()
+            self.FitInside()
             self._set_sld_data_helper(True)
         except: