Changeset 053f983 in sasview

Timestamp:

Jan 23, 2012 8:01:37 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

0b705915

Parents:

9a74c7d

Message:

trying to fix a 3d problem with mpl < 1.0

File:

• plottools/src/danse/common/plottools/PlotPanel.py (modified) (2 diffs)

plottools/src/danse/common/plottools/PlotPanel.py

@@ -1495 +1495 @@
 
             self.subplot.figure.subplots_adjust(left=0.1, right=.8, bottom=.1)  
+
+            X = self.x_bins[0:-1]
+            Y = self.y_bins[0:-1]
+            X, Y = numpy.meshgrid(X, Y)
+            
             try:
                 # mpl >= 1.0.0
@@ -1500 +1505 @@
                 #ax.disable_mouse_rotation()
                 cbax = self.subplot.figure.add_axes([0.84,0.1,0.02,0.8])
+                if len(X) > 60:
+                    ax.disable_mouse_rotation()
             except:
                 # mpl < 1.0.0
                 ax =  Axes3D(self.subplot.figure)
+                if len(X) > 60:
+                    ax.cla()
                 cbax = None
-
-            X = self.x_bins[0:-1]
-            Y = self.y_bins[0:-1]
-            X, Y = numpy.meshgrid(X, Y)
-            if len(X) > 60:
-                ax.disable_mouse_rotation()
+            
             im = ax.plot_surface(X, Y, output, rstride=1, cstride=1, cmap=cmap,
                                    linewidth=0, antialiased=False)