Changeset 9ea4577e in sasview

Timestamp:

Feb 14, 2012 9:51:13 AM (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:

091c702

Parents:

3d293917

Message:

revert main 3d from weeks ago

Files:

• plottools/src/danse/common/plottools/PlotPanel.py (modified) (1 diff)
• sansguiframe/src/sans/guiframe/data_panel.py (modified) (1 diff)

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

@@ -1502 +1502 @@
             try:
                 # mpl >= 1.0.0
-                fig = self.subplot.figure
-                cbax = fig.add_axes([0.84,0.1,0.02,0.8])
-                ax = fig.gca(projection='3d')
+                ax = self.subplot.figure.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:
-                    # mpl < 1.0.0
-                    from mpl_toolkits.mplot3d  import Axes3D
-                    #Todo: Find out why another clear need here
-                    self.subplot.figure.clear()
-                    ax =  Axes3D(self.subplot.figure)
-                    if len(X) > 60:
-                        ax.cla()
-                    cbax = None
+                    from mpl_toolkits.mplot3d import Axes3D
                 except:
-                    raise
-            
+                    logging.error("PlotPanel could not import Axes3D")
+                self.subplot.figure.clear()
+                ax =  Axes3D(self.subplot.figure)
+                if len(X) > 60:
+                    ax.cla()
+                cbax = None
+
             im = ax.plot_surface(X, Y, output, rstride=1, cstride=1, cmap=cmap,
                                    linewidth=0, antialiased=False)

sansguiframe/src/sans/guiframe/data_panel.py

@@ -482 +482 @@
         self.data_menu.Append(self.plot3d_id, name, msg)
         wx.EVT_MENU(self, self.plot3d_id, self.on_plot_3d)
-        if IS_MAC:
-            if sys.maxsize > 2**32:
-                self.data_menu.Enable(self.self.plot3d_id, False)
+            
         self.editmask_id = wx.NewId()
         name = "Edit Mask"