Changeset 477c473 in sasview

Timestamp:

Nov 16, 2017 4:23:30 PM (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:

d744767

Parents:

a657de3

Message:

Fix DMax window updates.

Location:

src/sas/qtgui/Perspectives/Inversion

Files:

• InversionPerspective.py (modified) (10 diffs)
• dmax.py (modified) (2 diffs)

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

@@ -28 +28 @@
 
 
-# TODO: Remove data
 # TODO: Modify plot references, don't just send new
 # TODO: Update help with batch capabilities
-# TODO: Easy way to scroll through results - no tabs in window(?) - 'spreadsheet'
 # TODO: Method to export results in some meaningful way
 class InversionWindow(QtGui.QTabWidget, Ui_PrInversion):
@@ -53 +51 @@
 
         self.logic = InversionLogic()
+
+        self.dmaxWindow = None
 
         # The window should not close
@@ -300 +300 @@
         self.pr_plot_list.pop(self._data)
         self.data_plot_list.pop(self._data)
+        if self.dmaxWindow is not None:
+            self.dmaxWindow = None
         self.dataList.removeItem(self.dataList.currentIndex())
         self.dataList.setCurrentIndex(0)
@@ -331 +333 @@
             GuiUtils.updateModelItemWithPlot(
                 self._data, QtCore.QVariant(self.data_plot), title)
+        if self.dmaxWindow is not None:
+            self.dmaxWindow.pr_state = self._calculator
+            self.dmaxWindow.nfunc = self.getNFunc()
+
         self.mapper.toFirst()
 
@@ -360 +366 @@
         Open the Explorer window to see correlations between params and results
         """
-        # TODO: Link Invertor() and DmaxWindow so window updates when recalculated
         from dmax import DmaxWindow
         self.dmaxWindow = DmaxWindow(self._calculator, self.getNFunc(), self)
@@ -423 +428 @@
     ######################################################################
     # Thread Creators
-
-    # TODO: Move to individual class(?)
 
     def startThreadAll(self):
@@ -535 +538 @@
         self.model.setItem(WIDGETS.W_COMP_TIME,
                            QtGui.QStandardItem(str(elapsed)))
-        self.PrTabWidget.setCurrentIndex(0)
         if message:
             logging.info(message)
@@ -557 +559 @@
         # Show result on control panel
 
-        # TODO: Connect self._calculator to GUI - two-to-one connection possible?
         self.model.setItem(WIDGETS.W_RG, QtGui.QStandardItem(str(pr.rg(out))))
         self.model.setItem(WIDGETS.W_I_ZERO,
@@ -563 +564 @@
         self.model.setItem(WIDGETS.W_BACKGROUND_INPUT,
                            QtGui.QStandardItem("{:.3f}".format(pr.est_bck)))
-        self.model.setItem(WIDGETS.W_BACKGROUND_OUTPUT,
-                           QtGui.QStandardItem(str(pr.background)))
+        self.model.setItem(WIDGETS.W_BACKGROUND_OUTPUT, QtGui.QStandardItem(
+            str("{:.3g}".format(pr.background))))
         self.model.setItem(WIDGETS.W_CHI_SQUARED,
                            QtGui.QStandardItem(str(pr.chi2[0])))
@@ -576 +577 @@
                            QtGui.QStandardItem(str(pr.get_pos_err(out, cov))))
 
-        # Display results tab
-        self.PrTabWidget.setCurrentIndex(1)
         # Save Pr invertor
         self._calculator = pr

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

@@ -76 +76 @@
         self.closeButton.clicked.connect(self.close)
 
+        self.dependentVariable.currentIndexChanged.connect(self.dVChanged)
+
         self.model.itemChanged.connect(self.modelChanged)
 
@@ -101 +103 @@
         self.mapper.toFirst()
 
-    def modelChanged(self, item):
+    def dVChanged(self):
+        self.modelChanged()
+
+    def modelChanged(self):
         if not self.mapper:
             return