Changeset d5c5d3d in sasview for src/sas/qtgui/Plotting

Timestamp:

Oct 17, 2017 3:25:17 PM (7 years ago)

Author:

celinedurniak <celine.durniak@…>

Branches:

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

Children:

f0bb711

Parents:

d6e5b31

Message:

Implemented new GUI for data operation panel

Location:

src/sas/qtgui/Plotting

Files:

• Plotter.py (modified) (2 diffs)
• Plotter2D.py (modified) (4 diffs)

src/sas/qtgui/Plotting/Plotter.py

@@ -58 +58 @@
         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, show_legend=True):
         """
         Add a new plot of self._data to the chart.
@@ -145 +145 @@
 
         # Now add the legend with some customizations.
-        self.legend = ax.legend(loc='upper right', shadow=True)
-        if self.legend:
-            self.legend.set_picker(True)
+        if show_legend:
+            self.legend = ax.legend(loc='upper right', shadow=True)
+            if self.legend:
+                self.legend.set_picker(True)
 
         # Current labels for axes

src/sas/qtgui/Plotting/Plotter2D.py

@@ -87 +87 @@
         self._item = item
 
-    def plot(self, data=None, marker=None):
+    def plot(self, data=None, marker=None, show_colorbar=True):
         """
         Plot 2D self._data
@@ -109 +109 @@
                       ymin=self.ymin, ymax=self.ymax,
                       cmap=self.cmap, zmin=zmin_2D_temp,
-                      zmax=zmax_2D_temp)
+                      zmax=zmax_2D_temp, show_colorbar=show_colorbar)
 
     def calculateDepth(self):
@@ -379 +379 @@
 
     def showPlot(self, data, qx_data, qy_data, xmin, xmax, ymin, ymax,
-                 zmin, zmax, label='data2D', cmap=DEFAULT_CMAP):
+                 zmin, zmax, label='data2D', cmap=DEFAULT_CMAP, show_colorbar=True):
         """
         Render and show the current data
@@ -457 +457 @@
             self.vmax = cb.vmax
 
+            if show_colorbar is False:
+                cb.remove()
+
         else:
             # clear the previous 2D from memory