Changeset 57ad773 in sasview for src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py

Timestamp:

Oct 28, 2017 10:02:15 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:

d132f33

Parents:

e7651ff

Message:

Plots generated and linked to data set.

File:

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

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

@@ -12 +12 @@
 # pr inversion GUI elements
 from InversionUtils import WIDGETS
-import UI.TabbedPrInversionUI
-from UI.TabbedPrInversionUI import Ui_PrInversion
+import UI.TabbedInversionUI
+from UI.TabbedInversionUI import Ui_PrInversion
 from InversionLogic import InversionLogic
 
@@ -118 +118 @@
         """Connect the use controls to their appropriate methods"""
         self.enableButtons()
-        self.checkBgdClicked(False)
         # TODO: enable the drop down box once batch is working
         self.dataList.setEnabled(False)
@@ -130 +129 @@
         self.noOfTermsSuggestionButton.clicked.connect(self.acceptNoTerms)
         self.explorerButton.clicked.connect(self.openExplorerWindow)
+        self.backgroundInput.textChanged.connect(
+            lambda: self._calculator.set_est_bck(int(is_float(
+                str(self.backgroundInput.text())))))
+        self.minQInput.textChanged.connect(
+            lambda: self._calculator.set_qmin(is_float(
+                str(self.minQInput.text()))))
+        self.regularizationConstantInput.textChanged.connect(
+            lambda: self._calculator.set_alpha(is_float(
+                str(self.regularizationConstantInput.text()))))
+        self.maxDistanceInput.textChanged.connect(
+            lambda: self._calculator.set_dmax(is_float(
+                str(self.maxDistanceInput.text()))))
+        self.maxQInput.textChanged.connect(
+            lambda: self._calculator.set_qmax(is_float(
+                str(self.maxQInput.text()))))
+        self.slitHeightInput.textChanged.connect(
+            lambda: self._calculator.set_slit_height(is_float(
+                str(self.slitHeightInput.text()))))
+        self.slitWidthInput.textChanged.connect(
+            lambda: self._calculator.set_slit_width(is_float(
+                str(self.slitHeightInput.text()))))
         self.model.itemChanged.connect(self.model_changed)
+        self.estimateBgd.setChecked(True)
 
     def setupMapper(self):
@@ -255 +276 @@
 
     def update_calculator(self):
-        """Update all p(r) params. Take all GUI values as an override"""
+        """Update all p(r) params"""
         self._calculator.set_x(self._data_set.x)
         self._calculator.set_y(self._data_set.y)
         self._calculator.set_err(self._data_set.dy)
-        self._calculator.set_qmin(is_float(UI.TabbedPrInversionUI._fromUtf8(
-            self.minQInput.text())))
-        self._calculator.set_qmax(is_float(UI.TabbedPrInversionUI._fromUtf8(
-            self.maxQInput.text())))
-        self._calculator.set_alpha(is_float(UI.TabbedPrInversionUI._fromUtf8(
-            self.regularizationConstantInput.text())))
-        self._calculator.set_dmax(is_float(UI.TabbedPrInversionUI._fromUtf8(
-            self.maxDistanceInput.text())))
-        self._calculator.set_est_bck(int(is_float(
-            UI.TabbedPrInversionUI._fromUtf8(self.backgroundInput.text()))))
-        self._calculator.set_slit_height(is_float(
-            UI.TabbedPrInversionUI._fromUtf8(self.slitHeightInput.text())))
-        self._calculator.set_slit_width(is_float(
-            UI.TabbedPrInversionUI._fromUtf8(self.slitWidthInput.text())))
 
     def _calculation(self):
