Makes 3D labelpads behave more like 2D ones

jbbrokaw · jbbrokaw · commit 6412735e772c · 2014-11-17T14:59:39.000-08:00
diff --git a/lib/mpl_toolkits/mplot3d/axis3d.py b/lib/mpl_toolkits/mplot3d/axis3d.py
@@ -70,6 +70,11 @@ class Axis(maxis.XAxis):
             'color': (0.925, 0.925, 0.925, 0.5)},
     }
 
+    # Factors for converting 2D labelpad properties to 3D
+    # Determined by trial and error
+    _DELTAS_PER_POINT = 0.05
+    _DEFAULT_LABEL_OFFSET = 1.35  # In deltas
+
     def __init__(self, adir, v_intervalx, d_intervalx, axes, *args, **kwargs):
         # adir identifies which axes this is
         self.adir = adir
@@ -94,8 +99,6 @@ def __init__(self, adir, v_intervalx, d_intervalx, axes, *args, **kwargs):
 
         maxis.XAxis.__init__(self, axes, *args, **kwargs)
 
-        self.labelpad = 1.6
-
         self.set_rotate_label(kwargs.get('rotate_label', None))
 
 
@@ -266,7 +269,8 @@ def draw(self, renderer):
 
         lxyz = 0.5*(edgep1 + edgep2)
 
-        labeldeltas = self.labelpad * deltas
+        labeldeltas = (self.labelpad * self._DELTAS_PER_POINT +
+                       self._DEFAULT_LABEL_OFFSET) * deltas
         axmask = [True, True, True]
         axmask[index] = False
         lxyz = move_from_center(lxyz, centers, labeldeltas, axmask)
diff --git a/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_labelpad.png b/lib/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_labelpad.png
diff --git a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py
@@ -236,16 +236,21 @@ def test_quiver3d_pivot_tail():
 
 @image_comparison(baseline_images=['axes3d_labelpad'], extensions=['png'])
 def test_axes3d_labelpad():
+    from nose.tools import assert_equal
+    from matplotlib import rcParams
+
     fig = plt.figure()
     ax = Axes3D(fig)
-
-    # labelpad can be set in constructor
-    ax.set_xlabel('X LABEL', labelpad=1.3)
+    # labelpad respects rcParams
+    assert_equal(ax.xaxis.labelpad, rcParams['axes.labelpad'])
+    # labelpad can be set in set_label
+    ax.set_xlabel('X LABEL', labelpad=3)
+    assert_equal(ax.xaxis.labelpad, 3)
     ax.set_ylabel('Y LABEL')
     ax.set_zlabel('Z LABEL')
     # or manually
-    ax.yaxis.labelpad = 3
-    ax.zaxis.labelpad = -1
+    ax.yaxis.labelpad = 20
+    ax.zaxis.labelpad = -40
 
 
 if __name__ == '__main__':
