Merge pull request #6364 from tacaswell/API_bar_color_cycles

jenshnielsen · jenshnielsen · commit d0638200aa0e · 2016-05-23T20:30:52.000+01:00
API: bar now color cycles
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -1980,9 +1980,12 @@ def bar(self, left, height, width=0.8, bottom=None, **kwargs):
 
         .. plot:: mpl_examples/pylab_examples/bar_stacked.py
         """
+        kwargs = cbook.normalize_kwargs(kwargs, mpatches._patch_alias_map)
         if not self._hold:
             self.cla()
         color = kwargs.pop('color', None)
+        if color is None:
+            color = self._get_patches_for_fill.get_next_color()
         edgecolor = kwargs.pop('edgecolor', None)
         linewidth = kwargs.pop('linewidth', None)
 
@@ -2062,14 +2065,11 @@ def make_iterable(x):
         if len(linewidth) < nbars:
             linewidth *= nbars
 
-        if color is None:
-            color = [None] * nbars
-        else:
-            color = list(mcolors.to_rgba_array(color))
-            if len(color) == 0:  # until to_rgba_array is changed
-                color = [[0, 0, 0, 0]]
-            if len(color) < nbars:
-                color *= nbars
+        color = list(mcolors.to_rgba_array(color))
+        if len(color) == 0:  # until to_rgba_array is changed
+            color = [[0, 0, 0, 0]]
+        if len(color) < nbars:
+            color *= nbars
 
         if edgecolor is None:
             edgecolor = [None] * nbars
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -55,6 +55,14 @@
 
           """)
 
+_patch_alias_map = {
+        'antialiased': ['aa'],
+        'edgecolor': ['ec'],
+        'facecolor': ['fc'],
+        'linewidth': ['lw'],
+        'linestyle': ['ls']
+    }
+
 
 class Patch(artist.Artist):
     """
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -29,7 +29,7 @@
 from numpy.testing import assert_allclose, assert_array_equal
 import warnings
 from matplotlib.cbook import IgnoredKeywordWarning
-
+import matplotlib.colors as mcolors
 
 # Note: Some test cases are run twice: once normally and once with labeled data
 #       These two must be defined in the same test function or need to have
@@ -4492,6 +4492,17 @@ def test_large_offset():
     fig.canvas.draw()
 
 
+def test_bar_color_cycle():
+    ccov = mcolors.colorConverter.to_rgb
+    fig, ax = plt.subplots()
+    for j in range(5):
+        ln, = ax.plot(range(3))
+        brs = ax.bar(range(3), range(3))
+        for br in brs:
+            print(ln.get_color(), br.get_facecolor())
+            assert ccov(ln.get_color()) == ccov(br.get_facecolor())
+
+
 if __name__ == '__main__':
     import nose
     import sys
diff --git a/lib/matplotlib/tests/test_bbox_tight.py b/lib/matplotlib/tests/test_bbox_tight.py
@@ -34,7 +34,7 @@ def test_bbox_inches_tight():
     # the bottom values for stacked bar chart
     fig, ax = plt.subplots(1, 1)
     for row in xrange(rows):
-        plt.bar(ind, data[row], width, bottom=yoff)
+        ax.bar(ind, data[row], width, bottom=yoff, color='b')
         yoff = yoff + data[row]
         cellText.append([''])
     plt.xticks([])
