Changeset 5d89f43 in sasview for src/sas/qtgui/Plotter2D.py

Timestamp:

Jan 25, 2017 8:51:26 AM (8 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

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:

3bdbfcc

Parents:

03c372d

Message:

Code review for ColorMap?

File:

• src/sas/qtgui/Plotter2D.py (modified) (4 diffs)

src/sas/qtgui/Plotter2D.py

@@ -29 +29 @@
         # Default scale
         self.scale = 'log_{10}'
+        self.vmin = None
+        self.vmax = None
 
     @property
@@ -208 +210 @@
                                     data=self.data)
 
+        color_map_dialog.apply_signal.connect(self.onApplyMap)
+
         if color_map_dialog.exec_() == QtGui.QDialog.Accepted:
-            self.cmap = color_map_dialog.cmap()
-            self.vmin, self.vmax = color_map_dialog.norm()
-            # Redraw the chart with new cmap
-            self.plot()
-        pass
+            self.onApplyMap(color_map_dialog.norm(), color_map_dialog.cmap())
+
+    def onApplyMap(self, v_values, cmap):
+        """
+        Update the chart color map based on data passed from the widget
+        """
+        self.cmap = str(cmap)
+        self.vmin, self.vmax = v_values
+        # Redraw the chart with new cmap
+        self.plot()
 
     def showPlot(self, data, qx_data, qy_data, xmin, xmax, ymin, ymax,
@@ -261 +270 @@
             self.figure.subplots_adjust(left=0.2, right=.8, bottom=.2)
 
+            zmax_temp = self.zmax
+            if self.vmin is not None:
+                zmin_temp = self.vmin
+                zmax_temp = self.vmax
+
             im = self.ax.imshow(output, interpolation='nearest',
                                 origin='lower',
-                                vmin=zmin_temp, vmax=self.zmax,
+                                vmin=zmin_temp, vmax=zmax_temp,
                                 cmap=self.cmap,
                                 extent=(self.xmin, self.xmax,
@@ -301 +315 @@
 
             ax = Axes3D(self.figure)
-            #cbax = self.figure.add_axes([0.84, 0.1, 0.02, 0.8])
 
             # Disable rotation for large sets.