Merge pull request #2225 from mgoacolou/master

mdboom · mdboom · commit 037f25c36e8f · 2013-07-17T09:36:53.000-07:00
add zorder to streamplot
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -3811,7 +3811,7 @@ def stackplot(self, x, *args, **kwargs):
 
     def streamplot(self, x, y, u, v, density=1, linewidth=None, color=None,
                    cmap=None, norm=None, arrowsize=1, arrowstyle='-|>',
-                   minlength=0.1, transform=None):
+                   minlength=0.1, transform=None, zorder=1):
         if not self._hold:
             self.cla()
         stream_container = mstream.streamplot(self, x, y, u, v,
@@ -3823,7 +3823,8 @@ def streamplot(self, x, y, u, v, density=1, linewidth=None, color=None,
                                               arrowsize=arrowsize,
                                               arrowstyle=arrowstyle,
                                               minlength=minlength,
-                                              transform=transform)
+                                              transform=transform,
+                                              zorder=zorder)
         return stream_container
     streamplot.__doc__ = mstream.streamplot.__doc__
 
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -3213,7 +3213,7 @@ def step(x, y, *args, **kwargs):
 @_autogen_docstring(Axes.streamplot)
 def streamplot(x, y, u, v, density=1, linewidth=None, color=None, cmap=None,
                norm=None, arrowsize=1, arrowstyle='-|>', minlength=0.1,
-               transform=None, hold=None):
+               transform=None, hold=None, zorder=1):
     ax = gca()
     # allow callers to override the hold state by passing hold=True|False
     washold = ax.ishold()
@@ -3224,7 +3224,8 @@ def streamplot(x, y, u, v, density=1, linewidth=None, color=None, cmap=None,
         ret = ax.streamplot(x, y, u, v, density=density, linewidth=linewidth,
                             color=color, cmap=cmap, norm=norm,
                             arrowsize=arrowsize, arrowstyle=arrowstyle,
-                            minlength=minlength, transform=transform)
+                            minlength=minlength, transform=transform,
+                            zorder=zorder)
         draw_if_interactive()
     finally:
         ax.hold(washold)
diff --git a/lib/matplotlib/streamplot.py b/lib/matplotlib/streamplot.py
@@ -16,7 +16,7 @@
 
 def streamplot(axes, x, y, u, v, density=1, linewidth=None, color=None,
                cmap=None, norm=None, arrowsize=1, arrowstyle='-|>',
-               minlength=0.1, transform=None):
+               minlength=0.1, transform=None, zorder=1):
     """Draws streamlines of a vector flow.
 
     *x*, *y* : 1d arrays
@@ -47,6 +47,8 @@ def streamplot(axes, x, y, u, v, density=1, linewidth=None, color=None,
         See :class:`~matplotlib.patches.FancyArrowPatch`.
     *minlength* : float
         Minimum length of streamline in axes coordinates.
+    *zorder* : int
+        any number
 
     Returns:
 
@@ -98,6 +100,9 @@ def streamplot(axes, x, y, u, v, density=1, linewidth=None, color=None,
         line_kw['linewidth'] = linewidth
         arrow_kw['linewidth'] = linewidth
 
+    line_kw['zorder'] = zorder
+    arrow_kw['zorder'] = zorder
+
     ## Sanity checks.
     assert u.shape == grid.shape
     assert v.shape == grid.shape
