finished event picker

jdh2358 · jdh2358 · commit a59743d849cf · 2004-12-30T17:50:53.000Z
svn path=/trunk/matplotlib/; revision=846
diff --git a/examples/object_picker.py b/examples/object_picker.py
@@ -1,5 +1,8 @@
 #!/usr/bin/env python
 """
+As of matplotlib-0.70, there is GUI neutral object picking.  See for
+example the picker_demo.py.
+
 Show how to use the mouse to select objects and a build dialog to set
 line properties.  The approach here can be readily extended to include
 all artists and properties.  Volunteers welcome!
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -3141,20 +3141,20 @@ def dist_x_y(p1, x, y):
         
         def dist(a):
             if isinstance(a, Text):
-                xa, ya = a.get_position()
-                p = a.get_transform().xy_tup((xa,ya))
-                return dist_points( xywin, p)
+                bbox = a.get_window_extent()
+                l,b,w,h = bbox.get_bounds()
+                verts = (l,b), (l,b+h), (l+w,b+h), (l+w, b)
+                xt, yt = zip(*verts)                
             elif isinstance(a, Patch):
                 verts = a.get_verts()
                 tverts = a.get_transform().seq_xy_tups(verts)
-                x, y = zip(*tverts)
-                return dist_x_y(xywin, array(x), array(y))
+                xt, yt = zip(*tverts)                
             elif isinstance(a, Line2D):
                 xdata = a.get_xdata()
                 ydata = a.get_ydata()
                 xt, yt = a.get_transform().numerix_x_y(xdata, ydata)
-                return dist_x_y(xywin, xt, yt)
 
+            return dist_x_y(xywin, asarray(xt), asarray(yt))
             
         artists = self.lines + self.patches + self.texts
         if not len(artists): return None
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -59,7 +59,7 @@ def __init__(self,
         self._rotation = rotation
         self._fontproperties = fontproperties
         self._bbox = None
-        
+        self._renderer = None        
     def _get_multialignment(self):
         if self._multialignment is not None: return self._multialignment
         else: return self._horizontalalignment
@@ -209,6 +209,8 @@ def set_bbox(self, rectprops):
     def draw(self, renderer):
         if not self.get_visible(): return 
         if self._text=='': return
+        if renderer is not None:
+            self._renderer = renderer
 
         gc = renderer.new_gc()
         gc.set_foreground(self._color)
@@ -315,8 +317,12 @@ def get_verticalalignment(self):
         "Return the vertical alignment as string"
         return self._verticalalignment
 
-    def get_window_extent(self, renderer):
-        bbox, info = self._get_layout(renderer)
+    def get_window_extent(self, renderer=None):
+        if renderer is not None:
+            self._renderer = renderer
+        if self._renderer is None:
+            raise RuntimeError('Cannot get window extent w/o renderer')
+        bbox, info = self._get_layout(self._renderer)
         return bbox
 
             
