Changeset 712db9e in sasview for src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

Timestamp:

Sep 24, 2018 8:17:36 AM (6 years ago)

Author:

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:

ee22241

Parents:

7879745

Message:

Set pointer to the correct set of data in batch fitting.

File:

• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (3 diffs)

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

@@ -2494 +2494 @@
         fitted_data = self.logic.new1DPlot(return_data, self.tab_id)
 
+        # assure the current index is set properly for batch
+        if len(self._logic) > 1:
+            for i, logic in enumerate(self._logic):
+                if logic.data.name in fitted_data.name:
+                    self.data_index = i
+
         residuals = self.calculateResiduals(fitted_data)
         self.model_data = fitted_data
@@ -2558 +2564 @@
 
         self.createNewIndex(weighted_data)
+
         # Calculate difference between return_data and logic.data
-        self.chi2 = FittingUtilities.calculateChi2(weighted_data, self.logic.data)
+        self.chi2 = FittingUtilities.calculateChi2(weighted_data, self.data)
         # Update the control
         chi2_repr = "---" if self.chi2 is None else GuiUtils.formatNumber(self.chi2, high=True)
@@ -2569 +2576 @@
 
         residuals_plot = FittingUtilities.plotResiduals(self.data, weighted_data)
+        if residuals_plot is None:
+            return
         residuals_plot.id = "Residual " + residuals_plot.id
         residuals_plot.plot_role = Data1D.ROLE_RESIDUAL