Changeset 1b023334 in sasview

Timestamp:

Feb 8, 2012 4:35:53 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:

9fafa39

Parents:

08648c0

Message:

trying to fix a 3d plot problem with mac

File:

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

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

@@ -21 +21 @@
 from binder import BindArtist
 from matplotlib.font_manager import FontProperties
-
+try:
+    from mpl_toolkits.mplot3d import Axes3D
+    PLOT_3D_ON = True
+except:
+    PLOT_3D_ON = False
 #from matplotlib import cm
 #from matplotlib.ticker import LinearLocator, FixedLocator, FormatStrFormatter
@@ -1502 +1506 @@
             try:
                 # mpl >= 1.0.0
-                ax = self.subplot.figure.gca(projection='3d')
+                fig = self.subplot.figure
+                cbax = fig.add_axes([0.84,0.1,0.02,0.8])
+                ax = fig.gca(projection='3d')
                 #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
-                try:
-                    from mpl_toolkits.mplot3d import Axes3D
-                except:
-                    logging.error("PlotPanel could not import Axes3D")
-                ax =  Axes3D(self.subplot.figure)
-                if len(X) > 60:
-                    ax.cla()
-                cbax = None
+                if PLOT_3D_ON:
+                    ax =  Axes3D(self.subplot.figure)
+                    if len(X) > 60:
+                        ax.cla()
+                    cbax = None
+                else:
+                    raise
             
             im = ax.plot_surface(X, Y, output, rstride=1, cstride=1, cmap=cmap,