Changeset 60d55a7 in sasview

Timestamp:

Sep 7, 2018 9:03:40 AM (6 years ago)

Author:

ibressler

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

dcabba7

Parents:

73665a8

git-author:

Ingo Breßler <dev@…> (09/06/18 05:00:58)

git-committer:

Ingo Breßler <dev@…> (09/07/18 09:03:40)

Message:

DataExplorerWindow?.displayFile() using updatePlot() avoids duplicate code

File:

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

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -560 +560 @@
         # Now query the model item for available plots
         plots = GuiUtils.plotsFromFilename(filename, model)
-        ids_keys = list(self.active_plots.keys())
-        ids_vals = [val.data.id for val in self.active_plots.values()]
 
         new_plots = []
         for item, plot in plots.items():
-            plot_id = plot.id
-            if plot_id in ids_keys:
-                self.active_plots[plot_id].replacePlot(plot_id, plot)
-            elif plot_id in ids_vals:
-                list(self.active_plots.values())[ids_vals.index(plot_id)].replacePlot(plot_id, plot)
-            else:
+            if not self.updatePlot(plot):
                 # Don't plot intermediate results, e.g. P(Q), S(Q)
-                match = GuiUtils.theory_plot_ID_pattern.match(plot_id)
+                match = GuiUtils.theory_plot_ID_pattern.match(plot.id)
                 # 2nd match group contains the identifier for the intermediate result, if present (e.g. "[P(Q)]")
                 if match and match.groups()[1] != None:
@@ -706 +699 @@
                 self.active_plots[plot_set.id] = old_plot
 
-    def updatePlot(self, new_data):
-        """
-        Modify existing plot for immediate response
-        """
-        data = new_data[0]
+    def updatePlot(self, data):
+        """
+        Modify existing plot for immediate response and returns True.
+        Returns false, if the plot does not exist already.
+        """
+        try: # there might be a list or a single value being passed
+            data = data[0]
+        except TypeError:
+            pass
         assert type(data).__name__ in ['Data1D', 'Data2D']
 
@@ -719 +716 @@
         if data_id in ids_keys:
             self.active_plots[data_id].replacePlot(data_id, data)
+            return True
         elif data_id in ids_vals:
             list(self.active_plots.values())[ids_vals.index(data_id)].replacePlot(data_id, data)
+            return True
+        return False
 
     def chooseFiles(self):