Changes in / [f7d39c9:b7f7d3f] in sasview

Location:

src/sas/qtgui

Files:

• Perspectives/Fitting/FittingWidget.py (modified) (6 diffs)
• Utilities/GuiUtils.py (modified) (1 diff)

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):

src/sas/qtgui/Utilities/GuiUtils.py

@@ -292 +292 @@
     # Append the new row to the main item
     item.appendRow(checkbox_item)
+
+def deleteRedundantPlots(item, new_plots):
+    """
+    Checks all plots that are children of the given item; if any have an ID or name not included in new_plots,
+    it is deleted. Useful for e.g. switching from P(Q)S(Q) to P(Q); this would remove the old S(Q) plot.
+
+    Ensure that new_plots contains ALL the relevant plots(!!!)
+    """
+    assert isinstance(item, QtGui.QStandardItem)
+
+    names = [p.name for p in new_plots if p.name is not None]
+    ids = [p.id for p in new_plots if p.id is not None]
+
+    items_to_delete = []
+
+    for index in range(item.rowCount()):
+        plot_item = item.child(index)
+        if plot_item.isCheckable():
+            plot_data = plot_item.child(0).data()
+            if (plot_data.id is not None) and (plot_data.id not in ids) and (plot_data.name not in names):
+                items_to_delete.append(plot_item)
+
+    for plot_item in items_to_delete:
+        item.removeRow(plot_item.row())
 
 class HashableStandardItem(QtGui.QStandardItem):