matplotlib
diff --git a/‎lib/mpl_toolkits/mplot3d/axes3d.py‎
Lines changed: 12 additions & 13 deletions b/‎lib/mpl_toolkits/mplot3d/axes3d.py‎
Lines changed: 12 additions & 13 deletions
diff --git a/‎…ages/test_mplot3d/axes3d_persp_false.pdf‎ ‎…ine_images/test_mplot3d/axes3d_ortho.pdf‎lib/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_persp_false.pdf renamed to lib/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_ortho.pdf
7.06 KB b/‎…ages/test_mplot3d/axes3d_persp_false.pdf‎ ‎…ine_images/test_mplot3d/axes3d_ortho.pdf‎lib/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_persp_false.pdf renamed to lib/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_ortho.pdf
7.06 KB
diff --git a/‎lib/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_ortho.png‎
46.7 KB b/‎lib/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_ortho.png‎
46.7 KB
@@ -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
-          *persp*            Perspective projection (default True)
+          *proj*             '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_persp(kwargs.pop('persp', True))
+        self.set_proj(kwargs.pop('projection', '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()
+        self.M = self.get_proj_matrix()
         renderer.M = self.M
         renderer.vvec = self.vvec
         renderer.eye = self.eye
@@ -961,19 +961,18 @@ def view_init(self, elev=None, azim=None):
         else:
             self.azim = azim
 
-    def set_persp(self, persp):
+    def set_proj(self, proj):
         """
-        Set whether the projection should be perspective.
-
-        If set to *False*, orthographic projection will be used.
-
+        Set the type of projection.
         """
-        if persp:
+        if proj == 'persp':
             self._projection = proj3d.persp_transformation
-        else:
+        elif proj == 'ortho':
             self._projection = proj3d.ortho_transformation
+        else:
+            raise ValueError("unrecognized projection: %s" % proj)
 
-    def get_proj(self):
+    def get_proj_matrix(self):
         """
         Create the projection matrix from the current viewing position.
 
@@ -1189,7 +1188,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()
+            self.get_proj_matrix()
             self.figure.canvas.draw_idle()
 
 #        elif self.button_pressed == 2:
@@ -1210,7 +1209,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()
+            self.get_proj_matrix()
             self.figure.canvas.draw_idle()
 
     def set_zlabel(self, zlabel, fontdict=None, labelpad=None, **kwargs):