Merged revisions 8794 via svnmerge from

WeatherGod · WeatherGod · commit 470e59554dc4 · 2010-11-12T16:17:37.000Z
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint ........ r8794 | weathergod | 2010-11-12 10:10:21 -0600 (Fri, 12 Nov 2010) | 2 lines Fixed a bug in axis3d.py which caused axis labels to not be centered along the axis as well as correctly calculating the rotation angle needed to keep the axis label parallel to the axis irrespectively of the plot's aspect ratio. ........ svn path=/trunk/matplotlib/; revision=8795
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+2010-11-12 Fixed the placement and angle of axis labels in 3D plots. - BVR
+
 2010-11-07 New rc parameters examples.download and examples.directory
            allow bypassing the download mechanism in get_sample_data. 
            - JKS
diff --git a/lib/mpl_toolkits/mplot3d/axis3d.py b/lib/mpl_toolkits/mplot3d/axis3d.py
@@ -96,6 +96,7 @@ def init3d(self):
         self.gridlines = art3d.Line3DCollection([], )
         self.axes._set_artist_props(self.gridlines)
         self.axes._set_artist_props(self.label)
+        # Need to be able to place the label at the correct location
         self.label._transform = self.axes.transData
 
     def get_tick_positions(self):
@@ -215,20 +216,31 @@ def draw(self, renderer):
             xyz0.append(coord)
 
         # Draw labels
-        dy = pep[1][1] - pep[1][0]
-        dx = pep[0][1] - pep[0][0]
+        peparray = np.asanyarray(pep)
+        # The transAxes transform is used because the Text object
+        # rotates the text relative to the display coordinate system.
+        # Therefore, if we want the labels to remain parallel to the
+        # axis regardless of the aspect ratio, we need to convert the
+        # edge points of the plane to display coordinates and calculate
+        # an angle from that.
+        # TODO: Maybe Text objects should handle this themselves?
+        dx, dy = (self.axes.transAxes.transform(peparray[0:2, 1]) - 
+                  self.axes.transAxes.transform(peparray[0:2, 0]))
 
         lxyz = 0.5*(edgep1 + edgep2)
 
         labeldeltas = 1.3 * deltas
-        lxyz = move_from_center(lxyz, centers, labeldeltas)
+        axmask = [True, True, True]
+        axmask[index] = False
+        lxyz = move_from_center(lxyz, centers, labeldeltas, axmask)
         tlx, tly, tlz = proj3d.proj_transform(lxyz[0], lxyz[1], lxyz[2], \
                 renderer.M)
         self.label.set_position((tlx, tly))
         if self.get_rotate_label(self.label.get_text()):
             angle = art3d.norm_text_angle(math.degrees(math.atan2(dy, dx)))
             self.label.set_rotation(angle)
         self.label.set_va('center')
+        self.label.set_ha('center')
         self.label.draw(renderer)
 
         if len(xyz0) > 0:

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+2010-11-12 Fixed the placement and angle of axis labels in 3D plots. - BVR`
	`2`	`+`
`1`	`3`	`2010-11-07 New rc parameters examples.download and examples.directory`
`2`	`4`	`allow bypassing the download mechanism in get_sample_data.`
`3`	`5`	`- JKS`