@@ -278 +285 @@
         Calculate the P(r) for every data set in the data list
         """
-        # Pull in any GUI changes before running the calculations
+        # Set data before running the calculations
         self.update_calculator()
         # Run
@@ -287 +294 @@
         if not self.mapper:
             return
-        # TODO: Update plots
+        if self.pr_plot is not None:
+            title = self.pr_plot.name
+            GuiUtils.updateModelItemWithPlot(
+                self._data, QtCore.QVariant(self.pr_plot), title)
+        if self.data_plot is not None:
+            title = self.data_plot.name
+            GuiUtils.updateModelItemWithPlot(
+                self._data, QtCore.QVariant(self.data_plot), title)
         self.mapper.toFirst()
 
@@ -303 +317 @@
         self._helpView.show()
 
-    def checkBgdClicked(self, boolean=None):
-        if boolean or self.manualBgd.isChecked():
-            self.manualBgd.setChecked(True)
-            self.toggleBgd(self.manualBgd)
-        else:
-            self.estimateBgd.setChecked(True)
-            self.toggleBgd(self.estimateBgd)
-
-    def toggleBgd(self, item=None):
+    def toggleBgd(self):
         """
         Toggle the background between manual and estimated
         :param item: gui item that was triggered
         """
-        if not item:
-            self.checkBgdClicked()
-        elif isinstance(item, QtGui.QRadioButton):
-            if item is self.estimateBgd:
-                self.backgroundInput.setEnabled(False)
-            else:
-                self.backgroundInput.setEnabled(True)
+        sender = self.sender()
+        if sender is self.estimateBgd:
+            self.backgroundInput.setEnabled(False)
+        else:
+            self.backgroundInput.setEnabled(True)
 
     def openExplorerWindow(self):
@@ -353 +357 @@
             self._data = data
             self._data_set = GuiUtils.dataFromItem(data)
-            self.enableButtons()
             self.populateDataComboBox(self._data_set.filename)
 
             # Estimate initial values from data
             self.performEstimate()
-            self.logic.data(self._calculator)
-
-            self._manager.createGuiData(None)
-
-            # TODO: Finish plotting
-            if self.pr_plot is None:
-                self.pr_plot = None
-                #self.pr_plot = self.logic.new1DPlot(self._calculator)
-            if self.data_plot is None:
-                self.data_plot = None
-
-            qmin, qmax, _ = self.logic.computeDataRange()
-            title = self._data.filename
+            self.logic = InversionLogic(self._data_set)
+
+            qmin, qmax = self.logic.computeDataRange()
 
             self.model.setItem(WIDGETS.W_QMIN, QtGui.QStandardItem(
@@ -376 +369 @@
             self.model.setItem(WIDGETS.W_QMAX, QtGui.QStandardItem(
                 "{:.4g}".format(qmax)))
-            #reactor.callFromThread(GuiUtils.updateModelItemWithPlot,
-            #                       self._model_item, self._communicator, title)
+
+            self.enableButtons()
 
             # TODO: Only load 1st data until batch mode working. Thus, break
@@ -395 +388 @@
             self.calc_thread.stop()
         pr = self._calculator.clone()
-        nfunc = int(UI.TabbedPrInversionUI._fromUtf8(
+        nfunc = int(UI.TabbedInversionUI._fromUtf8(
             self.noOfTermsInput.text()))
         self.calc_thread = CalcPr(pr, nfunc,
@@ -418 +411 @@
         pr.slit_height = 0.0
         pr.slit_width = 0.0
-        nfunc = int(UI.TabbedPrInversionUI._fromUtf8(
+        nfunc = int(UI.TabbedInversionUI._fromUtf8(
             self.noOfTermsInput.text()))
         self.estimation_thread = EstimateNT(pr, nfunc,
@@ -440 +433 @@
             self.estimation_thread.stop()
         pr = self._calculator.clone()
-        nfunc = int(UI.TabbedPrInversionUI._fromUtf8(
+        nfunc = int(UI.TabbedInversionUI._fromUtf8(
             self.noOfTermsInput.text()))
         self.estimation_thread = EstimatePr(pr, nfunc,
@@ -503 +496 @@
         """
         # Save useful info
-        # Keep a copy of the last result
-        self._last_calculator = pr.clone()
-
-        # Save Pr invertor
-        self._calculator = pr
         cov = np.ascontiguousarray(cov)
+        pr.cov = cov
+        pr.out = out
+        pr.elapsed = elapsed
 
         # Show result on control panel
@@ -533 +524 @@
         # Display results tab
         self.PrTabWidget.setCurrentIndex(1)
+        # Save Pr invertor
+        self._calculator = pr
+        # Append data to data list
         self._data_list.append({self._data: pr})
 
-        # TODO: Show plots - Really, this should be linked to the inputs, etc,
-        # TODO: so it should happen automagically
-        # Show I(q) fit
-        # self.show_iq(out, self._calculator)
-        # Show P(r) fit
-        # self.show_pr(out, self._calculator, cov)
+        if self.pr_plot is None:
+            self.pr_plot = self.logic.newPRPlot(out, self._calculator, cov)
+        if self.data_plot is None:
+            self.data_plot = self.logic.new1DPlot(out, self._calculator)
 
     def _threadError(self, error):