Changeset 1c2bf90 in sasview

Timestamp:

Nov 28, 2015 4:52:20 PM (9 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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

792e6be, 66f21cd

Parents:

abcbe09

Message:

Need to use FitInside? in a few places to ensure whole window gets
properly resized. Fixes ticket #488

Location:

src/sas/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• fitpage.py (modified) (4 diffs)

src/sas/perspectives/fitting/basepage.py

@@ -2413 +2413 @@
         #draw the model with the current dispersity
         self._draw_model()
-        self.sizer4_4.Layout()
-        self.sizer5.Layout()
-        self.Layout()
-        self.Refresh()
+        ## Need to use FitInside again here to replace the next four lines.
+        ## Otherwised polydispersity off does not resize the scrollwindow. 
+        ## PDB Nov 28, 2015
+        self.FitInside()
+#        self.sizer4_4.Layout()
+#        self.sizer5.Layout()
+#        self.Layout()
+#        self.Refresh()
 
     def _layout_sizer_noDipers(self):

src/sas/perspectives/fitting/fitpage.py

@@ -2264 +2264 @@
 
         self.sizer_set_smearer.Layout()
-        self.Layout()
+        ## we need FitInside here not just self.Layout to ensure all the sizers
+        ## end up with the necessasary space to in the scroll panel. In
+        ## particular the compute and fit buttons end up on top of each other
+        ## PDB Nov 28 2015. 
+        self.FitInside()
 
         if event != None:
@@ -2438 +2442 @@
         self._show_smear_sizer()
         self.sizer_set_smearer.Layout()
-        self.Layout()
+        ## we need FitInside here not just self.Layout to ensure all the sizers
+        ## end up with the necessasary space to in the scroll panel. In
+        ## particular the compute and fit buttons end up on top of each other
+        ## PDB Nov 28 2015. 
+        self.FitInside()
 
         if event != None:
@@ -2568 +2576 @@
         """
         Create a smear object that will change the way residuals
-        are compute when fitting
+        are computed when fitting
         """
         if event != None:
@@ -2583 +2591 @@
 
         self.sizer_set_smearer.Layout()
-        self.Layout()
+        ## we need FitInside here not just self.Layout to ensure all the sizers
+        ## end up with the necessasary space to in the scroll panel. In
+        ## particular the compute and fit buttons end up on top of each other
+        ## PDB Nov 28 2015. 
+        self.FitInside()
         self._set_weight()