Changes in src/sas/qtgui/Perspectives/Fitting/FittingLogic.py [dcabba7:40975f8] in sasview

File:

• src/sas/qtgui/Perspectives/Fitting/FittingLogic.py (modified) (4 diffs)

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

@@ -161 +161 @@
         Create a new 1D data instance based on fitting results
         """
-
-        return self._create1DPlot(tab_id, return_data['x'], return_data['y'],
-                                  return_data['model'], return_data['data'])
+        # Unpack return data from Calc1D
+        x, y, page_id, state, weight,\
+        fid, toggle_mode_on, \
+        elapsed, index, model, \
+        data, update_chisqr, source, \
+        unsmeared_output, unsmeared_data, unsmeared_error, \
+        intermediate_results = return_data
+
+        return self._create1DPlot(tab_id, x, y, model, data)
 
     def new2DPlot(self, return_data):
@@ -169 +175 @@
         Create a new 2D data instance based on fitting results
         """
-        image = return_data['image']
-        data = return_data['data']
-        model = return_data['model']
+        image, data, page_id, model, state, toggle_mode_on,\
+        elapsed, index, fid, qmin, qmax, weight, \
+        update_chisqr, source = return_data
 
         np.nan_to_num(image)
@@ -177 +183 @@
         new_plot.name = model.name + '2d'
         new_plot.title = "Analytical model 2D "
-        new_plot.id = str(return_data['page_id']) + " " + data.name
-        new_plot.group_id = str(return_data['page_id']) + " Model2D"
+        new_plot.id = str(page_id) + " " + data.name
+        new_plot.group_id = str(page_id) + " Model2D"
         new_plot.detector = data.detector
         new_plot.source = data.source
@@ -212 +218 @@
         (pq_plot, sq_plot). If either are unavailable, the corresponding plot is None.
         """
-
-        pq_plot = None
-        sq_plot = None
-
-        if return_data.get('pq_values', None) is not None:
-            pq_plot = self._create1DPlot(tab_id, return_data['x'],
-                    return_data['pq_values'], return_data['model'],
-                    return_data['data'], component="P(Q)")
-        if return_data.get('sq_values', None) is not None:
-            sq_plot = self._create1DPlot(tab_id, return_data['x'],
-                    return_data['sq_values'], return_data['model'],
-                    return_data['data'], component="S(Q)")
-
-        return pq_plot, sq_plot
+        # Unpack return data from Calc1D
+        x, y, page_id, state, weight, \
+        fid, toggle_mode_on, \
+        elapsed, index, model, \
+        data, update_chisqr, source, \
+        unsmeared_output, unsmeared_data, unsmeared_error, \
+        intermediate_results = return_data
+
+        plots = []
+        for name, result in intermediate_results.items():
+            plots.append(self._create1DPlot(tab_id, x, result, model, data, component=name))
+        return plots
 
     def computeDataRange(self):