Changeset f22e626 in sasview for sansview/perspectives/fitting/fitpage.py

Timestamp:

May 13, 2011 12:53:43 PM (13 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

13a63ab

Parents:

248b918

Message:

working on remove data

File:

• sansview/perspectives/fitting/fitpage.py (modified) (4 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -43 +43 @@
         self._fill_datainfo_sizer()
         self.is_2D = None
+        self.fit_started = False
         # get smear info from data
         self._get_smear_info()
@@ -982 +983 @@
         self.bind_fit_button()
            
+   
     def bind_fit_button(self):
         """
@@ -988 +990 @@
         self.btFit.Unbind(event=wx.EVT_BUTTON, id= self.btFit.GetId())
         if self.btFit.GetLabel().lower() == "stop":
+            self.fit_started = True
             self.btFit.SetForegroundColour('red')
             self.btFit.Bind(event=wx.EVT_BUTTON, handler=self._StopFit,
                              id=self.btFit.GetId())
         elif self.btFit.GetLabel().lower() == "fit":
+            self.fit_started = False
             self.btFit.SetDefault()
             self.btFit.SetForegroundColour('black')
@@ -1002 +1006 @@
         self._manager._reset_schedule_problem(value=0)
           
-
-    def _StopFit(self, event):
+    def is_fitting(self):
+        if self.fit_started:
+            self._StopFit(event=None)
+            
+    def _StopFit(self, event=None):
         """
         Stop fit