Merged revisions 6658 via svnmerge from

leejjoon · leejjoon · commit 2e4d4bd19e51 · 2008-12-18T09:02:11.000Z
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_98_5_maint ........ r6658 | leejjoon | 2008-12-18 03:55:50 -0500 (Thu, 18 Dec 2008) | 1 line fix dpi-dependent behavior of text bbox & annotate arrow ........ svn path=/trunk/matplotlib/; revision=6659
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2008-12-17 fix dpi-dependent behavior of text bbox and arrow in annotate
+            -JJL
+
 2008-12-17 Add group id support in artist. Two examples which
            demostrate svg filter are added. -JJL
 
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -367,7 +367,8 @@ def get_bbox_patch(self):
 
 
     def update_bbox_position_size(self, renderer):
-        """ Update the location and the size of the bbox. This method
+        """
+        Update the location and the size of the bbox. This method
         should be used when the position and size of the bbox needs to
         be updated before actually drawing the bbox.
         """
@@ -395,8 +396,8 @@ def update_bbox_position_size(self, renderer):
             tr = mtransforms.Affine2D().rotate(theta)
             tr = tr.translate(posx+x_box, posy+y_box)
             self._bbox_patch.set_transform(tr)
-            fontsize = renderer.points_to_pixels(self.get_size())
-            self._bbox_patch.set_mutation_scale(fontsize)
+            fontsize_in_pixel = renderer.points_to_pixels(self.get_size())
+            self._bbox_patch.set_mutation_scale(fontsize_in_pixel)
             #self._bbox_patch.draw(renderer)
 
         else:
@@ -434,7 +435,8 @@ def _draw_bbox(self, renderer, posx, posy):
         tr = mtransforms.Affine2D().rotate(theta)
         tr = tr.translate(posx+x_box, posy+y_box)
         self._bbox_patch.set_transform(tr)
-        self._bbox_patch.set_mutation_scale(self.get_size())
+        fontsize_in_pixel = renderer.points_to_pixels(self.get_size())
+        self._bbox_patch.set_mutation_scale(fontsize_in_pixel)
         self._bbox_patch.draw(renderer)
 
 
@@ -1563,6 +1565,7 @@ def update_positions(self, renderer):
 
                 self.arrow_patch.set_positions((ox0, oy0), (ox1,oy1))
                 mutation_scale = d.pop("mutation_scale", self.get_size())
+                mutation_scale = renderer.points_to_pixels(mutation_scale)
                 self.arrow_patch.set_mutation_scale(mutation_scale)
 
                 if self._bbox_patch:
