Changeset 14e1ff0 in sasview

Timestamp:

Mar 25, 2019 1:16:04 PM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl

Children:

f5e2a10a, 912f438, 60e20d8

Parents:

13ee4d9

Message:

Allow for C&S fitting cancellation. SASVIEW-1280

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• ConstraintWidget.py (modified) (7 diffs)
• FittingPerspective.py (modified) (1 diff)

src/sas/qtgui/Perspectives/Fitting/ConstraintWidget.py

@@ -128 +128 @@
         self.is_chain_fitting = False
 
+        # Is the fit job running?
+        self.is_running = False
+        self.calc_fit = None
+
         # Remember previous content of modified cell
         self.current_cell = ""
@@ -257 +261 @@
         Perform the constrained/simultaneous fit
         """
+        # Stop if we're running
+        if self.is_running:
+            self.is_running = False
+            #re-enable the Fit button
+            self.cmdFit.setStyleSheet('QPushButton {color: black;}')
+            self.cmdFit.setText("Fit")
+            # stop the fitpages
+            self.calc_fit.stop()
+            return
+
         # Find out all tabs to fit
         tabs_to_fit = self.getTabsForFit()
@@ -310 +324 @@
 
         # new fit thread object
-        calc_fit = FitThread(handler=handler,
+        self.calc_fit = FitThread(handler=handler,
                              fn=sim_fitter_list,
                              batch_inputs=batch_inputs,
@@ -321 +335 @@
         if LocalConfig.USING_TWISTED:
             # start the trhrhread with twisted
-            calc_thread = threads.deferToThread(calc_fit.compute)
-            calc_thread.addCallback(completefn)
-            calc_thread.addErrback(self.onFitFailed)
+            self.calc_fit = threads.deferToThread(self.calc_fit.compute)
+            self.calc_fit.addCallback(completefn)
+            self.calc_fit.addErrback(self.onFitFailed)
         else:
             # Use the old python threads + Queue
-            calc_fit.queue()
-            calc_fit.ready(2.5)
-
-
-        #disable the Fit button
+            self.calc_fit.queue()
+            self.calc_fit.ready(2.5)
+
+        # modify the Fit button
         self.cmdFit.setStyleSheet('QPushButton {color: red;}')
-        self.cmdFit.setText('Running...')
+        self.cmdFit.setText('Stop fit')
         self.parent.communicate.statusBarUpdateSignal.emit('Fitting started...')
-        self.cmdFit.setEnabled(False)
+        self.is_running = True
 
     def onHelp(self):
@@ -457 +470 @@
         self.cmdFit.setStyleSheet('QPushButton {color: black;}')
         self.cmdFit.setText("Fit")
-        self.cmdFit.setEnabled(True)
 
         # Notify the parent about completed fitting
@@ -503 +515 @@
         self.cmdFit.setStyleSheet('QPushButton {color: black;}')
         self.cmdFit.setText("Fit")
-        self.cmdFit.setEnabled(True)
 
         # Notify the parent about completed fitting
@@ -538 +549 @@
         self.cmdFit.setStyleSheet('QPushButton {color: black;}')
         self.cmdFit.setText("Fit")
-        self.cmdFit.setEnabled(True)
 
         # Notify the parent about completed fitting

src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py

@@ -406 +406 @@
                 tab_object.enableInteractiveElements()
 
-        pass
-
     def getCurrentStateAsXml(self):
         """