Changeset 72ecbdf2 in sasview for src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py

Timestamp:

May 2, 2018 8:59:34 AM (7 years ago)

Author:

krzywon

Branches:

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

Children:

b0ba43e

Parents:

6da860a

Message:

Add a stop calculations button to P(r). Plus unit tests.

File:

• src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py (modified) (8 diffs)

src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py

@@ -79 +79 @@
         self.estimationThread = None
         self.estimationThreadNT = None
+        self.isCalculating = False
 
         # Mapping for all data items
@@ -167 +168 @@
         self.calculateAllButton.clicked.connect(self.startThreadAll)
         self.calculateThisButton.clicked.connect(self.startThread)
+        self.stopButton.clicked.connect(self.stopCalculation)
         self.removeButton.clicked.connect(self.removeData)
         self.helpButton.clicked.connect(self.help)
@@ -301 +303 @@
         """
         self.calculateAllButton.setEnabled(len(self._dataList) > 1
-                                           and not self.isBatch)
+                                           and not self.isBatch
+                                           and not self.isCalculating)
         self.calculateThisButton.setEnabled(self.logic.data_is_loaded
-                                            and not self.isBatch)
+                                            and not self.isBatch
+                                            and not self.isCalculating)
         self.removeButton.setEnabled(self.logic.data_is_loaded)
         self.explorerButton.setEnabled(self.logic.data_is_loaded)
+        self.stopButton.setVisible(self.isCalculating)
         self.regConstantSuggestionButton.setEnabled(
             self.logic.data_is_loaded and
@@ -413 +418 @@
             self.batchResultsWindow.setupTable(self.batchResults)
         self.batchResultsWindow.show()
+
+    def stopCalculation(self):
+        """ Stop all threads, return to the base state and update GUI """
+        if self.calcThread:
+            self.calcThread.stop()
+        if self.estimationThread:
+            self.estimationThread.stop()
+        if self.estimationThreadNT:
+            self.estimationThreadNT.stop()
+        # Show any batch calculations that successfully completed
+        if self.isBatch and self.batchResultsWindow is not None:
+            self.showBatchOutput()
+        self.isBatch = False
+        self.isCalculating = False
+        self.updateGuiValues()
 
     ######################################################################
@@ -571 +591 @@
 
     def startThreadAll(self):
+        self.isCalculating = True
         self.isBatch = True
         self.batchComplete = []
@@ -592 +613 @@
         else:
             # If no data sets left, end batch calculation
+            self.isCalculating = False
             self.batchComplete = []
             self.calculateAllButton.setText("Calculate All")
@@ -604 +626 @@
 
         # Set data before running the calculations
+        self.isCalculating = True
+        self.enableButtons()
         self.updateCalculator()
         # Disable calculation buttons to prevent thread interference
-        self.calculateAllButton.setEnabled(False)
-        self.calculateThisButton.setEnabled(False)
 
         # If a thread is already started, stop it
@@ -744 +766 @@
         # Udpate internals and GUI
         self.updateDataList(self._data)
-        self.updateGuiValues()
         if self.isBatch:
             self.batchComplete.append(self.dataList.currentIndex())
             self.startNextBatchItem()
+        else:
+            self.isCalculating = False
+        self.updateGuiValues()
 
     def _threadError(self, error):