Changeset fecfe28 in sasview for src/sas

Timestamp:

Dec 8, 2016 9:49:50 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:

3b7b218

Parents:

b4b8589

Message:

Code review for 3D plots.

Location:

src/sas/qtgui

Files:

• PlotUtilities.py (modified) (2 diffs)
• Plotter.py (modified) (1 diff)
• Plotter2D.py (modified) (9 diffs)
• UnitTesting/PlotterTest.py (modified) (1 diff)

src/sas/qtgui/PlotUtilities.py

@@ -13 +13 @@
     """
     # No qx or qy given in a vector format
-    if qx_data == None or qy_data == None \
+    if qx_data is None or qy_data is None \
             or qx_data.ndim != 1 or qy_data.ndim != 1:
         return data
@@ -72 +72 @@
     """
     # No qx or qy given in a vector format
-    if qx_data == None or qy_data == None \
+    if qx_data is None or qy_data is None \
             or qx_data.ndim != 1 or qy_data.ndim != 1:
         return data

src/sas/qtgui/Plotter.py

@@ -8 +8 @@
 
 class PlotterWidget(PlotterBase):
+    """
+    1D Plot widget for use with a QDialog
+    """
     def __init__(self, parent=None, manager=None, quickplot=False):
         super(PlotterWidget, self).__init__(parent, manager=manager, quickplot=quickplot)

src/sas/qtgui/Plotter2D.py

@@ -11 +11 @@
 from mpl_toolkits.mplot3d import Axes3D
 
+# Minimum value of Z for which we will present data.
+MIN_Z=-32
+
 class Plotter2DWidget(PlotterBase):
+    """
+    2D Plot widget for use with a QDialog
+    """
     def __init__(self, parent=None, manager=None, quickplot=False, dimension=2):
         self.dimension = dimension
@@ -24 +30 @@
         """ data setter """
         self._data = data
-        self.qx_data=data.qx_data
-        self.qy_data=data.qy_data
-        self.xmin=data.xmin
-        self.xmax=data.xmax
-        self.ymin=data.ymin
-        self.ymax=data.ymax
-        self.zmin=data.zmin
-        self.zmax=data.zmax
-        self.label=data.name
-        self.xLabel="%s(%s)"%(data._xaxis, data._xunit)
-        self.yLabel="%s(%s)"%(data._yaxis, data._yunit)
+        self.qx_data = data.qx_data
+        self.qy_data = data.qy_data
+        self.xmin = data.xmin
+        self.xmax = data.xmax
+        self.ymin = data.ymin
+        self.ymax = data.ymax
+        self.zmin = data.zmin
+        self.zmax = data.zmax
+        self.label = data.name
+        self.xLabel = "%s(%s)"%(data._xaxis, data._xunit)
+        self.yLabel = "%s(%s)"%(data._yaxis, data._yunit)
         self.title(title=data.title)
 
@@ -44 +50 @@
         zmin_2D_temp = self.zmin
         zmax_2D_temp = self.zmax
+        # self.scale predefined in the baseclass
         if self.scale == 'log_{10}':
             self.scale = 'linear'
@@ -55 +62 @@
                 # min log value: no log(negative)
                 if self.zmin <= 0:
-                    zmin_2D_temp = -32
+                    zmin_2D_temp = MIN_Z
                 else:
                     zmin_2D_temp = numpy.log10(self.zmin)
@@ -115 +122 @@
         self.zmax = zmax
         # If we don't have any data, skip.
-        if data == None:
+        if data is None:
             return
         if data.ndim == 1:
@@ -132 +139 @@
                     zmin_temp = self.zmin
                     output[output > 0] = numpy.zeros(len(output))
-                    output[output <= 0] = -32
+                    output[output <= 0] = MIN_Z
                 else:
                     zmin_temp = self.zmin
@@ -163 +170 @@
                 self.ax.set_title(label=self._title)
 
+            if cbax is None:
+                ax.set_frame_on(False)
+                cb = self.figure.colorbar(im, shrink=0.8, aspect=20)
+            else:
+                cb = self.figure.colorbar(im, cax=cbax)
+
+            cb.update_bruteforce(im)
+            cb.set_label('$' + self.scale + '$')
 
         else:
@@ -175 +190 @@
 
             ax = Axes3D(self.figure)
-            cbax = self.figure.add_axes([0.84, 0.1, 0.02, 0.8])
+            #cbax = self.figure.add_axes([0.84, 0.1, 0.02, 0.8])
 
             # Disable rotation for large sets.
@@ -188 +203 @@
             self.ax.set_axis_off()
 
-        if cbax == None:
-            ax.set_frame_on(False)
-            cb = self.figure.colorbar(im, shrink=0.8, aspect=20)
-        else:
-            cb = self.figure.colorbar(im, cax=cbax)
-
-        cb.update_bruteforce(im)
-        cb.set_label('$' + self.scale + '$')
-
         if self.dimension != 3:
             self.figure.canvas.draw_idle()

src/sas/qtgui/UnitTesting/PlotterTest.py

@@ -44 +44 @@
         self.assertEqual(self.plotter.yLabel, "$()$")
 
-    def testPlot(self):
-        """ Look at the plotting """
+    def testPlotWithErrors(self):
+        """ Look at the plotting with error bars"""
         self.plotter.data = self.data
         self.plotter.show()
         FigureCanvas.draw = MagicMock()
 
-        self.plotter.plot()
+        self.plotter.plot(hide_error=False)
 
+        self.assertEqual(self.plotter.ax.get_xscale(), 'log')
+        self.assertTrue(FigureCanvas.draw.called)
+
+    def testPlotWithoutErrors(self):
+        """ Look at the plotting without error bars"""
+        self.plotter.data = self.data
+        self.plotter.show()
+        FigureCanvas.draw = MagicMock()
+
+        self.plotter.plot(hide_error=True)
+
+        self.assertEqual(self.plotter.ax.get_yscale(), 'log')
         self.assertTrue(FigureCanvas.draw.called)