Merge pull request #1 from mdboom/min-exponent

zblz · web-flow · commit 8ac194ee5e32 · 2016-08-02T21:09:47.000+01:00
Fix text alignment
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -1098,6 +1098,9 @@ def get_tick_padding(self):
             return max(values)
         return 0.0
 
+    def _adjust_ticks(self, renderer, ticks_to_draw):
+        pass
+
     @allow_rasterization
     def draw(self, renderer, *args, **kwargs):
         'Draw the axis lines, grid lines, tick lines and labels'
@@ -1110,6 +1113,8 @@ def draw(self, renderer, *args, **kwargs):
         ticklabelBoxes, ticklabelBoxes2 = self._get_tick_bboxes(ticks_to_draw,
                                                                 renderer)
 
+        self._adjust_ticks(renderer, ticks_to_draw)
+
         for tick in ticks_to_draw:
             tick.draw(renderer)
 
@@ -1680,6 +1685,20 @@ class XAxis(Axis):
     __name__ = 'xaxis'
     axis_name = 'x'
 
+    def _adjust_ticks(self, renderer, ticks_to_draw):
+        heights = []
+        for tick in ticks_to_draw:
+            label1 = tick.label1
+            text = label1.get_text()
+            is_math = label1.is_math_text(text)
+            _, h, _ = renderer.get_text_width_height_descent(
+                text, label1.get_fontproperties(), is_math)
+            heights.append(h)
+        max_height = max(heights)
+
+        for tick, h in zip(ticks_to_draw, heights):
+            tick.label1.set_offset((0, max_height - h))
+
     def contains(self, mouseevent):
         """Test whether the mouse event occured in the x axis.
         """
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -233,6 +233,7 @@ def __init__(self,
             linespacing = 1.2   # Maybe use rcParam later.
         self._linespacing = linespacing
         self.set_rotation_mode(rotation_mode)
+        self._offset = (0, 0)
         self.update(kwargs)
 
     def update(self, kwargs):
@@ -773,12 +774,13 @@ def draw(self, renderer):
             textobj._set_gc_clip(gc)
 
             angle = textobj.get_rotation()
+            ox, oy = self._offset
 
             for line, wh, x, y in info:
 
                 mtext = textobj if len(info) == 1 else None
-                x = x + posx
-                y = y + posy
+                x = x + posx + ox
+                y = y + posy - oy
                 if renderer.flipy():
                     y = canvash - y
                 clean_line, ismath = textobj.is_math_text(line)
@@ -803,6 +805,13 @@ def draw(self, renderer):
         renderer.close_group('text')
         self.stale = False
 
+    def set_offset(self, offset):
+        """
+        Set extra offset (in pixel space) to be applied immediately
+        before drawing the text.
+        """
+        self._offset = offset
+
     def get_color(self):
         "Return the color of the text"
         return self._color
