Changeset 0122b8a in sasview for sansview/perspectives

Timestamp:

Apr 28, 2009 7:17:06 PM (16 years ago)

Author:

Jae Cho <jhjcho@…>

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:

34a0c17

Parents:

c097f02

Message:

revert to enable stop fit for scipy l-s

File:

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

sansview/perspectives/fitting/fitpage.py

@@ -17 +17 @@
 ## event to know the selected fit engine
 (FitterTypeEvent, EVT_FITTER_TYPE)   = wx.lib.newevent.NewEvent()
-(FitStopEvent, EVT_FIT_STOP)   = wx.lib.newevent.NewEvent()
 _BOX_WIDTH = 76
 
@@ -58 +57 @@
         ## to update the panel according to the fit engine type selected
         self.Bind(EVT_FITTER_TYPE,self._on_engine_change)
-        self.Bind(EVT_FIT_STOP,self._on_fit_complete)
     
-    def _on_fit_complete(self, event):
-        """
-            When fit is complete ,reset the fit button label.
-        """
-        #self.btFit.SetLabel("Fit")
-        #self.btFit.Unbind(event=wx.EVT_BUTTON, id=self.btFit.GetId())
-        #self.btFit.Bind(event=wx.EVT_BUTTON, handler=self._onFit,id=self.btFit.GetId())
-        pass
-        
-        
+    
     def _on_engine_change(self, event):
         """
@@ -491 +480 @@
         self.manager.onFit()
         ## allow stopping the fit 
-        #if self.engine_type=="scipy":
-        #    self.btFit.SetLabel("Stop")
-        #    self.btFit.Unbind(event=wx.EVT_BUTTON, id= self.btFit.GetId())
-        #    self.btFit.Bind(event= wx.EVT_BUTTON, handler=self._StopFit, id=self.btFit.GetId())
-        #else:
-        #    self.btFit.SetLabel("Fit")
-        #    self.btFit.Bind(event= wx.EVT_BUTTON, handler=self._onFit, id=self.btFit.GetId())
+        if self.engine_type=="scipy":
+            self.btFit.SetLabel("Stop")
+            self.btFit.Unbind(event=wx.EVT_BUTTON, id= self.btFit.GetId())
+            self.btFit.Bind(event= wx.EVT_BUTTON, handler=self._StopFit, id=self.btFit.GetId())
+        else:
+            self.btFit.SetLabel("Fit")
+            self.btFit.Bind(event= wx.EVT_BUTTON, handler=self._onFit, id=self.btFit.GetId())
         self.btFit.SetFocus()    
         self.sizer5.Layout()
@@ -509 +498 @@
         if self.engine_type=="scipy":
             self.manager.stop_fit()
-        self.btFit.Unbind(event=wx.EVT_BUTTON, id=self.btFit.GetId())
-        self.btFit.Bind(event=wx.EVT_BUTTON, handler=self._onFit,id=self.btFit.GetId())
-       
-            
+            self.btFit.Unbind(event=wx.EVT_BUTTON, id=self.btFit.GetId())
+            self.btFit.Bind(event=wx.EVT_BUTTON, handler=self._onFit,id=self.btFit.GetId())
+        else:
+            self.btFit.Unbind(event=wx.EVT_BUTTON, id=self.btFit.GetId())
+            self.btFit.Bind(event= wx.EVT_BUTTON, handler=self._onFit, id=self.btFit.GetId())
         self.btFit.SetFocus()    
         self.sizer5.Layout()