Changeset bef2377 in sasview for plottools/src/danse/common/plottools/PlotPanel.py

Timestamp:

Feb 13, 2012 10:43:16 AM (12 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:

80f56a3

Parents:

d4184e0

Message:

another trial for 3d mac64 fix

File:

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

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

@@ -37 +37 @@
 import copy
 import numpy
-
-PLOT_3D_ON = False
-try:
-    from mpl_toolkits.mplot3d.axes3d  import Axes3D
-    PLOT_3D_ON = True
-except:
-    pass
 
 def show_tree(obj,d=0):
@@ -1515 +1508 @@
                     ax.disable_mouse_rotation()
             except:
-                # mpl < 1.0.0
-                if PLOT_3D_ON:
+                try:
+                    # mpl < 1.0.0
+                    from mpl_toolkits.mplot3d  import Axes3D
                     #Todo: Find out why another clear need here
                     self.subplot.figure.clear()
@@ -1523 +1517 @@
                         ax.cla()
                     cbax = None
-                else:
+                except:
                     raise