Changeset 8a51dea0 in sasview for src/sas

Timestamp:

Jun 18, 2018 4:43:00 PM (6 years ago)

Author:

krzywon

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload

Children:

dabcaf7

Parents:

316b9c1

Message:

Run Layout on the fitpage during data and dispersity changes to fix orphan error box issue. Also make error text uneditable. refs #1069

Location:

src/sas/sasgui/perspectives/fitting

Files:

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

src/sas/sasgui/perspectives/fitting/basepage.py

@@ -2552 +2552 @@
             # draw
             self._draw_model()
+            self.Layout()
             self.Refresh()
         except Exception:

src/sas/sasgui/perspectives/fitting/fitpage.py

@@ -708 +708 @@
                         ctl2 = wx.TextCtrl(self, wx.ID_ANY,
                                            size=(_BOX_WIDTH / 1.3, 20),
-                                           style=0)
+                                           style=wx.TE_READONLY)
 
                         self.sizer4_4.Add(ctl2, (iy, ix), (1, 1),
@@ -1998 +1998 @@
         self.on_smear_helper()
         self.on_set_focus(None)
+        self.Layout()
         self.Refresh()
         # update model plot with new data information
@@ -2893 +2894 @@
                     ix += 1
                     ctl2 = wx.TextCtrl(self, wx.ID_ANY,
-                                       size=(_BOX_WIDTH / 1.2, 20), style=0)
+                                       size=(_BOX_WIDTH / 1.2, 20),
+                                       style=wx.TE_READONLY)
                     sizer.Add(ctl2, (iy, ix), (1, 1),
                               wx.EXPAND | wx.ADJUST_MINSIZE, 0)