Changeset 428c3b2 in sasview for src/sas/qtgui/MainWindow/DataExplorer.py

Timestamp:

Sep 26, 2018 6:50:56 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

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:

009c7a4

Parents:

8eea1b1

git-author:

Piotr Rozyczko <piotr.rozyczko@…> (09/26/18 06:49:19)

git-committer:

Piotr Rozyczko <piotr.rozyczko@…> (09/26/18 06:50:56)

Message:

Pay attention to 2D charts lifetime. SASVIEW-1175

File:

• src/sas/qtgui/MainWindow/DataExplorer.py (modified) (3 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -624 +624 @@
         new_plots = []
 
+        # Get the main data plot
+        main_data = GuiUtils.dataFromItem(plot_item.parent())
+        if main_data is None:
+            # Try the current item
+            main_data = GuiUtils.dataFromItem(plot_item)
+
+        # Make sure main data for 2D is always displayed
+        if main_data and not self.isPlotShown(main_data):
+            if isinstance(main_data, Data2D):
+                self.plotData([(plot_item, main_data)])
+
         # Check if this is merely a plot update
         if self.updatePlot(plot_to_show):
@@ -638 +649 @@
             # Plots with main data points on the same chart
             # Get the main data plot
-            main_data = GuiUtils.dataFromItem(plot_item.parent())
-            if main_data is None:
-                # Try the current item
-                main_data = GuiUtils.dataFromItem(plot_item)
-            if main_data is not None:
+            if main_data and not self.isPlotShown(main_data):
                 new_plots.append((plot_item, main_data))
             new_plots.append((plot_item, plot_to_show))
@@ -648 +655 @@
         if new_plots:
             self.plotData(new_plots)
+
+    def isPlotShown(self, plot):
+        """
+        Checks currently shown plots and returns true if match
+        """
+        if not hasattr(plot, 'name'):
+            return False
+        ids_vals = [val.data.name for val in self.active_plots.values()]
+
+        return plot.name in ids_vals
 
     def addDataPlot2D(self, plot_set, item):