diff --git a/src/sas/qtgui/MainWindow/DataExplorer.py b/src/sas/qtgui/MainWindow/DataExplorer.py index 3484817a6b..0f845155b4 100644 --- a/src/sas/qtgui/MainWindow/DataExplorer.py +++ b/src/sas/qtgui/MainWindow/DataExplorer.py @@ -2069,7 +2069,7 @@ def updateTheoryFromPerspective(self, model_item): self.theory_model.appendRow(model_item) return model_item - def deleteIntermediateTheoryPlotsByModelID(self, model_id): + def deleteIntermediateTheoryPlotsByTabId(self, tab_id): """Given a model's ID, deletes all items in the theory item model which reference the same ID. Useful in the case of intermediate results disappearing when changing calculations (in which case you don't want them to be retained in the list).""" diff --git a/src/sas/qtgui/MainWindow/GuiManager.py b/src/sas/qtgui/MainWindow/GuiManager.py index e2ea5945f3..e5f4150606 100644 --- a/src/sas/qtgui/MainWindow/GuiManager.py +++ b/src/sas/qtgui/MainWindow/GuiManager.py @@ -697,7 +697,7 @@ def addCallbacks(self): self.communicate.progressBarUpdateSignal.connect(self.updateProgressBar) self.communicate.perspectiveChangedSignal.connect(self.perspectiveChanged) self.communicate.updateTheoryFromPerspectiveSignal.connect(self.updateTheoryFromPerspective) - self.communicate.deleteIntermediateTheoryPlotsSignal.connect(self.deleteIntermediateTheoryPlotsByModelID) + self.communicate.deleteIntermediateTheoryPlotsSignal.connect(self.deleteIntermediateTheoryPlotsByTabId) self.communicate.plotRequestedSignal.connect(self.showPlot) self.communicate.plotFromNameSignal.connect(self.showPlotFromName) self.communicate.updateModelFromDataOperationPanelSignal.connect(self.updateModelFromDataOperationPanel) @@ -1331,12 +1331,12 @@ def updateTheoryFromPerspective(self, index): return per.currentTab.setTheoryItem(item) - def deleteIntermediateTheoryPlotsByModelID(self, model_id): + def deleteIntermediateTheoryPlotsByTabId(self, tab_id): """ Catch the signal to delete items in the Theory item model which correspond to a model ID. Send the request to the DataExplorer for updating the theory model. """ - self.filesWidget.deleteIntermediateTheoryPlotsByModelID(model_id) + self.filesWidget.deleteIntermediateTheoryPlotsByTabId(tab_id) def updateModelFromDataOperationPanel(self, new_item, new_datalist_item): """ diff --git a/src/sas/qtgui/Perspectives/Fitting/FittingWidget.py b/src/sas/qtgui/Perspectives/Fitting/FittingWidget.py index 3a93a2cac8..3c48eea4e3 100644 --- a/src/sas/qtgui/Perspectives/Fitting/FittingWidget.py +++ b/src/sas/qtgui/Perspectives/Fitting/FittingWidget.py @@ -3301,7 +3301,7 @@ def complete1D(self, return_data): else: # delete theory items for the model, in order to get rid of any # redundant items, e.g. beta(Q), S_eff(Q) - self.communicate.deleteIntermediateTheoryPlotsSignal.emit(self.kernel_module.id) + self.communicate.deleteIntermediateTheoryPlotsSignal.emit(str(self.tab_id)) self._appendPlotsPolyDisp(new_plots, return_data, fitted_data)