mplot3d: fix axes juggle issue, fix ticks on end of axes range

heeres · heeres · commit 9a445724a486 · 2009-12-20T08:03:40.000Z
svn path=/trunk/matplotlib/; revision=8041
diff --git a/examples/mplot3d/polys3d_demo.py b/examples/mplot3d/polys3d_demo.py
@@ -22,8 +22,11 @@
 poly.set_alpha(0.7)
 ax.add_collection3d(poly, zs=zs, zdir='y')
 
+ax.set_xlabel('X')
 ax.set_xlim3d(0, 10)
+ax.set_ylabel('Y')
 ax.set_ylim3d(-1, 4)
+ax.set_zlabel('Z')
 ax.set_zlim3d(0, 1)
 
 plt.show()
diff --git a/examples/mplot3d/surface3d_demo3.py b/examples/mplot3d/surface3d_demo3.py
@@ -23,8 +23,8 @@
 surf = ax.plot_surface(X, Y, Z, rstride=1, cstride=1, facecolors=colors,
         linewidth=0, antialiased=False)
 
-ax.set_zlim3d(-1.01, 1.01)
-ax.w_zaxis.set_major_locator(LinearLocator(10))
+ax.set_zlim3d(-1, 1)
+ax.w_zaxis.set_major_locator(LinearLocator(6))
 ax.w_zaxis.set_major_formatter(FormatStrFormatter('%.03f'))
 
 plt.show()
diff --git a/lib/mpl_toolkits/mplot3d/art3d.py b/lib/mpl_toolkits/mplot3d/art3d.py
@@ -434,7 +434,24 @@ def poly_collection_2d_to_3d(col, zs=0, zdir='z'):
 
 def juggle_axes(xs, ys, zs, zdir):
     """
-    Reorder coordinates so that zdir
+    Reorder coordinates so that 2D xs, ys can be plotted in the plane
+    orthogonal to zdir. zdir is normally x, y or z. However, if zdir
+    starts with a '-' it is interpreted as a compensation for rotate_axes.
+    """
+    if zdir == 'x':
+        return zs, xs, ys
+    elif zdir == 'y':
+        return xs, zs, ys
+    elif zdir[0] == '-':
+        return rotate_axes(xs, ys, zs, zdir)
+    else:
+        return xs, ys, zs
+
+def rotate_axes(xs, ys, zs, zdir):
+    """
+    Reorder coordinates so that the axes are rotated with zdir along
+    the original z axis. Prepending the axis with a '-' does the
+    inverse transform, so zdir can be x, -x, y, -y, z or -z
     """
     if zdir == 'x':
         return ys, zs, xs
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -857,7 +857,7 @@ def contour(self, X, Y, Z, levels=10, **kwargs):
 
         had_data = self.has_data()
 
-        jX, jY, jZ = art3d.juggle_axes(X, Y, Z, zdir)
+        jX, jY, jZ = art3d.rotate_axes(X, Y, Z, zdir)
         cset = Axes.contour(self, jX, jY, jZ, **kwargs)
 
         zdir = '-' + zdir
diff --git a/lib/mpl_toolkits/mplot3d/axis3d.py b/lib/mpl_toolkits/mplot3d/axis3d.py
@@ -180,7 +180,7 @@ def draw(self, renderer):
         # filter locations here so that no extra grid lines are drawn
         interval = self.get_view_interval()
         majorLocs = [loc for loc in majorLocs if \
-                interval[0] < loc < interval[1]]
+                interval[0] <= loc <= interval[1]]
         self.major.formatter.set_locs(majorLocs)
         majorLabels = [self.major.formatter(val, i)
                        for i, val in enumerate(majorLocs)]
