rename flag to proj_type, update tests

txxia · txxia · commit 6025b0d8a292 · 2017-04-01T16:40:01.000-04:00
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -63,7 +63,7 @@ def __init__(self, fig, rect=None, *args, **kwargs):
           *elev*             Elevation viewing angle (default 30)
           *zscale*           [%(scale)s]
           *sharez*           Other axes to share z-limits with
-          *proj*             'persp' or 'ortho' (default 'persp')
+          *proj_type*        'persp' or 'ortho' (default 'persp')
           ================   =========================================
 
         .. versionadded :: 1.2.1
@@ -79,7 +79,7 @@ def __init__(self, fig, rect=None, *args, **kwargs):
         self.initial_elev = kwargs.pop('elev', 30)
         zscale = kwargs.pop('zscale', None)
         sharez = kwargs.pop('sharez', None)
-        self.set_proj(kwargs.pop('projection', 'persp'))
+        self.set_proj_type(kwargs.pop('proj_type', 'persp'))
 
         self.xy_viewLim = unit_bbox()
         self.zz_viewLim = unit_bbox()
@@ -263,7 +263,7 @@ def draw(self, renderer):
             self.apply_aspect()
 
         # add the projection matrix to the renderer
-        self.M = self.get_proj_matrix()
+        self.M = self.get_proj()
         renderer.M = self.M
         renderer.vvec = self.vvec
         renderer.eye = self.eye
@@ -961,9 +961,15 @@ def view_init(self, elev=None, azim=None):
         else:
             self.azim = azim
 
-    def set_proj(self, proj):
+    def set_proj_type(self, proj):
         """
-        Set the type of projection.
+        Set the projection type.
+
+        Parameters
+        ----------
+        proj : str
+            Type of projection, accepts 'persp' and 'ortho'.
+
         """
         if proj == 'persp':
             self._projection = proj3d.persp_transformation
@@ -972,7 +978,7 @@ def set_proj(self, proj):
         else:
             raise ValueError("unrecognized projection: %s" % proj)
 
-    def get_proj_matrix(self):
+    def get_proj(self):
         """
         Create the projection matrix from the current viewing position.
 
@@ -1188,7 +1194,7 @@ def _on_move(self, event):
                 return
             self.elev = art3d.norm_angle(self.elev - (dy/h)*180)
             self.azim = art3d.norm_angle(self.azim - (dx/w)*180)
-            self.get_proj_matrix()
+            self.get_proj()
             self.figure.canvas.draw_idle()
 
 #        elif self.button_pressed == 2:
@@ -1209,7 +1215,7 @@ def _on_move(self, event):
             self.set_xlim3d(minx - dx, maxx + dx)
             self.set_ylim3d(miny - dy, maxy + dy)
             self.set_zlim3d(minz - dz, maxz + dz)
-            self.get_proj_matrix()
+            self.get_proj()
             self.figure.canvas.draw_idle()
 
     def set_zlabel(self, zlabel, fontdict=None, labelpad=None, **kwargs):
diff --git a/lib/mpl_toolkits/mplot3d/proj3d.py b/lib/mpl_toolkits/mplot3d/proj3d.py
@@ -125,6 +125,7 @@ def persp_transformation(zfront, zback):
                      ])
 
 def ortho_transformation(zfront, zback):
+    # note: w component in the resulting vector will be (zback-zfront), not 1
     a = -(zfront + zback)
     b = -(zfront - zback)
     return np.array([[2,0,0,0],
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/proj3d_axes_cube_ortho.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/proj3d_axes_cube_ortho.png
diff --git a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py
@@ -439,25 +439,29 @@ def test_proj_axes_cube():
 @image_comparison(baseline_images=['proj3d_axes_cube_ortho'],
                   extensions=['png'], remove_text=True, style='default')
 def test_proj_axes_cube_ortho():
-    M = _test_proj_make_M(proj='ortho')
+    E = np.array([200, 100, 100])
+    R = np.array([0, 0, 0])
+    V = np.array([0, 0, 1])
+    viewM = proj3d.view_transformation(E, R, V)
+    orthoM = proj3d.ortho_transformation(-1, 1)
+    M = np.dot(orthoM, viewM)
 
     ts = '0 1 2 3 0 4 5 6 7 4'.split()
-    xs = np.array([0, 1, 1, 0, 0, 0, 1, 1, 0, 0]) * 300.0
-    ys = np.array([0, 0, 1, 1, 0, 0, 0, 1, 1, 0]) * 300.0
-    zs = np.array([0, 0, 0, 0, 0, 1, 1, 1, 1, 1]) * 300.0
+    xs = np.array([0, 1, 1, 0, 0, 0, 1, 1, 0, 0]) * 100
+    ys = np.array([0, 0, 1, 1, 0, 0, 0, 1, 1, 0]) * 100
+    zs = np.array([0, 0, 0, 0, 0, 1, 1, 1, 1, 1]) * 100
 
     txs, tys, tzs = proj3d.proj_transform(xs, ys, zs, M)
 
-    fig, ax = _test_proj_draw_axes(M, s=400)
+    fig, ax = _test_proj_draw_axes(M, s=150)
 
-    ax.scatter(txs, tys, c=tzs)
+    ax.scatter(txs, tys, s=300-tzs)
     ax.plot(txs, tys, c='r')
     for x, y, t in zip(txs, tys, ts):
         ax.text(x, y, t)
 
-    ax.set_xlim(-5, 5)
-    ax.set_ylim(-5, 5)
-    # assertFalse()
+    ax.set_xlim(-200, 200)
+    ax.set_ylim(-200, 200)
 
 def test_rot():
     V = [1, 0, 0, 1]
@@ -520,4 +524,4 @@ def test_autoscale():
 def test_axes3d_ortho():
     fig = plt.figure()
     ax = fig.gca(projection='3d')
-    ax.set_proj('ortho')
+    ax.set_proj_type('ortho')
