Changeset 6fbb859 in sasview for src

Timestamp:

Sep 9, 2018 5:36:13 AM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

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:

adf1c2a

Parents:

fa3da01 (diff), daf7c9c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI' into ESS_GUI_iss1052

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingWidget.py (modified) (1 diff)
• FittingLogic.py (modified) (1 diff)

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

@@ -2943 +2943 @@
         self.current_shell_displayed = index
 
-        # Change 'n' in the parameter model, thereby updating the underlying model
+        # Param values for existing shells were reset to default; force all changes into kernel module
+        for row in new_rows:
+            par = row[0].text()
+            val = GuiUtils.toDouble(row[1].text())
+            self.kernel_module.setParam(par, val)
+
+        # Change 'n' in the parameter model; also causes recalculation
         self._model_model.item(self._n_shells_row, 1).setText(str(index))
 

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

@@ -220 +220 @@
         return plots
 
+    def getScalarIntermediateResults(self, return_data):
+        """
+        Returns a dict of scalar-only intermediate results from the return data.
+        """
+        res = {}
+        for name, int_res in return_data["intermediate_results"].items():
+            if isinstance(int_res, np.ndarray):
+                continue
+            res[name] = int_res
+        return res
+
     def computeDataRange(self):
         """