Fixed legend and LineCollection to work together again

efiring · efiring · commit a5bf9678e641 · 2007-04-07T19:25:33.000Z
svn path=/trunk/matplotlib/; revision=3168
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+2007-04-07 Fixed legend/LineCollection bug. - EF
+
 2007-04-06 Removed deprecated support for a float value as a gray-scale;
            now it must be a string, like '0.5'.  Added alpha kwarg to
            ColorConverter.to_rgba_list. - EF
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -779,6 +779,24 @@ def get_verts(self, dataTrans=None):
         raise NotImplementedError('Vertices in data coordinates are calculated\n'
                 + 'with offsets only if _transOffset == dataTrans.')
 
+    def get_lines(self):
+        'return seq of lines in collection'
+        # This is needed for legend, even though it is incomplete,
+        # like get_verts, and essentially wrong in general.
+        # We could add a check for validity as in get_verts.
+        if self._offsets is None:
+            offsets = [(0,0)]
+        else:
+            offsets = self._offsets
+        Noffsets = len(offsets)
+        Nsegments = len(self._segments)
+        lines = []
+        for i in range(max(Noffsets, Nsegments)):
+            ox, oy = offsets[i%Noffsets]
+            segment = self._segments[i%Nsegments]
+            lines.append([(x+ox, y+oy) for x,y in segment])
+        return lines
+
     def update_scalarmappable(self):
         """
         If the scalar mappable array is not none, update colors
diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py
@@ -52,7 +52,6 @@ def line_cuts_bbox(line, bbox):
 
     if n == 1:
         return bbox.contains(line[0][0], line[0][1])
-
     p1 = line[0]
     for p2 in line[1:]:
         segment = (p1, p2)
@@ -359,7 +358,7 @@ def get_handles(ax):
                 for line in hlines:
                     tline = trans.seq_xy_tups(line)
                     aline = [inv(v) for v in tline]
-                    lines.extend(line)
+                    lines.append(aline)
 
         return [vertices, bboxes, lines]
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+2007-04-07 Fixed legend/LineCollection bug. - EF`
	`2`	`+`
`1`	`3`	`2007-04-06 Removed deprecated support for a float value as a gray-scale;`
`2`	`4`	`now it must be a string, like '0.5'. Added alpha kwarg to`
`3`	`5`	`ColorConverter.to_rgba_list. - EF`