starting to fix up 3d modules

cmoad · cmoad · commit 2fb1f363f20d · 2006-06-21T22:04:01.000Z
svn path=/trunk/matplotlib/; revision=2505
diff --git a/examples/embedding_in_wx.py b/examples/embedding_in_wx.py
@@ -62,7 +62,7 @@ def __init__(self):
         # you don't need this under Linux
         tw, th = self.toolbar.GetSizeTuple()
         fw, fh = self.canvas.GetSizeTuple()
-       self.toolbar.SetSize(wxSize(fw, th))
+        self.toolbar.SetSize(wxSize(fw, th))
 
         # Create a figure manager to manage things
         self.figmgr = FigureManager(self.canvas, 1, self)
diff --git a/examples/simple3d_oo.py b/examples/simple3d_oo.py
@@ -0,0 +1,43 @@
+#!/usr/bin/env python
+
+import matplotlib
+matplotlib.use('WXAgg')
+matplotlib.rcParams['numerix'] = 'numarray'
+
+from wxPython.wx import *
+import matplotlib.axes3d
+from matplotlib.figure import Figure
+from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg, FigureManager, NavigationToolbar2WxAgg
+
+class PlotFigure(wxFrame):
+    def __init__(self):
+        wxFrame.__init__(self, None, -1, "Test embedded wxFigure")
+        
+        self.fig = Figure((9,8), 75)
+        self.canvas = FigureCanvasWxAgg(self, -1, self.fig)
+        self.toolbar = NavigationToolbar2WxAgg(self.canvas)
+        self.toolbar.Realize()
+        
+        self.figmgr = FigureManager(self.canvas, 1, self)
+        tw, th = self.toolbar.GetSizeTuple()
+        fw, fh = self.canvas.GetSizeTuple()
+        self.toolbar.SetSize(wxSize(fw, th))
+        sizer = wxBoxSizer(wxVERTICAL)
+        
+        # This way of adding to sizer allows resizing
+        sizer.Add(self.canvas, 1, wxLEFT|wxTOP|wxGROW)
+        sizer.Add(self.toolbar, 0, wxGROW)
+        self.SetSizer(sizer)
+        self.Fit()
+        
+        self.plot3d()
+        
+    def plot3d(self):
+        ax3d = matplotlib.axes3d.Axes3D(self.fig)
+        plt = self.fig.axes.append(ax3d)
+        
+if __name__ == '__main__':
+    app = wxPySimpleApp(0)
+    frame = PlotFigure()
+    frame.Show()
+    app.MainLoop()
diff --git a/lib/matplotlib/axes3d.py b/lib/matplotlib/axes3d.py
@@ -19,6 +19,7 @@
 import cbook
 from transforms import unit_bbox
 
+import figure
 import numerix as nx
 from colors import normalize
 
@@ -56,8 +57,8 @@ class Axes3DI(Axes):
     """
     def __init__(self, fig=None, rect=[0.0, 0.0, 1.0, 1.0], *args, **kwargs):
         #
-        fig = fig or pylab.gcf()
-
+        self.fig = fig or figure.Figure()
+        
         azim = cbook.popd(kwargs, 'azim', -60)
         elev = cbook.popd(kwargs, 'elev', 30)
 
@@ -70,12 +71,12 @@ def __init__(self, fig=None, rect=[0.0, 0.0, 1.0, 1.0], *args, **kwargs):
         # inihibit autoscale_view until the axises are defined
         # they can't be defined until Axes.__init__ has been called
         self._ready = 0
-        Axes.__init__(self, fig, rect,
+        Axes.__init__(self, self.fig, rect,
                       frameon=True, 
                       xticks=[], yticks=[], *args, **kwargs)
         #
-        figmanager = pylab.get_current_fig_manager()
-        self.toolbar = figmanager.toolbar
+#        figmanager = pylab.get_current_fig_manager()
+#        self.toolbar = figmanager.toolbar
         #
         # 
         # self.toolbar._active is current zoom/pan mode
@@ -85,14 +86,14 @@ def __init__(self, fig=None, rect=[0.0, 0.0, 1.0, 1.0], *args, **kwargs):
         self._ready = 1
 
         self.view_init(elev, azim)
-        self.mouse_init()
+        #self.mouse_init()
         self.create_axes()
         self.set_top_view()
 
         #self.axesPatch.set_edgecolor((1,0,0,0))
         self.axesPatch.set_linewidth(0)
         #self.axesPatch.set_facecolor((0,0,0,0))
-        fig.add_axes(self)
+        self.fig.add_axes(self)
 
 
     def set_top_view(self):
@@ -148,7 +149,8 @@ def unit_cube(self,vals=None):
         return zip(xs,ys,zs)
 
     def tunit_cube(self,vals=None,M=None):
-        M = M or self.M
+        if M is None:
+            M = self.M
         xyzs = self.unit_cube(vals)
         tcube = proj3d.proj_points(xyzs,M)
         return tcube
diff --git a/lib/matplotlib/axis3d.py b/lib/matplotlib/axis3d.py
@@ -153,7 +153,7 @@ def get_major_ticks(self):
             def update_coords(renderer,self=t.label1):
                 return text_update_coords(self, renderer)
             # Text overrides setattr so need this to force new method
-            t.label1.__dict__['update_coords'] = update_coords
+            #t.label1.__dict__['update_coords'] = update_coords
             t.tick1line.set_transform(self.axes.transData)
             t.tick2line.set_transform(self.axes.transData)
             t.gridline.set_transform(self.axes.transData)
diff --git a/lib/matplotlib/proj3d.py b/lib/matplotlib/proj3d.py
@@ -9,6 +9,7 @@
 from collections import LineCollection
 from patches import Circle
 import numerix as nx
+from numerix import linear_algebra
 from math import sqrt
 
 dot = nx.dot
@@ -18,14 +19,15 @@ def _hide_dot(a,b):
     """
     return a[0]*b[0]+a[1]*b[1]+a[2]*b[2]
 
-cross = nx.cross
+#cross = nx.cross
 def _hide_cross(a,b):
     """
     Cross product of two vectors
     A x B = <Ay*Bz - Az*By, Az*Bx - Ax*Bz, Ax*By - Ay*Bx>
     a x b = [a2b3 - a3b2, a3b1 - a1b3, a1b2 - a2b1]
     """
     return nx.array([a[1]*b[2]-a[2]*b[1],a[2]*b[0]-a[0]*b[2],a[0]*b[1] - a[1]*b[0]])
+cross = _hide_cross
 
 
 def test_dot():
@@ -215,7 +217,7 @@ def proj_transform_vec_clip(vec, M):
     return txs,tys,tzs,tis
 
 def inv_transform(xs,ys,zs,M):
-    iM = nx.linalg.inv(M)
+    iM = linear_algebra.inverse(M)
     vec = vec_pad_ones(xs,ys,zs)
     vecr = nx.matrixmultiply(iM,vec)
     try:
