Changeset aac161f1 in sasview

Timestamp:

Mar 17, 2016 12:22:35 PM (9 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

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:

c10d9d6c

Parents:

261e075

git-author:

Piotr Rozyczko <piotr.rozyczko@…> (03/17/16 12:12:28)

git-committer:

Piotr Rozyczko <piotr.rozyczko@…> (03/17/16 12:22:35)

Message:

Ticket 411: added stop button to simultaneous fits.

Location:

src/sas/sasgui/perspectives/fitting

Files:

• fit_thread.py (modified) (1 diff)
• fitting.py (modified) (1 diff, 1 prop)
• simfitpage.py (modified) (4 diffs)

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

@@ -96 +96 @@
             #some mssg and reset progress bar.
 
+            # Shouldn't this be re-raising? ConsoleUpdate doesn't act on it.
+            # raise KeyboardInterrupt
             if self.handler is not None:
                 self.handler.stop(msg=msg)

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

@@ -1483 +1483 @@
         try:
             index = 0
+            # Update potential simfit page(s)
+            if self.sim_page is not None:
+                self.sim_page._on_fit_complete()
+            if self.batch_page:
+                self.batch_page._on_fit_complete()
+            # Update all fit pages
             for uid in page_id:
                 res = result[index]

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

@@ -91 +91 @@
         ## selected mdoel to fit
         self.model_toFit = []
+        ## Control the fit state
+        self.fit_started = False
         ## number of constraint
         self.nb_constraint = 0
@@ -423 +425 @@
 
         """
+        if self.fit_started:
+            self._stop_fit()
+            self.fit_started = False
+            return
+
         flag = False
         # check if the current page a simultaneous fit page or a batch page
@@ -439 +446 @@
                     self.manager.schedule_for_fit(value=1, uid=item[2])
             try:
+                self.fit_started = True
+                wx.CallAfter(self.set_fitbutton)
                 if not self.manager.onFit(uid=self.uid):
                     return
@@ -447 +456 @@
             msg = "Select at least one model check box to fit "
             wx.PostEvent(self.parent.parent, StatusEvent(status=msg))
+
+    def _on_fit_complete(self):
+        """
+        Set the completion flag and display the updated fit button label.
+        """
+        self.fit_started = False
+        self.set_fitbutton()
+
+    def _stop_fit(self, event=None):
+        """
+        Attempt to stop the fitting thread
+        """
+        if event != None:
+            event.Skip()
+        self.manager.stop_fit(self.uid)
+        self.manager._reset_schedule_problem(value=0)
+        self._on_fit_complete()
+
+    def set_fitbutton(self):
+        """
+        Set fit button label depending on the fit_started
+        """
+        label = "Stop" if self.fit_started else "Fit"
+        color = "red" if self.fit_started else "black"
+
+        self.btFit.SetLabel(label)
+        self.btFit.SetForegroundColour(color)
+        self.btFit.Enable(True)
 
     def _onHelp(self, event):