Changeset 7f5196e in sasview

Timestamp:

Oct 31, 2017 3:13:10 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:

18d5af02

Parents:

4cac8a47

Message:

Basic link between dmax window and inversion.

Location:

src/sas/qtgui/Perspectives/Inversion

Files:

• InversionPerspective.py (modified) (5 diffs)
• UI/dmax.ui (moved) (moved from src/sas/qtgui/Perspectives/PrInversion/UI/dmax.ui)
• dmax.py (moved) (moved from src/sas/qtgui/Perspectives/PrInversion/dmax.py)

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

@@ -350 +350 @@
         Open the Explorer window to see correlations between params and results
         """
-        # TODO: Look at PR from AW - Is there anything else I need to do?
-        pass
+        # TODO: Link Invertor() and DmaxWindow so window updates when recalculated
+        from dmax import DmaxWindow
+        self.dmaxWindow = DmaxWindow(self._calculator, self.getNFunc(), self)
+        self.dmaxWindow.show()
 
     ######################################################################
@@ -391 +393 @@
         self.enableButtons()
 
+    def getNFunc(self):
+        """Get the n_func value from the GUI object"""
+        return int(UI.TabbedInversionUI._fromUtf8(self.noOfTermsInput.text()))
+
     def setCurrentData(self, data_ref):
         """Get the current data and display as necessary"""
@@ -429 +435 @@
             self.calc_thread.stop()
         pr = self._calculator.clone()
-        nfunc = int(UI.TabbedInversionUI._fromUtf8(
-            self.noOfTermsInput.text()))
+        nfunc = self.getNFunc()
         self.calc_thread = CalcPr(pr, nfunc,
                                   error_func=self._threadError,
@@ -452 +457 @@
         pr.slit_height = 0.0
         pr.slit_width = 0.0
-        nfunc = int(UI.TabbedInversionUI._fromUtf8(
-            self.noOfTermsInput.text()))
+        nfunc = self.getNFunc()
         self.estimation_thread = EstimateNT(pr, nfunc,
                                             error_func=self._threadError,
@@ -474 +478 @@
             self.estimation_thread.stop()
         pr = self._calculator.clone()
-        nfunc = int(UI.TabbedInversionUI._fromUtf8(
-            self.noOfTermsInput.text()))
+        nfunc = self.getNFunc()
         self.estimation_thread = EstimatePr(pr, nfunc,
                                             error_func=self._threadError,