added scatter legends from john gill

svn path=/trunk/matplotlib/; revision=1850

Author: jdh2358

CHANGELOG

@@ -1,5 +1,10 @@
 New entries should be added at the top
 
+2005-10-26 Added support for scatter legends - thanks John Gill
+
+2005-10-20 Fixed image clipping bug that made some tex labels
+           disappear.  Closes bug - JDH
+
 2005-10-14 Removed aqrt from dvipng 1.6 alpha channel mask.  Where did
            that come from?
 

TODO

@@ -728,4 +728,9 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 
 -- restore robert leftwich's tutorial link to FAQ
 
--- JPL and NIST screenshots...
+-- JPL and NIST screenshots...
+
+-- John Gill's patch!
+
+-- Fix latex texmanager caching bug that is preventing the cache from
+   recognizing a font change

lib/matplotlib/font_manager.py

@@ -452,6 +452,9 @@ def createFontDict(fontfiles, fontext='ttf'):
             except RuntimeError:
                 warnings.warn("Could not open font file %s"%fpath)
                 continue
+            except UnicodeError:
+                warnings.warn("Cannot handle unicode filenames %s"%fpath)
+                continue
             try: prop = ttfFontProperty(font)
             except: continue
 

lib/matplotlib/legend.py

@@ -31,8 +31,8 @@
 from font_manager import FontProperties
 from lines import Line2D
 from mlab import linspace, segments_intersect
-from patches import Patch, Rectangle, Shadow, bbox_artist, draw_bbox
-from collections import LineCollection
+from patches import Patch, Rectangle, RegularPolygon, Shadow, bbox_artist, draw_bbox
+from collections import LineCollection, RegularPolyCollection, PatchCollection
 from text import Text
 from transforms import Bbox, Point, Value, get_bbox_transform, bbox_all,\
      unit_bbox, inverse_transform_bbox, lbwh_to_bbox
@@ -282,6 +282,18 @@ def _get_handles(self, handles, texts):
                 legline.set_dashes(dashes)
                 ret.append(legline)
 
+            elif isinstance(handle, RegularPolyCollection):
+
+                p = Rectangle(xy=(min(self._xdata), y-3/4*HEIGHT),
+                              width = self.handlelen, height=HEIGHT/2,
+                              )
+                p.set_facecolor(handle._facecolors[0])
+                if handle._edgecolors != 'None':
+                    p.set_edgecolor(handle._edgecolors[0])
+                self._set_artist_props(p)
+                p.set_clip_box(None)
+                ret.append(p)
+
 	    else:
 		ret.append(None)
 
@@ -307,6 +319,7 @@ def get_handles(ax):
             handles = ax.lines
             handles.extend(ax.patches)
             handles.extend([c for c in ax.collections if isinstance(c, LineCollection)])
+
             return handles
 
         ax = self.parent
@@ -411,6 +424,8 @@ def _offset(self, ox, oy):
             elif isinstance(h, Rectangle):
                 h.xy[0] = h.xy[0] + ox
                 h.xy[1] = h.xy[1] + oy
+            elif isinstance(h, RegularPolygon):
+                h.verts = [(x + ox, y + oy) for x, y in h.verts]
 
         x, y = self.legendPatch.get_x(), self.legendPatch.get_y()
         self.legendPatch.set_x(x+ox)