WIP : use container to draw errorbar

tacaswell · tacaswell · commit 1003cc16c7ea · 2014-12-23T07:17:20.000-08:00
tests are still failing
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -3,7 +3,7 @@
 
 import six
 from six.moves import reduce, xrange, zip
-
+import itertools
 import math
 import warnings
 
@@ -36,7 +36,8 @@
 import matplotlib.transforms as mtransforms
 import matplotlib.tri as mtri
 import matplotlib.transforms as mtrans
-from matplotlib.container import BarContainer, ErrorbarContainer, StemContainer
+from matplotlib.container import (BarContainer, ErrorbarContainer,
+                                  StemContainer, Container)
 from matplotlib.axes._base import _AxesBase
 from matplotlib.axes._base import _process_plot_format
 
@@ -2758,7 +2759,7 @@ def xywhere(xs, ys, mask):
 
         if xerr is not None:
             if (iterable(xerr) and len(xerr) == 2 and
-                iterable(xerr[0]) and iterable(xerr[1])):
+                    iterable(xerr[0]) and iterable(xerr[1])):
                 # using list comps rather than arrays to preserve units
                 left = [thisx - thiserr for (thisx, thiserr)
                         in cbook.safezip(x, xerr[0])]
@@ -2889,14 +2890,18 @@ def xywhere(xs, ys, mask):
         self.autoscale_view()
         self._hold = holdstate
 
-        errorbar_container = ErrorbarContainer((l0, tuple(caplines),
-                                                tuple(barcols)),
+        # hack to put these artist in the right place in the
+        # draw tree
+        for ll in itertools.chain((l0, ), caplines, barcols):
+            ll.remove()
+
+        errorbar_container = ErrorbarContainer((l0,
+                                                Container(caplines),
+                                                Container(barcols)),
                                                has_xerr=(xerr is not None),
                                                has_yerr=(yerr is not None),
                                                label=label)
-        self.containers.append(errorbar_container)
-
-        return errorbar_container  # (l0, caplines, barcols)
+        return self.add_container(errorbar_container)
 
     def boxplot(self, x, notch=False, sym=None, vert=True, whis=1.5,
                 positions=None, widths=None, patch_artist=False,
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -1596,13 +1596,19 @@ def add_container(self, container):
         Add a :class:`~matplotlib.container.Container` instance
         to the axes.
 
-        Returns the collection.
+        Returns the container.
         """
+        container.set_axes(self)
+        self._set_artist_props(container)
+        self.containers.append(container)
+
+        container.set_clip_path(self.patch)
+        container.set_remove_method(lambda h: self.containers.remove(h))
+
         label = container.get_label()
         if not label:
             container.set_label('_container%d' % len(self.containers))
-        self.containers.append(container)
-        container.set_remove_method(lambda h: self.containers.remove(h))
+
         return container
 
     def relim(self, visible_only=False):
@@ -1994,6 +2000,7 @@ def draw(self, renderer=None, inframe=False):
         artists.extend(self.lines)
         artists.extend(self.texts)
         artists.extend(self.artists)
+        artists.extend(self.containers)
 
         # the frame draws the edges around the axes patch -- we
         # decouple these so the patch can be in the background and the
@@ -2038,7 +2045,7 @@ def draw(self, renderer=None, inframe=False):
         # if the minimum zorder is negative, start rasterization
         rasterization_zorder = self._rasterization_zorder
         if (rasterization_zorder is not None and
-            len(dsu) > 0 and dsu[0][0] < rasterization_zorder):
+                len(dsu) > 0 and dsu[0][0] < rasterization_zorder):
             renderer.start_rasterizing()
             dsu_rasterized = [l for l in dsu if l[0] < rasterization_zorder]
             dsu = [l for l in dsu if l[0] >= rasterization_zorder]
diff --git a/lib/matplotlib/container.py b/lib/matplotlib/container.py
@@ -10,7 +10,8 @@ class Container(tuple, Artist):
     """
     Base class for containers.
     """
-    _no_broadcast = ['label', ]
+    _no_broadcast = ['label', 'visible', 'zorder', 'animated',
+                     'agg_filter']
 
     def __repr__(self):
         return "<Container object of %d artists>" % (len(self))
@@ -22,7 +23,7 @@ def __init__(self, kl, label=None, **kwargs):
         # set up the artist details
         Artist.__init__(self, **kwargs)
         # for some reason we special case label
-        self.set_label(label=label)
+        self.set_label(label)
 
     def remove(self):
         # remove the children
