Changeset 8a09457 in sasview for src

Timestamp:

Sep 25, 2018 4:31:42 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:

6ae7466

Parents:

8b6e4be

Message:

Fixed logic in 2D batch fitting. SASVIEW-1168

File:

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

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

@@ -2493 +2493 @@
         self.enableInteractiveElements()
         if return_data is None:
-            self.calculateDataFailed("Results not available.")
             return
         fitted_data = self.logic.new1DPlot(return_data, self.tab_id)
@@ -2545 +2544 @@
         self.enableInteractiveElements()
 
+        if return_data is None:
+            return
+
         fitted_data = self.logic.new2DPlot(return_data)
+        # 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