Changeset 75906a1 in sasview for src/sas/qtgui/Perspectives

Timestamp:

Oct 26, 2018 6:39:39 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

9d23e4c, 722b7d6

Parents:

aed159f

Message:

More fixes from PK's CR

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingWidget.py (modified) (1 diff)
• ReportPageLogic.py (modified) (4 diffs)

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -3364 +3364 @@
         else:
             index = self.theory_item
+        params = FittingUtilities.getStandardParam(self._model_model)
         report_logic = ReportPageLogic(self,
                                        kernel_module=self.kernel_module,
                                        data=self.data,
                                        index=index,
-                                       model=self._model_model)
+                                       params=params)
 
         return report_logic.reportList()

src/sas/qtgui/Perspectives/Fitting/ReportPageLogic.py

@@ -13 +13 @@
 
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
-from sas.qtgui.Perspectives.Fitting import FittingUtilities
 
 class ReportPageLogic(object):
@@ -19 +18 @@
     Logic for the Report Page functionality. Refactored from FittingWidget.
     """
-    def __init__(self, parent=None, kernel_module=None, data=None, index=None, model=None):
+    def __init__(self, parent=None, kernel_module=None, data=None, index=None, params=None):
 
         self.parent = parent
@@ -25 +24 @@
         self.data = data
         self._index = index
-        self.model = model
+        self.params = params
 
     @staticmethod
@@ -119 +118 @@
         Look at widget state and extract parameters
         """
-        pars = FittingUtilities.getStandardParam(self.model)
-        if pars is None:
+        if self.params is None:
             return ""
 
         report = ""
         plus_minus = " ± "
-        for value in pars:
+        for value in self.params:
             try:
                 par_name = value[1]