Merge pull request #5914 from dopplershift/fix-barbs

tacaswell · tacaswell · commit 180a21ca220e · 2016-01-25T21:58:41.000-05:00
Make barbs draw correctly (Fixes #5803) Conflicts: lib/matplotlib/tests/test_quiver.py white space vs new test
diff --git a/lib/matplotlib/quiver.py b/lib/matplotlib/quiver.py
@@ -918,6 +918,11 @@ def __init__(self, ax, *args, **kw):
             kw['edgecolors'] = barbcolor
             kw['facecolors'] = flagcolor
 
+        # Explicitly set a line width if we're not given one, otherwise
+        # polygons are not outlined and we get no barbs
+        if 'linewidth' not in kw and 'lw' not in kw:
+            kw['linewidth'] = 1
+
         # Parse out the data arrays from the various configurations supported
         x, y, u, v, c = _parse_args(*args)
         self.x = x
diff --git a/lib/matplotlib/tests/baseline_images/test_quiver/barbs_test_image.png b/lib/matplotlib/tests/baseline_images/test_quiver/barbs_test_image.png
diff --git a/lib/matplotlib/tests/test_quiver.py b/lib/matplotlib/tests/test_quiver.py
@@ -92,6 +92,34 @@ def test_quiver_copy():
     assert q0.V[0] == 2.0
 
 
+@image_comparison(baseline_images=['quiver_key_pivot'],
+                  extensions=['png'], remove_text=True)
+def test_quiver_key_pivot():
+    fig, ax = plt.subplots()
+
+    u, v = np.mgrid[0:2*np.pi:10j, 0:2*np.pi:10j]
+
+    q = ax.quiver(np.sin(u), np.cos(v))
+    ax.set_xlim(-2, 11)
+    ax.set_ylim(-2, 11)
+    ax.quiverkey(q, 0.5, 1, 1, 'N', labelpos='N')
+    ax.quiverkey(q, 1, 0.5, 1, 'E', labelpos='E')
+    ax.quiverkey(q, 0.5, 0, 1, 'S', labelpos='S')
+    ax.quiverkey(q, 0, 0.5, 1, 'W', labelpos='W')
+
+
+@image_comparison(baseline_images=['barbs_test_image'],
+                  extensions=['png'], remove_text=True)
+def test_barbs():
+    x = np.linspace(-5, 5, 5)
+    X, Y = np.meshgrid(x, x)
+    U, V = 12*X, 12*Y
+    fig, ax = plt.subplots()
+    ax.barbs(X, Y, U, V, np.sqrt(U*U + V*V), fill_empty=True, rounding=False,
+             sizes=dict(emptybarb=0.25, spacing=0.2, height=0.3),
+             cmap='viridis')
+
+
 if __name__ == '__main__':
     import nose
     nose.runmodule()
