Changeset 557fc498 in sasview for src/sas

Timestamp:

Sep 13, 2018 8:17:42 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

855e7ad

Parents:

1a15ada

Message:

Added GUI elements disablement/enablement on fit and calculate SASVIEW-1064

File:

• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (12 diffs)

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

@@ -1377 +1377 @@
         self.communicate.statusBarUpdateSignal.emit('Fitting started...')
         self.fit_started = True
+
         # Disable some elements
-        self.setFittingStarted()
+        self.disableInteractiveElements()
 
     def stopFit(self):
@@ -1387 +1388 @@
             return
         self.calc_fit.stop()
-        #self.fit_started=False
         #re-enable the Fit button
-        self.setFittingStopped()
+        self.enableInteractiveElements()
 
         msg = "Fitting cancelled."
@@ -1403 +1403 @@
         """
         """
-        self.setFittingStopped()
+        self.enableInteractiveElements()
         msg = "Fitting failed with: "+ str(reason)
         self.communicate.statusBarUpdateSignal.emit(msg)
@@ -1420 +1420 @@
         """
         #re-enable the Fit button
-        self.setFittingStopped()
+        self.enableInteractiveElements()
 
         if len(result) == 0:
@@ -1492 +1492 @@
         """
         #re-enable the Fit button
-        self.setFittingStopped()
+        self.enableInteractiveElements()
 
         if len(result) == 0:
@@ -2363 +2363 @@
         weight = FittingUtilities.getWeight(data=data, is2d=self.is2D, flag=self.weighting)
 
+        # Disable buttons/table
+        self.disableInteractiveElements()
         # Awful API to a backend method.
         calc_thread = self.methodCalculateForData()(data=data,
@@ -2404 +2406 @@
         Thread returned error
         """
+        # Bring the GUI to normal state
+        self.enableInteractiveElements()
         print("Calculate Data failed with ", reason)
 
@@ -2416 +2420 @@
         Plot the current 1D data
         """
+        # Bring the GUI to normal state
+        self.enableInteractiveElements()
+
         fitted_data = self.logic.new1DPlot(return_data, self.tab_id)
         residuals = self.calculateResiduals(fitted_data)
@@ -2445 +2452 @@
         Plot the current 2D data
         """
+        # Bring the GUI to normal state
+        self.enableInteractiveElements()
+
         fitted_data = self.logic.new2DPlot(return_data)
         residuals = self.calculateResiduals(fitted_data)
@@ -2515 +2525 @@
         Thread threw an exception.
         """
+        # Bring the GUI to normal state
+        self.enableInteractiveElements()
         # TODO: remimplement thread cancellation
         logger.error("".join(traceback.format_exception(etype, value, tb)))
@@ -2892 +2904 @@
         self.setMagneticModel()
 
-    def setFittingStarted(self):
-        """
-        Set buttion caption on fitting start
+    def setInteractiveElements(self, enabled=True):
+        """
+        Switch interactive GUI elements on/off
+        """
+        assert isinstance(enabled, bool)
+
+        self.lstParams.setEnabled(enabled)
+        self.lstPoly.setEnabled(enabled)
+        self.lstMagnetic.setEnabled(enabled)
+
+        self.cbCategory.setEnabled(enabled)
+        self.cbModel.setEnabled(enabled)
+        self.cbStructureFactor.setEnabled(enabled)
+
+        self.chkPolydispersity.setEnabled(enabled)
+        self.chkMagnetism.setEnabled(enabled)
+        self.chk2DView.setEnabled(enabled)
+
+    def enableInteractiveElements(self):
+        """
+        Set buttion caption on fitting/calculate finish
+        Enable the param table(s)
+        """
+        # Notify the user that fitting is available
+        self.cmdFit.setStyleSheet('QPushButton {color: black;}')
+        self.cmdFit.setText("Fit")
+        self.fit_started = False
+        self.setInteractiveElements(True)
+
+    def disableInteractiveElements(self):
+        """
+        Set buttion caption on fitting/calculate start
+        Disable the param table(s)
         """
         # Notify the user that fitting is being run
@@ -2900 +2942 @@
         self.cmdFit.setStyleSheet('QPushButton {color: red;}')
         self.cmdFit.setText('Stop fit')
-
-    def setFittingStopped(self):
-        """
-        Set button caption on fitting stop
-        """
-        # Notify the user that fitting is available
-        self.cmdFit.setStyleSheet('QPushButton {color: black;}')
-        self.cmdFit.setText("Fit")
-        self.fit_started = False
+        self.setInteractiveElements(False)
 
     def readFitPage(self, fp):