update existing examples, add test for errbars

immaxchen · immaxchen · commit 63fc4767faf5 · 2020-10-04T22:58:28.000+08:00
diff --git a/examples/lines_bars_and_markers/bar_label_demo.py b/examples/lines_bars_and_markers/bar_label_demo.py
@@ -29,27 +29,6 @@
 ind = np.arange(N)    # the x locations for the groups
 width = 0.35       # the width of the bars: can also be len(x) sequence
 
-###############################################################################
-# Grouped bar chart
-
-fig, ax = plt.subplots()
-
-rects1 = ax.bar(ind - width/2, menMeans, width, label='Men')
-rects2 = ax.bar(ind + width/2, womenMeans, width, label='Women')
-
-ax.axhline(0, color='grey', linewidth=0.8)
-ax.set_ylabel('Scores')
-ax.set_title('Scores by group and gender')
-ax.set_xticks(ind)
-ax.set_xticklabels(('G1', 'G2', 'G3', 'G4', 'G5'))
-ax.legend()
-
-# Basic labels
-ax.bar_label(rects1)
-ax.bar_label(rects2)
-
-plt.show()
-
 ###############################################################################
 # Stacked bar plot with error bars
 
diff --git a/examples/lines_bars_and_markers/barchart.py b/examples/lines_bars_and_markers/barchart.py
@@ -30,20 +30,8 @@
 ax.set_xticklabels(labels)
 ax.legend()
 
-
-def autolabel(rects):
-    """Attach a text label above each bar in *rects*, displaying its height."""
-    for rect in rects:
-        height = rect.get_height()
-        ax.annotate('{}'.format(height),
-                    xy=(rect.get_x() + rect.get_width() / 2, height),
-                    xytext=(0, 3),  # 3 points vertical offset
-                    textcoords="offset points",
-                    ha='center', va='bottom')
-
-
-autolabel(rects1)
-autolabel(rects2)
+ax.bar_label(rects1, padding=3)
+ax.bar_label(rects2, padding=3)
 
 fig.tight_layout()
 
@@ -61,5 +49,5 @@ def autolabel(rects):
 
 matplotlib.axes.Axes.bar
 matplotlib.pyplot.bar
-matplotlib.axes.Axes.annotate
-matplotlib.pyplot.annotate
+matplotlib.axes.Axes.bar_label
+matplotlib.pyplot.bar_label
diff --git a/examples/lines_bars_and_markers/horizontal_barchart_distribution.py b/examples/lines_bars_and_markers/horizontal_barchart_distribution.py
@@ -54,15 +54,12 @@ def survey(results, category_names):
     for i, (colname, color) in enumerate(zip(category_names, category_colors)):
         widths = data[:, i]
         starts = data_cum[:, i] - widths
-        ax.barh(labels, widths, left=starts, height=0.5,
-                label=colname, color=color)
-        xcenters = starts + widths / 2
+        rects = ax.barh(labels, widths, left=starts, height=0.5,
+                        label=colname, color=color)
 
         r, g, b, _ = color
         text_color = 'white' if r * g * b < 0.5 else 'darkgrey'
-        for y, (x, c) in enumerate(zip(xcenters, widths)):
-            ax.text(x, y, str(int(c)), ha='center', va='center',
-                    color=text_color)
+        ax.bar_label(rects, label_type='center', color=text_color)
     ax.legend(ncol=len(category_names), bbox_to_anchor=(0, 1),
               loc='lower left', fontsize='small')
 
@@ -85,7 +82,7 @@ def survey(results, category_names):
 import matplotlib
 matplotlib.axes.Axes.barh
 matplotlib.pyplot.barh
-matplotlib.axes.Axes.text
-matplotlib.pyplot.text
+matplotlib.axes.Axes.bar_label
+matplotlib.pyplot.bar_label
 matplotlib.axes.Axes.legend
 matplotlib.pyplot.legend
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -6823,6 +6823,19 @@ def test_bar_label_location_center():
     assert labels[1].get_va() == 'center'
 
 
+def test_bar_label_location_errorbars():
+    ax = plt.gca()
+    xs, heights = [1, 2], [3, -4]
+    rects = ax.bar(xs, heights, yerr=1)
+    labels = ax.bar_label(rects)
+    assert labels[0].xy == (xs[0], heights[0] + 1)
+    assert labels[0].get_ha() == 'center'
+    assert labels[0].get_va() == 'bottom'
+    assert labels[1].xy == (xs[1], heights[1] - 1)
+    assert labels[1].get_ha() == 'center'
+    assert labels[1].get_va() == 'top'
+
+
 def test_bar_label_fmt():
     ax = plt.gca()
     rects = ax.bar([1, 2], [3, -4])
@@ -6831,7 +6844,7 @@ def test_bar_label_fmt():
     assert labels[1].get_text() == '-4.00'
 
 
-def test_bar_label_captions():
+def test_bar_label_labels():
     ax = plt.gca()
     rects = ax.bar([1, 2], [3, -4])
     labels = ax.bar_label(rects, labels=['A', 'B'])
