Changeset d8d81ea in sasview for src/sas

Timestamp:

Sep 21, 2018 3:38:25 AM (6 years ago)

Author:

ibressler

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:

9d23e4c

Parents:

44deced

Message:

plotPolydispersities(): fixed polydispersity plots data.id

• makes sure the plots are added/removed correctly from theory_model

File:

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

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

@@ -2448 +2448 @@
             new_plots.append(residuals)
 
-        model = return_data.get('model', None)
-        for plot in FittingUtilities.plotPolydispersities(model):
-            data_id = fitted_data.id.split()
-            plot.id = " ".join([data_id[0], plot.name] + data_id[1:])
-            data_name = fitted_data.name.split()
-            plot.name = " ".join([data_name[0], plot.name] + data_name[1:])
-            self.createNewIndex(plot)
-            new_plots.append(plot)
-
         if self.data_is_loaded:
             # delete any plots associated with the data that were not updated
@@ -2466 +2457 @@
             # redundant items, e.g. beta(Q), S_eff(Q)
             self.communicate.deleteIntermediateTheoryPlotsSignal.emit(self.kernel_module.id)
+
+        # Create plots for parameters with enabled polydispersity
+        for plot in FittingUtilities.plotPolydispersities(return_data.get('model', None)):
+            data_id = fitted_data.id.split()
+            plot.id = "{} [{}] {}".format(data_id[0], plot.name, " ".join(data_id[1:]))
+            data_name = fitted_data.name.split()
+            plot.name = " ".join([data_name[0], plot.name] + data_name[1:])
+            self.createNewIndex(plot)
+            new_plots.append(plot)
 
         # Create plots for intermediate product data