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

Timestamp:

Aug 22, 2018 7:02:41 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

54492dc

Parents:

f7d39c9 (diff), 0fe7e5b (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' of ​https://github.com/SasView/sasview into ESS_GUI

File:

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

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

@@ -977 +977 @@
         if category == CATEGORY_STRUCTURE:
             model = None
+
+        # Reset parameters to fit
+        self.parameters_to_fit = None
+        self.has_error_column = False
+        self.has_poly_error_column = False
+
         self.respondToModelStructure(model=model, structure_factor=structure)
 
@@ -1650 +1656 @@
         Take func and throw it inside the magnet model row loop
         """
-        for row_i in range(self._model_model.rowCount()):
+        for row_i in range(self._magnet_model.rowCount()):
             func(row_i)
 
@@ -1662 +1668 @@
         if self._magnet_model.rowCount() == 0:
             return
-
-        def iterateOverMagnetModel(func):
-            """
-            Take func and throw it inside the magnet model row loop
-            """
-            for row_i in range(self._magnet_model.rowCount()):
-                func(row_i)
 
         def updateFittedValues(row):
@@ -2228 +2227 @@
         """
         fitted_data = self.logic.new1DPlot(return_data, self.tab_id)
-        self.calculateResiduals(fitted_data)
+        residuals = self.calculateResiduals(fitted_data)
         self.model_data = fitted_data
+
+        new_plots = [fitted_data, residuals]
 
         # Create plots for intermediate product data
@@ -2236 +2237 @@
             pq_data.symbol = "Line"
             self.createNewIndex(pq_data)
+            new_plots.append(pq_data)
         if sq_data is not None:
             sq_data.symbol = "Line"
             self.createNewIndex(sq_data)
+            new_plots.append(sq_data)
+
+        if self.data_is_loaded:
+            GuiUtils.deleteRedundantPlots(self.all_data[self.data_index], new_plots)
 
     def complete2D(self, return_data):
@@ -2274 +2280 @@
         residuals_plot.id = "Residual " + residuals_plot.id
         self.createNewIndex(residuals_plot)
+        return residuals_plot
 
     def onCategoriesChanged(self):