Changeset 04ac604 in sasview for src/sas

Timestamp:

Aug 21, 2018 4:28:33 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

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:

b51c8fc

Parents:

3933ee9

Message:

Don't transform data which has already been transformed.
Improved existing plot check.
SASVIEW-988

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (1 diff)
• Plotting/Plotter.py (modified) (3 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -527 +527 @@
         plots = GuiUtils.plotsFromFilename(filename, model)
         ids = [list(self.active_plots.values())[id].data.id for id in range(len(self.active_plots))]
+        ids2 = [list(self.active_plots.keys())[id] for id in range(len(self.active_plots))]
 
         new_plots = []
         for item, plot in plots.items():
             plot_id = plot.id
-            if plot_id in ids:
+            if plot_id in ids or plot_id in ids2:
                 self.active_plots[plot_id].replacePlot(plot_id, plot)
             else:

src/sas/qtgui/Plotting/Plotter.py

@@ -64 +64 @@
         self.title(title=value.name)
 
-    def plot(self, data=None, color=None, marker=None, hide_error=False):
+    def plot(self, data=None, color=None, marker=None, hide_error=False, transform=True):
         """
         Add a new plot of self._data to the chart.
@@ -83 +83 @@
 
             # Transform data if required.
-            if self.data.xtransform is not None or self.data.ytransform is not None:
+            if transform and (self.data.xtransform is not None or self.data.ytransform is not None):
                 _, _, xscale, yscale = GuiUtils.xyTransform(self.data, self.data.xtransform, self.data.ytransform)
                 if xscale != 'log':
@@ -528 +528 @@
             self.xLabel = new_xlabel
             self.yLabel = new_ylabel
-            # Directly overwrite the data to avoid label reassignment
-            self._data = current_plot
-            self.plot()
+
+            self.plot(data=current_plot, transform=False)
 
         pass # debug hook