Revision: 8014
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8014&view=rev
Author: leejjoon
Date: 2009-12-09 20:29:10 +0000 (Wed, 09 Dec 2009)
Log Message:
-----------
print out more meaningful messages when legend is called with artists that are
not supported
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/legend.py
trunk/matplotlib/lib/matplotlib/offsetbox.py
Modified: trunk/matplotlib/lib/matplotlib/legend.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/legend.py 2009-12-08 02:12:38 UTC (rev
8013)
+++ trunk/matplotlib/lib/matplotlib/legend.py 2009-12-09 20:29:10 UTC (rev
8014)
@@ -432,14 +432,6 @@
)
labelboxes = []
-
- for l in labels:
- textbox = TextArea(l, textprops=label_prop,
- multilinebaseline=True, minimumdescent=True)
- text_list.append(textbox._text)
-
- labelboxes.append(textbox)
-
handleboxes = []
@@ -457,7 +449,8 @@
# default trasnform (eg, Collections), you need to
# manually set their transform to the self.get_transform().
- for handle in handles:
+
+ for handle, lab in zip(handles, labels):
if isinstance(handle, RegularPolyCollection) or \
isinstance(handle, CircleCollection):
npoints = self.scatterpoints
@@ -578,32 +571,47 @@
p.set_clip_path(None)
handle_list.append(p)
else:
+ handle_type = type(handle)
+ warnings.warn("Legend does not support %s\nUse proxy artist
instead.\n\nhttp://matplotlib.sourceforge.net/users/legend_guide.html#using-proxy-artist\n";
% (str(handle_type),))
handle_list.append(None)
- handlebox = DrawingArea(width=self.handlelength*fontsize,
- height=height,
- xdescent=0., ydescent=descent)
+
handle = handle_list[-1]
- handlebox.add_artist(handle)
- if hasattr(handle, "_legmarker"):
- handlebox.add_artist(handle._legmarker)
- handleboxes.append(handlebox)
+ if handle is not None: # handle is None is the artist is not
supproted
+ textbox = TextArea(lab, textprops=label_prop,
+ multilinebaseline=True, minimumdescent=True)
+ text_list.append(textbox._text)
+
+ labelboxes.append(textbox)
+ handlebox = DrawingArea(width=self.handlelength*fontsize,
+ height=height,
+ xdescent=0., ydescent=descent)
- # We calculate number of lows in each column. The first
- # (num_largecol) columns will have (nrows+1) rows, and remaing
- # (num_smallcol) columns will have (nrows) rows.
- ncol = min(self._ncol, len(handleboxes))
- nrows, num_largecol = divmod(len(handleboxes), ncol)
- num_smallcol = ncol-num_largecol
+ handlebox.add_artist(handle)
+ if hasattr(handle, "_legmarker"):
+ handlebox.add_artist(handle._legmarker)
+ handleboxes.append(handlebox)
- # starting index of each column and number of rows in it.
- largecol = safezip(range(0, num_largecol*(nrows+1), (nrows+1)),
- [nrows+1] * num_largecol)
- smallcol = safezip(range(num_largecol*(nrows+1), len(handleboxes),
nrows),
- [nrows] * num_smallcol)
+ if len(handleboxes) > 0:
+
+ # We calculate number of lows in each column. The first
+ # (num_largecol) columns will have (nrows+1) rows, and remaing
+ # (num_smallcol) columns will have (nrows) rows.
+ ncol = min(self._ncol, len(handleboxes))
+ nrows, num_largecol = divmod(len(handleboxes), ncol)
+ num_smallcol = ncol-num_largecol
+
+ # starting index of each column and number of rows in it.
+ largecol = safezip(range(0, num_largecol*(nrows+1), (nrows+1)),
+ [nrows+1] * num_largecol)
+ smallcol = safezip(range(num_largecol*(nrows+1), len(handleboxes),
nrows),
+ [nrows] * num_smallcol)
+ else:
+ largecol, smallcol = [], []
+
handle_label = safezip(handleboxes, labelboxes)
columnbox = []
for i0, di in largecol+smallcol:
Modified: trunk/matplotlib/lib/matplotlib/offsetbox.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/offsetbox.py 2009-12-08 02:12:38 UTC
(rev 8013)
+++ trunk/matplotlib/lib/matplotlib/offsetbox.py 2009-12-09 20:29:10 UTC
(rev 8014)
@@ -375,6 +375,9 @@
whd_list = [c.get_extent(renderer) for c in
self.get_visible_children()]
+ if not whd_list:
+ return 2*pad, 2*pad, pad, pad, []
+
if self.height is None:
height_descent = max([h-yd for w,h,xd,yd in whd_list])
ydescent = max([yd for w,h,xd,yd in whd_list])
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Return on Information:
Google Enterprise Search pays you back
Get the facts.
http://p.sf.net/sfu/google-dev2dev
_______________________________________________
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
