Changeset 092a3d9 in sasview for src/sas/qtgui/Plotter2D.py

Timestamp:

Jan 20, 2017 6:26:35 AM (7 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:

03c372d

Parents:

0f3c22d

Message:

Color Map control for 2D charts. Initial commit - SASVIEW-391

File:

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

src/sas/qtgui/Plotter2D.py

@@ -2 +2 @@
 import numpy
 import pylab
+import functools
 
 from PyQt4 import QtGui
+from PyQt4 import QtCore
 
 DEFAULT_CMAP = pylab.cm.jet
@@ -10 +12 @@
 import sas.qtgui.PlotUtilities as PlotUtilities
 from sas.qtgui.PlotterBase import PlotterBase
+from sas.qtgui.ColorMap import ColorMap
 from sas.sasgui.guiframe.dataFitting import Data2D
 
@@ -22 +25 @@
         self.dimension = dimension
         super(Plotter2DWidget, self).__init__(parent, manager=manager, quickplot=quickplot)
+
+        self.cmap = DEFAULT_CMAP.name
+        # Default scale
+        self.scale = 'log_{10}'
 
     @property
@@ -55 +62 @@
 
         # Toggle the scale
-        zmin_2D_temp = self.zmin
-        zmax_2D_temp = self.zmax
-        # self.scale predefined in the baseclass
-        if self.scale == 'log_{10}':
-            self.scale = 'linear'
-            if not self.zmin is None:
-                zmin_2D_temp = numpy.power(10, self.zmin)
-            if not self.zmax is None:
-                zmax_2D_temp = numpy.power(10, self.zmax)
-        else:
-            self.scale = 'log_{10}'
-            if not self.zmin is None:
-                # min log value: no log(negative)
-                if self.zmin <= 0:
-                    zmin_2D_temp = MIN_Z
-                else:
-                    zmin_2D_temp = numpy.log10(self.zmin)
-            if not self.zmax is None:
-                zmax_2D_temp = numpy.log10(self.zmax)
+        zmin_2D_temp, zmax_2D_temp = self.calculateDepth()
 
         # Prepare and show the plot
@@ -85 +74 @@
                       zmax=zmax_2D_temp)
 
+    def calculateDepth(self):
+        """
+        Re-calculate the plot depth parameters depending on the scale
+        """
+        # Toggle the scale
+        zmin_temp = self.zmin
+        zmax_temp = self.zmax
+        # self.scale predefined in the baseclass
+        if self.scale == 'log_{10}':
+            if self.zmin is not None:
+                zmin_temp = numpy.power(10, self.zmin)
+            if self.zmax is not None:
+                zmax_temp = numpy.power(10, self.zmax)
+        else:
+            if self.zmin is not None:
+                # min log value: no log(negative)
+                zmin_temp = MIN_Z if self.zmin <= 0 else numpy.log10(self.zmin)
+            if self.zmax is not None:
+                zmax_temp = numpy.log10(self.zmax)
+
+        return (zmin_temp, zmax_temp)
+
+
     def createContextMenu(self):
         """
@@ -90 +102 @@
         """
         self.defaultContextMenu()
+
+        self.contextMenu.addSeparator()
+        self.actionDataInfo = self.contextMenu.addAction("&DataInfo")
+        self.actionDataInfo.triggered.connect(
+                              functools.partial(self.onDataInfo, self.data))
+
+        self.actionSavePointsAsFile = self.contextMenu.addAction("&Save Points as a File")
+        self.actionSavePointsAsFile.triggered.connect(
+                                functools.partial(self.onSavePoints, self.data))
+        self.contextMenu.addSeparator()
+
+        self.actionCircularAverage = self.contextMenu.addAction("&Perform Circular Average")
+        self.actionCircularAverage.triggered.connect(self.onCircularAverage)
+
+        self.actionSectorView = self.contextMenu.addAction("&Sector [Q View]")
+        self.actionSectorView.triggered.connect(self.onSectorView)
+        self.actionAnnulusView = self.contextMenu.addAction("&Annulus [Phi View]")
+        self.actionAnnulusView.triggered.connect(self.onAnnulusView)
+        self.actionBoxSum = self.contextMenu.addAction("&Box Sum")
+        self.actionBoxSum.triggered.connect(self.onBoxSum)
+        self.actionBoxAveragingX = self.contextMenu.addAction("&Box Averaging in Qx")
+        self.actionBoxAveragingX.triggered.connect(self.onBoxAveragingX)
+        self.actionBoxAveragingY = self.contextMenu.addAction("&Box Averaging in Qy")
+        self.actionBoxAveragingY.triggered.connect(self.onBoxAveragingY)
+        self.contextMenu.addSeparator()
+        self.actionEditGraphLabel = self.contextMenu.addAction("&Edit Graph Label")
+        self.actionEditGraphLabel.triggered.connect(self.onEditgraphLabel)
+        self.contextMenu.addSeparator()
+        self.actionColorMap = self.contextMenu.addAction("&2D Color Map")
+        self.actionColorMap.triggered.connect(self.onColorMap)
+        self.contextMenu.addSeparator()
+        self.actionChangeScale = self.contextMenu.addAction("Toggle Linear/Log Scale")
+        self.actionChangeScale.triggered.connect(self.onToggleScale)
 
     def createContextMenuQuick(self):
@@ -111 +156 @@
         Toggle axis and replot image
         """
+        # self.scale predefined in the baseclass
+        if self.scale == 'log_{10}':
+            self.scale = 'linear'
+        else:
+            self.scale = 'log_{10}'
+
         self.plot()
+
+    def onCircularAverage(self):
+        """
+        """
+        pass
+
+    def onSectorView(self):
+        """
+        """
+        pass
+
+    def onAnnulusView(self):
+        """
+        """
+        pass
+
+    def onBoxSum(self):
+        """
+        """
+        pass
+
+    def onBoxAveragingX(self):
+        """
+        """
+        pass
+
+    def onBoxAveragingY(self):
+        """
+        """
+        pass
+
+    def onEditgraphLabel(self):
+        """
+        """
+        pass
+
+    def onColorMap(self):
+        """
+        Display the color map dialog and modify the plot's map accordingly
+        """
+        color_map_dialog = ColorMap(self, cmap=self.cmap,
+                                    zmin=self.vmin,
+                                    zmax=self.vmax,
+                                    data=self.data)
+
+        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
 
     def showPlot(self, data, qx_data, qy_data, xmin, xmax, ymin, ymax,
@@ -140 +242 @@
             try:
                 if  self.zmin <= 0  and len(output[output > 0]) > 0:
-                    zmin_temp = self.zmin_2D
+                    zmin_temp = self.zmin
                     output[output > 0] = numpy.log10(output[output > 0])
                 elif self.zmin <= 0:
@@ -185 +287 @@
             cb.set_label('$' + self.scale + '$')
 
+            self.vmin = cb.vmin
+            self.vmax = cb.vmax
+
         else:
             # clear the previous 2D from memory