Changes in / [60e20d8:f810eb6] in sasview

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 = ""
@@ -261 +257 @@
         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()
@@ -324 +310 @@
 
         # new fit thread object
-        self.calc_fit = FitThread(handler=handler,
+        calc_fit = FitThread(handler=handler,
                              fn=sim_fitter_list,
                              batch_inputs=batch_inputs,
@@ -335 +321 @@
         if LocalConfig.USING_TWISTED:
             # start the trhrhread with twisted
-            self.calc_fit = threads.deferToThread(self.calc_fit.compute)
-            self.calc_fit.addCallback(completefn)
-            self.calc_fit.addErrback(self.onFitFailed)
+            calc_thread = threads.deferToThread(calc_fit.compute)
+            calc_thread.addCallback(completefn)
+            calc_thread.addErrback(self.onFitFailed)
         else:
             # Use the old python threads + Queue
-            self.calc_fit.queue()
-            self.calc_fit.ready(2.5)
-
-        # modify the Fit button
+            calc_fit.queue()
+            calc_fit.ready(2.5)
+
+
+        #disable the Fit button
         self.cmdFit.setStyleSheet('QPushButton {color: red;}')
-        self.cmdFit.setText('Stop fit')
+        self.cmdFit.setText('Running...')
         self.parent.communicate.statusBarUpdateSignal.emit('Fitting started...')
-        self.is_running = True
+        self.cmdFit.setEnabled(False)
 
     def onHelp(self):
@@ -470 +457 @@
         self.cmdFit.setStyleSheet('QPushButton {color: black;}')
         self.cmdFit.setText("Fit")
+        self.cmdFit.setEnabled(True)
 
         # Notify the parent about completed fitting
@@ -515 +503 @@
         self.cmdFit.setStyleSheet('QPushButton {color: black;}')
         self.cmdFit.setText("Fit")
+        self.cmdFit.setEnabled(True)
 
         # Notify the parent about completed fitting
@@ -549 +538 @@
         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):
         """