Simplified internal code of _auto_legend_data

NNemec · NNemec · commit e8f4297ca668 · 2007-06-07T09:21:09.000Z
svn path=/trunk/matplotlib/; revision=3370
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+2007-06-07 Simplified internal code of _auto_legend_data - NN
+
 2007-06-04 Added labeldistance arg to Axes.pie to control the raidal
            distance of the wedge labels - JDH
 
diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py
@@ -313,46 +313,40 @@ def _auto_legend_data(self):
         if not self.isaxes:
             raise Exception, 'Auto legends not available for figure legends.'
 
-        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
-        handles = get_handles(ax)
         vertices = []
         bboxes = []
         lines = []
 
         inv = ax.transAxes.inverse_xy_tup
-        for handle in handles:
 
-            if isinstance(handle, Line2D):
+        for handle in ax.lines:
+            assert isinstance(handle, Line2D)
 
-                xdata = handle.get_xdata(orig=False)
-                ydata = handle.get_ydata(orig=False)
-                trans = handle.get_transform()
-                xt, yt = trans.numerix_x_y(xdata, ydata)
+            xdata = handle.get_xdata(orig=False)
+            ydata = handle.get_ydata(orig=False)
+            trans = handle.get_transform()
+            xt, yt = trans.numerix_x_y(xdata, ydata)
 
-                # XXX need a special method in transform to do a list of verts
-                averts = [inv(v) for v in zip(xt, yt)]
-                lines.append(averts)
+            # XXX need a special method in transform to do a list of verts
+            averts = [inv(v) for v in zip(xt, yt)]
+            lines.append(averts)
 
-            elif isinstance(handle, Patch):
+        for handle in ax.patches:
+            assert isinstance(handle, Patch)
 
-                verts = handle.get_verts()
-                trans = handle.get_transform()
-                tverts = trans.seq_xy_tups(verts)
+            verts = handle.get_verts()
+            trans = handle.get_transform()
+            tverts = trans.seq_xy_tups(verts)
 
-                averts = [inv(v) for v in tverts]
+            averts = [inv(v) for v in tverts]
 
-                bbox = unit_bbox()
-                bbox.update(averts, True)
-                bboxes.append(bbox)
+            bbox = unit_bbox()
+            bbox.update(averts, True)
+            bboxes.append(bbox)
 
-            elif isinstance(handle, LineCollection):
+        for handle in ax.collections:
+            if isinstance(handle, LineCollection):
                 hlines = handle.get_lines()
                 trans = handle.get_transform()
                 for line in hlines:

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+2007-06-07 Simplified internal code of _auto_legend_data - NN`
	`2`	`+`
`1`	`3`	`2007-06-04 Added labeldistance arg to Axes.pie to control the raidal`
`2`	`4`	`distance of the wedge labels - JDH`
`3`	`5`