Changeset 682c432 in sasview for src/sas/perspectives/fitting

Timestamp:

Mar 13, 2015 1:23:24 PM (10 years ago)

Author:

krzywon

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:

0ea31ca

Parents:

bb074b3

Message:

Fixed the focus bug associated with #275 where focus wasn't being set on
the fitting pages. Made some cahnges to the cansas reader to be more
explicit and (attempt to) lower the pylint scores.

File:

• src/sas/perspectives/fitting/fitpage.py (modified) (2 diffs)

src/sas/perspectives/fitting/fitpage.py

@@ -68 +68 @@
         #create a default data for an empty panel
         self.create_default_data()
-        #self._manager.frame.Bind(wx.EVT_SET_FOCUS, self.on_set_focus)
+        self._manager.frame.Bind(wx.EVT_SET_FOCUS, self.on_set_focus)
 
     def enable_fit_button(self):
@@ -76 +76 @@
         flag = check_data_validity(self.data) & (self.model is not None)
         self.btFit.Enable(flag)
+        
+    def on_set_focus(self, event):
+        """
+        Override the basepage focus method to ensure the save flag is set 
+        properly when focusing on the fit page.
+        """
+        flag = check_data_validity(self.data) & (self.model is not None)
+        self._set_save_flag(flag)
+        self.parent.on_set_focus(event)
 
     def _fill_data_sizer(self):