Changeset 2d0756a5 in sasview

Timestamp:

Apr 26, 2012 11:23:33 AM (13 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:

0318c4f

Parents:

e26719b

Message:

fixed fit/stop button behavior

Files:

• fittingview/src/sans/perspectives/fitting/fitpage.py (modified) (5 diffs)
• fittingview/src/sans/perspectives/fitting/fitting.py (modified) (1 diff)
• park_integration/src/sans/fit/ScipyFitting.py (modified) (1 diff)

fittingview/src/sans/perspectives/fitting/fitpage.py

@@ -154 +154 @@
         When fit is complete ,reset the fit button label.
         """
-        self.btFit.SetLabel("Fit")
+        self.set_fitbutton()
         
     def _is_2D(self):
@@ -1084 +1084 @@
         Allow to fit
         """
+        if event != None:
+            event.Skip() 
         if self.fit_started:
             self._StopFit()
-            
-        if event != None:
-            event.Skip() 
+            self.fit_started = False
+            wx.CallAfter(self.set_fitbutton)
+            return   
+
         if len(self.parent._manager.fit_thread_list)>0 and\
                     self.parent._manager._fit_engine != "park" and\
@@ -1146 +1149 @@
 
         #single fit 
-        self._manager.onFit(uid=self.uid)
-        self.fit_started = True
-        self.btFit.SetLabel("Stop")
-           
+        #self._manager.onFit(uid=self.uid)
+        self.fit_started = self._manager.onFit(uid=self.uid)
+        wx.CallAfter(self.set_fitbutton)
+    
+    def set_fitbutton(self):  
+        """
+        Set fit button label depending on the fit_started[bool]
+        """
+        if self.fit_started:
+            label = "Stop"
+            color = "red"
+        else:
+            label = "Fit"
+            color = "black"
+        self.btFit.Enable(False)
+        self.btFit.SetLabel(label)
+        self.btFit.SetForegroundColour(color)
+        self.btFit.Enable(True)
+                     
     def get_weight_flag(self):
         """
@@ -1172 +1190 @@
         return flag
                 
-    def bind_fit_button(self):
-        """
-        bind the fit button to either fit handler or stop fit handler
-        """
-        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')
-            #self.btFit.SetBackgroundColour(self.default_bt_colour)
-            self.btFit.Bind(event=wx.EVT_BUTTON, handler=self._onFit, 
-                            id=self.btFit.GetId())
-        else:
-            msg = "FitPage: fit button has unknown label"
-            raise RuntimeError, msg
-        self._manager._reset_schedule_problem(value=0)
-          
-    def is_fitting(self):
-        if self.fit_started:
-            self._StopFit(event=None)
             
     def _StopFit(self, event=None):
@@ -1202 +1195 @@
         Stop fit 
         """
-        #time.sleep(0.1)
         if event != None:
             event.Skip()
-        #if self.engine_type=="scipy":
         self._manager.stop_fit(self.uid)
         self._manager._reset_schedule_problem(value=0)

fittingview/src/sans/perspectives/fitting/fitting.py

@@ -1609 +1609 @@
                         wx.CallAfter(cpage._on_fit_complete)
                     except:
-                        msg = "Singular point: Fitting Error occured."
+                        msg = "Singular point: Fitting Error occurred."
                         wx.PostEvent(self.parent, StatusEvent(status=msg, info="error",
                                                   type="stop"))

park_integration/src/sans/fit/ScipyFitting.py

@@ -110 +110 @@
                                                     ftol=ftol,
                                                     full_output=1)
-
-        except KeyboardInterrupt:
-            msg = "Fitting: Terminated!!!"
-            handler.error(msg)
-            raise KeyboardInterrupt, msg #<= more stable
-            #less stable below
-            """
+        except:
             if hasattr(sys, 'last_type') and sys.last_type == KeyboardInterrupt:
                 if handler is not None:
                     msg = "Fitting: Terminated!!!"
                     handler.error(msg)
-                    result = handler.get_result()
-                    return result
+                    raise KeyboardInterrupt, msg
             else:
-                raise 
-            """
-        except:
-            raise
+                raise
         chisqr = functor.chisq()