refactor Annotation to support arbitrary transformation.

leejjoon · leejjoon · commit 688a8892c61b · 2010-02-26T00:28:07.000Z
svn path=/trunk/matplotlib/; revision=8157
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+2010-02-25 refactor Annotation to support arbitrary Transform as xycoords 
+           or textcoords. Also, if a tuple of two coordinates is provided, 
+           they are interpreted as coordinates for each x and y position. 
+           -JJL
+
 2010-02-24 Added pyplot.fig_subplot(), to create a figure and a group of
 	   subplots in a single call.  This offers an easier pattern than
 	   manually making figures and calling add_subplot() multiple times. FP
diff --git a/lib/matplotlib/offsetbox.py b/lib/matplotlib/offsetbox.py
@@ -1301,11 +1301,11 @@ def _update_position_xybox(self, renderer, xy_pixel):
         x, y = self.xytext
         if isinstance(self.textcoords, tuple):
             xcoord, ycoord = self.textcoords
-            x1, y1 = self._get_xy(x, y, xcoord)
-            x2, y2 = self._get_xy(x, y, ycoord)
+            x1, y1 = self._get_xy(renderer, x, y, xcoord)
+            x2, y2 = self._get_xy(renderer, x, y, ycoord)
             ox0, oy0 = x1, y2
         else:
-            ox0, oy0 = self._get_xy(x, y, self.textcoords)
+            ox0, oy0 = self._get_xy(renderer, x, y, self.textcoords)
 
         #self.offsetbox.set_bbox_to_anchor((ox0, oy0))
         w, h, xd, yd = self.offsetbox.get_extent(renderer)
@@ -1526,11 +1526,11 @@ def save_offset(self):
         x, y = ann.xytext
         if isinstance(ann.textcoords, tuple):
             xcoord, ycoord = ann.textcoords
-            x1, y1 = ann._get_xy(x, y, xcoord)
-            x2, y2 = ann._get_xy(x, y, ycoord)
+            x1, y1 = ann._get_xy(self.canvas.renderer, x, y, xcoord)
+            x2, y2 = ann._get_xy(self.canvas.renderer, x, y, ycoord)
             ox0, oy0 = x1, y2
         else:
-            ox0, oy0 = ann._get_xy(x, y, ann.textcoords)
+            ox0, oy0 = ann._get_xy(self.canvas.renderer, x, y, ann.textcoords)
 
         self.ox, self.oy = ox0, oy0
         self.annotation.textcoords = "figure pixels"
@@ -1539,7 +1539,7 @@ def update_offset(self, dx, dy):
         ann = self.annotation
         ann.xytext = self.ox + dx, self.oy + dy
         x, y = ann.xytext
-        xy = ann._get_xy(x, y, ann.textcoords)
+        xy = ann._get_xy(self.canvas.renderer, x, y, ann.textcoords)
 
     def finalize_offset(self):
         loc_in_canvas = self.annotation.xytext
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
