Changeset c00a28ff in sasview

Timestamp:

Oct 29, 2017 12:04:00 PM (6 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:

570a2f73

Parents:

dfd8233

Message:

Allow P(r) to calculate current data set or all. Update documentation and error handling.

Location:

src/sas/qtgui/Perspectives/Inversion

Files:

• InversionPerspective.py (modified) (13 diffs)
• InversionUtils.py (modified) (1 diff)
• UI/TabbedInversionUI.py (added)
• UI/TabbedInversionUI.ui (modified) (2 diffs)

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

@@ -83 +83 @@
         # Set up the Widget Map
         self.setupMapper()
+        # Set base window state
+        self.setupWindow()
 
     ######################################################################
@@ -118 +120 @@
     def setupLinks(self):
         """Connect the use controls to their appropriate methods"""
-        self.enableButtons()
         self.dataList.currentIndexChanged.connect(self.displayChange)
-        self.calculateButton.clicked.connect(self.startThread)
+        self.calculateAllButton.clicked.connect(self.startThreadAll)
+        self.calculateThisButton.clicked.connect(self.startThread)
         self.helpButton.clicked.connect(self.help)
         self.estimateBgd.toggled.connect(self.toggleBgd)
@@ -149 +151 @@
                 str(self.slitHeightInput.text()))))
         self.model.itemChanged.connect(self.model_changed)
-        self.estimateBgd.setChecked(True)
 
     def setupMapper(self):
@@ -194 +195 @@
 
         # Main Buttons
-        self.mapper.addMapping(self.calculateButton, WIDGETS.W_CALCULATE)
+        self.mapper.addMapping(self.calculateAllButton, WIDGETS.W_CALCULATE_ALL)
+        self.mapper.addMapping(self.calculateThisButton,
+                               WIDGETS.W_CALCULATE_VISIBLE)
         self.mapper.addMapping(self.helpButton, WIDGETS.W_HELP)
 
@@ -238 +241 @@
         self.model.setItem(WIDGETS.W_SIGMA_POS_FRACTION, item)
 
+    def setupWindow(self):
+        """Initialize base window state on init"""
+        self.setTabPosition(0)
+        self.enableButtons()
+        self.estimateBgd.setChecked(True)
+
     ######################################################################
     # Methods for updating GUI
@@ -245 +254 @@
         Enable buttons when data is present, else disable them
         """
-        if self.logic.data_is_loaded:
-            self.explorerButton.setEnabled(True)
-            self.calculateButton.setEnabled(True)
-        else:
-            self.calculateButton.setEnabled(False)
-            self.explorerButton.setEnabled(False)
+        self.explorerButton.setEnabled(self.logic.data_is_loaded)
+        self.calculateAllButton.setEnabled(self.logic.data_is_loaded)
+        self.calculateThisButton.setEnabled(self.logic.data_is_loaded)
 
     def populateDataComboBox(self, filename, data_ref):
@@ -287 +293 @@
         """Update the values when user makes changes"""
         if not self.mapper:
+            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)
+            self.setClosable(True)
+            self.close()
+            InversionWindow.__init__(self.parent(), self._data_list.keys())
             return
         if self.pr_plot is not None:
@@ -314 +326 @@
         """
         Toggle the background between manual and estimated
-        :param item: gui item that was triggered
         """
         sender = self.sender()
@@ -326 +337 @@
         Open the Explorer window to see correlations between params and results
         """
-        # TODO: This depends on SVCC-45
+        # TODO: Look at PR from AW - Is there anything else I need to do?
         pass
 
@@ -334 +345 @@
     def setData(self, data_item=None, is_batch=False):
         """
-        Assign new data set or sets to the P(r) perspective
-        Obtain a QStandardItem object and dissect it to get Data1D/2D
+        Assign new data set(s) to the P(r) perspective
+        Obtain a QStandardItem object and parse it to get Data1D/2D
         Pass it over to the calculator
         """
@@ -350 +361 @@
 
     def setCurrentData(self, data_ref):
-        """Set an individual data set to the current data"""
+        """Set the selected data set to be the current data"""
 
         if not isinstance(data_ref, QtGui.QStandardItem):
@@ -377 +388 @@
     # Thread Creators
 
-    def startThread(self):
-        """
-            Start a calculation thread
-        """
-        from Thread import CalcPr
-
+    # TODO: Move to individual class(?)
+
+    def startThreadAll(self):
         for data_ref, pr in self._data_list.items():
             self._data_set = GuiUtils.dataFromItem(data_ref)
             self._calculator = pr
-            # Set data before running the calculations
-            self.update_calculator()
-
-            # If a thread is already started, stop it
-            if self.calc_thread is not None and self.calc_thread.isrunning():
-                self.calc_thread.stop()
-            pr = self._calculator.clone()
-            nfunc = int(UI.TabbedInversionUI._fromUtf8(
-                self.noOfTermsInput.text()))
-            self.calc_thread = CalcPr(pr, nfunc,
-                                      error_func=self._threadError,
-                                      completefn=self._completed, updatefn=None)
-            self.calc_thread.queue()
-            self.calc_thread.ready(2.5)
+            self.startThread()
+
+    def startThread(self):
+        """
+            Start a calculation thread
+        """
+        from Thread import CalcPr
+
+        # Set data before running the calculations
+        self.update_calculator()
+
+        # If a thread is already started, stop it
+        if self.calc_thread is not None and self.calc_thread.isrunning():
+            self.calc_thread.stop()
+        pr = self._calculator.clone()
+        nfunc = int(UI.TabbedInversionUI._fromUtf8(
+            self.noOfTermsInput.text()))
+        self.calc_thread = CalcPr(pr, nfunc,
+                                  error_func=self._threadError,
+                                  completefn=self._completed, updatefn=None)
+        self.calc_thread.queue()
+        self.calc_thread.ready(2.5)
 
     def performEstimateNT(self):
@@ -534 +550 @@
         self._data_list[self._data] = self._calculator.clone()
 
+        # FIXME: Update plots if exist
+        # TODO: Keep plot references so they can be updated.
+        # TODO: On data change, update current reference to this->plot
+
         if self.pr_plot is None:
             self.pr_plot = self.logic.newPRPlot(out, self._calculator, cov)

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

@@ -27 +27 @@
                 'W_SIGMA_POS_FRACTION',
                 # bottom buttons
-                'W_CALCULATE',
+                'W_CALCULATE_ALL',
+                'W_CALCULATE_VISIBLE',
                 'W_HELP'
 )

src/sas/qtgui/Perspectives/Inversion/UI/TabbedInversionUI.ui

@@ -39 +39 @@
      </property>
      <item>
-      <widget class="QPushButton" name="calculateButton">
+      <widget class="QPushButton" name="calculateThisButton">
+       <property name="text">
+        <string>Calculate</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="calculateAllButton">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -47 +54 @@
        </property>
        <property name="text">
-        <string>Calculate</string>
+        <string>Calculate All</string>
        </property>
       </widget>