Changeset 6da860a in sasview for src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py

Timestamp:

May 1, 2018 11:51:06 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:

72ecbdf2

Parents:

6bd0d81

Message:

Responding to P(r) code review.

File:

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

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

@@ -31 +31 @@
 MAX_DIST = 140.0
 DICT_KEYS = ["Calculator", "PrPlot", "DataPlot"]
+
+logger = logging.getLogger(__name__)
 
 
@@ -354 +356 @@
             msg = "Unable to update P{r}. The connection between the main GUI "
             msg += "and P(r) was severed. Attempting to restart P(r)."
-            logging.warning(msg)
+            logger.warning(msg)
             self.setClosable(True)
             self.close()
@@ -395 +397 @@
         """
         from .DMaxExplorerWidget import DmaxWindow
-        self.dmaxWindow = DmaxWindow(self._calculator, self.getNFunc(), self)
+        self.dmaxWindow = DmaxWindow(pr_state=self._calculator,
+                                     nfunc=self.getNFunc(),
+                                     parent=self)
         self.dmaxWindow.show()
 
@@ -459 +463 @@
             nfunc = int(self.noOfTermsInput.text())
         except ValueError:
-            logging.error("Incorrect number of terms specified: %s"
+            logger.error("Incorrect number of terms specified: %s"
                           %self.noOfTermsInput.text())
             self.noOfTermsInput.setText(str(NUMBER_OF_TERMS))
@@ -581 +585 @@
                 self.dataList.setCurrentIndex(index)
                 self.isBatch = True
+                # Add the index before calculating in case calculation fails
+                self.batchComplete.append(index)
                 break
         if self.isBatch:
@@ -599 +605 @@
         # Set data before running the calculations
         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
@@ -672 +681 @@
         """
         alpha, message, elapsed = output_tuple
+        self._calculator.alpha = alpha
+        self._calculator.elapsed += self._calculator.elapsed
         if message:
-            logging.info(message)
+            logger.info(message)
         self.performEstimateNT()
 
@@ -690 +701 @@
         """
         nterms, alpha, message, elapsed = output_tuple
-        self._calculator.elapsed = elapsed
+        self._calculator.elapsed += elapsed
         self._calculator.suggested_alpha = alpha
         self.nTermsSuggested = nterms
@@ -696 +707 @@
         self.updateGuiValues()
         if message:
-            logging.info(message)
+            logger.info(message)
         if self.isBatch:
             self.acceptAlpha()
@@ -742 +753 @@
             Call-back method for calculation errors
         """
-        logging.warning(error)
+        logger.error(error)