Changeset b0ba43e in sasview

Timestamp:

May 4, 2018 10:10:43 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:

3c6ecd9

Parents:

72ecbdf2

Message:

Fix for P(r) thread error handling and Dmax explorer exception issues.

Location:

src/sas/qtgui/Perspectives/Inversion

Files:

• DMaxExplorerWidget.py (modified) (1 diff)
• InversionPerspective.py (modified) (9 diffs)

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

@@ -81 +81 @@
 
     def setupModel(self):
+        self.model.blockSignals(True)
         self.model.setItem(W.NPTS, QtGui.QStandardItem(str(self.nfunc)))
+        self.model.blockSignals(False)
+        self.model.blockSignals(True)
         self.model.setItem(W.DMIN, QtGui.QStandardItem("{:.1f}".format(0.9*self.pr_state.d_max)))
+        self.model.blockSignals(False)
+        self.model.blockSignals(True)
         self.model.setItem(W.DMAX, QtGui.QStandardItem("{:.1f}".format(1.1*self.pr_state.d_max)))
+        self.model.blockSignals(False)
+        self.model.blockSignals(True)
         self.model.setItem(W.VARIABLE, QtGui.QStandardItem( "χ²/dof"))
+        self.model.blockSignals(False)
 
     def setupMapper(self):

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

@@ -309 +309 @@
                                             and not self.isCalculating)
         self.removeButton.setEnabled(self.logic.data_is_loaded)
-        self.explorerButton.setEnabled(self.logic.data_is_loaded)
+        self.explorerButton.setEnabled(self.logic.data_is_loaded
+                                       and np.all(self.logic.data.dy != 0))
         self.stopButton.setVisible(self.isCalculating)
         self.regConstantSuggestionButton.setEnabled(
@@ -421 +422 @@
     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()
+        self.stopCalcThread()
+        self.stopEstimationThread()
+        self.stopEstimateNTThread()
         # Show any batch calculations that successfully completed
         if self.isBatch and self.batchResultsWindow is not None:
@@ -631 +629 @@
         # Disable calculation buttons to prevent thread interference
 
-        # If a thread is already started, stop it
-        if self.calcThread is not None and self.calcThread.isrunning():
-            self.calcThread.stop()
+        # If the thread is already started, stop it
+        self.stopCalcThread()
+
         pr = self._calculator.clone()
         nfunc = self.getNFunc()
@@ -643 +641 @@
         self.calcThread.ready(2.5)
 
+    def stopCalcThread(self):
+        """ Stops a thread if it exists and is running """
+        if self.calcThread is not None and self.calcThread.isrunning():
+            self.calcThread.stop()
+
     def performEstimateNT(self):
         """
@@ -652 +655 @@
 
         # If a thread is already started, stop it
-        if (self.estimationThreadNT is not None and
-                self.estimationThreadNT.isrunning()):
-            self.estimationThreadNT.stop()
+        self.stopEstimateNTThread()
+
         pr = self._calculator.clone()
         # Skip the slit settings for the estimation
@@ -669 +671 @@
         self.estimationThreadNT.ready(2.5)
 
+    def stopEstimateNTThread(self):
+        if (self.estimationThreadNT is not None and
+                self.estimationThreadNT.isrunning()):
+            self.estimationThreadNT.stop()
+
     def performEstimate(self):
         """
@@ -676 +683 @@
 
         # If a thread is already started, stop it
-        if (self.estimationThread is not None and
-                self.estimationThread.isrunning()):
-            self.estimationThread.stop()
+        self.stopEstimationThread()
+
         self.estimationThread = EstimatePr(self._calculator.clone(),
                                            self.getNFunc(),
@@ -686 +692 @@
         self.estimationThread.queue()
         self.estimationThread.ready(2.5)
+
+    def stopEstimationThread(self):
+        """ Stop the estimation thread if it exists and is running """
+        if (self.estimationThread is not None and
+                self.estimationThread.isrunning()):
+            self.estimationThread.stop()
 
     ######################################################################
@@ -778 +790 @@
         """
         logger.error(error)
+        if self.isBatch:
+            self.startNextBatchItem()
+        else:
+            self.stopCalculation()