Changeset 64f1e93 in sasview for src/sas/qtgui/Plotter2D.py

Timestamp:

Dec 7, 2016 5:47:22 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:

416fa8f

Parents:

55d89f8

Message:

2D plots: more unit tests + minor cleanup

File:

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

src/sas/qtgui/Plotter2D.py

@@ -9 +9 @@
 import sas.qtgui.PlotUtilities as PlotUtilities
 from sas.qtgui.PlotterBase import PlotterBase
+from mpl_toolkits.mplot3d import Axes3D
 
 class Plotter2D(PlotterBase):
@@ -40 +41 @@
         Plot 2D self._data
         """
-        # create an axis object
+        # Toggle the scale
         zmin_2D_temp = self.zmin
         zmax_2D_temp = self.zmax
@@ -60 +61 @@
                 zmax_2D_temp = numpy.log10(self.zmax)
 
-        self.image(data=self.data.data, qx_data=self.qx_data,
-                   qy_data=self.qy_data, xmin=self.xmin,
-                   xmax=self.xmax,
-                   ymin=self.ymin, ymax=self.ymax,
-                   cmap=self.cmap, zmin=zmin_2D_temp,
-                   zmax=zmax_2D_temp)
+        # Prepare and show the plot
+        self.showPlot(data=self.data.data,
+                      qx_data=self.qx_data,
+                      qy_data=self.qy_data,
+                      xmin=self.xmin,
+                      xmax=self.xmax,
+                      ymin=self.ymin, ymax=self.ymax,
+                      cmap=self.cmap, zmin=zmin_2D_temp,
+                      zmax=zmax_2D_temp)
 
     def contextMenuQuickPlot(self):
@@ -96 +100 @@
         self.plot()
 
-    def image(self, data, qx_data, qy_data, xmin, xmax, ymin, ymax,
-              zmin, zmax, color=0, symbol=0, markersize=0,
-              label='data2D', cmap=DEFAULT_CMAP):
+    def showPlot(self, data, qx_data, qy_data, xmin, xmax, ymin, ymax,
+                 zmin, zmax, color=0, symbol=0, markersize=0,
+                 label='data2D', cmap=DEFAULT_CMAP):
         """
-        Render the current data
+        Render and show the current data
         """
         self.qx_data = qx_data
@@ -152 +156 @@
         else:
             # clear the previous 2D from memory
-            # mpl is not clf, so we do
             self.figure.clear()
 
@@ -161 +164 @@
             X, Y = numpy.meshgrid(X, Y)
 
-            try:
-                # mpl >= 1.0.0
-                ax = self.figure.gca(projection='3d')
-                cbax = self.figure.add_axes([0.84, 0.1, 0.02, 0.8])
-                if len(X) > 60:
-                    ax.disable_mouse_rotation()
-            except:
-                # mpl < 1.0.0
-                try:
-                    from mpl_toolkits.mplot3d import Axes3D
-                except:
-                    logging.error("PlotPanel could not import Axes3D")
-                self.figure.clear()
-                ax = Axes3D(self.figure)
-                if len(X) > 60:
-                    ax.cla()
-                cbax = None
+            ax = Axes3D(self.figure)
+            cbax = self.figure.add_axes([0.84, 0.1, 0.02, 0.8])
+            # Disable rotation for large sets.
+            # TODO: Define "large" for a dataset
+            SET_TOO_LARGE = 500
+            if len(X) > SET_TOO_LARGE:
+                ax.disable_mouse_rotation()
+
             self.figure.canvas.resizing = False
             im = ax.plot_surface(X, Y, output, rstride=1, cstride=1, cmap=cmap,
@@ -190 +184 @@
         cb.update_bruteforce(im)
         cb.set_label('$' + self.scale + '$')
+
         if self.dimension != 3:
             self.figure.canvas.draw_idle()