Changeset dce68f6 in sasview

Timestamp:

Sep 26, 2018 7:56:42 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:

63467b6

Parents:

38f4bc6

git-author:

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

git-committer:

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

Message:

bring back interactive color map updates to 2D charts.

Location:

src/sas/qtgui/Plotting

Files:

• MaskEditor.py (modified) (1 diff)
• Plotter2D.py (modified) (4 diffs)

src/sas/qtgui/Plotting/MaskEditor.py

@@ -227 +227 @@
 
         # modify imshow data
-        self.plotter.plot(data=temp_data)
+        self.plotter.plot(data=temp_data, update=True)
         self.plotter.draw()
 

src/sas/qtgui/Plotting/Plotter2D.py

@@ -86 +86 @@
         self.title(title=data.title)
 
-    def plot(self, data=None, marker=None, show_colorbar=True):
+    def plot(self, data=None, marker=None, show_colorbar=True, update=False):
         """
         Plot 2D self._data
@@ -109 +109 @@
                       ymin=self.ymin, ymax=self.ymax,
                       cmap=self.cmap, zmin=zmin_2D_temp,
-                      zmax=zmax_2D_temp, show_colorbar=show_colorbar)
+                      zmax=zmax_2D_temp, show_colorbar=show_colorbar,
+                      update=update)
 
     def calculateDepth(self):
@@ -390 +391 @@
 
     def showPlot(self, data, qx_data, qy_data, xmin, xmax, ymin, ymax,
-                 zmin, zmax, label='data2D', cmap=DEFAULT_CMAP, show_colorbar=True):
+                 zmin, zmax, label='data2D', cmap=DEFAULT_CMAP, show_colorbar=True,
+                 update=False):
         """
         Render and show the current data
@@ -445 +447 @@
                 zmin_temp = self.vmin
                 zmax_temp = self.vmax
-            if self.im is not None:
+            if self.im is not None and update:
                 self.im.set_data(output)
             else:
                 self.im = self.ax.imshow(output, interpolation='nearest',
-                                # origin='lower',
                                 vmin=zmin_temp, vmax=zmax_temp,
                                 cmap=self.cmap,