Changeset 62a6a78 in sasview for src/sas/sasgui/perspectives/fitting/fitting.py

Timestamp:

Aug 24, 2017 5:36:00 AM (7 years ago)

Author:

lewis

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

13991957

Parents:

467068d

Message:

Ensure all P(Q) and S(Q) plot are updated correctly

File:

• src/sas/sasgui/perspectives/fitting/fitting.py (modified) (2 diffs)

src/sas/sasgui/perspectives/fitting/fitting.py

@@ -1762 +1762 @@
             plot_ids = {}
             for plot_panel in self.parent.plot_panels.values():
-                for plot in plot_panel.plots.keys():
-                    if plot in plot_ids.keys():
-                        plot_ids[plot].append(plot_panel.group_id)
+                for data_id in plot_panel.plots.keys():
+                    if data_id in plot_ids.keys():
+                        plot_ids[data_id].append(plot_panel.group_id)
                     else:
-                        plot_ids[plot] = [plot_panel.group_id]
+                        plot_ids[data_id] = [plot_panel.group_id]
             # Create/Update the theories
             sq_id = str(page_id) + " " + data.name + " S(q)"
@@ -1779 +1779 @@
             if sq_id in plot_ids.keys():
                 # If the S(Q) theory has been plotted, update its plots
+                sq_plot.list_group_id = plot_ids[sq_id]
                 for group_id in plot_ids[sq_id]:
-                    sq_plot.group_id = group_id
-                    wx.PostEvent(self.parent, NewPlotEvent(plot=sq_plot,
-                        title=str(sq_plot.title)))
+                    # Only create a copy of the data object if more than one plot of it exists
+                    if len(plot_ids[sq_id]) > 1:
+                        to_plot = deepcopy(sq_plot)
+                    else:
+                        to_plot = sq_plot
+                    to_plot.group_id = group_id
+                    wx.PostEvent(self.parent, NewPlotEvent(plot=to_plot,
+                        title=str(to_plot.title), group_id=to_plot.group_id))
             if pq_id in plot_ids.keys():
                 # If the P(Q) theory has been plotted, update its plots
+                pq_plot.list_group_id = plot_ids[pq_id]
                 for group_id in plot_ids[pq_id]:
-                    pq_plot.group_id = group_id
-                    wx.PostEvent(self.parent, NewPlotEvent(plot=pq_plot,
-                        title=str(pq_plot.title)))
+                    # Only create a copy of the data object if more than one plot of it exists
+                    if len(plot_ids[pq_id]) > 1:
+                        to_plot = deepcopy(pq_plot)
+                    else:
+                        to_plot = pq_plot
+                    to_plot.group_id = group_id
+                    wx.PostEvent(self.parent, NewPlotEvent(plot=to_plot,
+                        title=str(to_plot.title), group_id=to_plot.group_id))
 
         current_pg = self.fit_panel.get_page_by_id(page_id)