added Nick's picker patch

jdh2358 · jdh2358 · commit c1797590e859 · 2005-06-06T19:41:22.000Z
svn path=/trunk/matplotlib/; revision=1431
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -142,7 +142,7 @@
 """
 from __future__ import generators
 
-__version__  = '0.81rc1'
+__version__  = '0.81'
 __revision__ = '$Revision$'
 __date__     = '$Date$'
 
@@ -578,7 +578,7 @@ def validate_tex_engine(s):
     'ps.papersize'      : [ 'letter', validate_ps_papersize], # Set the papersize/type
     'ps.useafm'   : [ False, validate_bool],  # Set PYTHONINSPECT
     'ps.usedistiller'   : [ False, validate_bool],  # use ghostscript to distill ps output
-    'ps.distiller.res'  : [600, validate_int],       # dpi
+    'ps.distiller.res'  : [6000, validate_int],       # dpi
     'plugins.directory' : ['.matplotlib_plugins', str], # where plugin directory is locate
 
     }
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -3621,7 +3621,7 @@ def dist(a):
             return dist_x_y(xywin, asarray(xt), asarray(yt))
 
         artists = self.lines + self.patches + self.texts
-        if callable(among):
+        if among is not None and callable(among):
             artists = filter(test, artists)
         elif iterable(among):
             amongd = dict([(k,1) for k in among])
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -215,8 +215,10 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath):
             font.set_text(s, angle)
         font.draw_glyphs_to_bitmap()
 
+        #print x, y, int(x), int(y)
+        
         self._renderer.draw_text(font, int(x), int(y), gc)
-
+        
 
     def get_text_width_height(self, s, prop, ismath, rgb=(0,0,0)):
         """
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -1460,10 +1460,17 @@ RendererAgg::draw_text(const Py::Tuple& args) {
   
   
   FT2Font *font = static_cast<FT2Font*>(args[0].ptr());
-  
-  int x = Py::Int( args[1] );
-  int y = Py::Int( args[2] );
-  
+
+  int x(0),y(0);
+  try {
+    x = Py::Int( args[1] );
+    y = Py::Int( args[2] );
+  }
+  catch (Py::TypeError) {
+    //x,y out of range; todo issue warning?
+    return Py::Object();
+  }
+   
   GCAgg gc = GCAgg(args[3], dpi);
   
   set_clipbox_rasterizer( gc.cliprect);
