feat: histline color handling

andrzejnovak · andrzejnovak · commit 467683d402c3 · 2020-09-09T17:50:57.000+02:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -6874,8 +6874,12 @@ def hist(self, x, bins=None, range=None, density=False, weights=None,
     def histline(self, vals, bins=None, *,
                  orientation='horizontal', baseline=0, fill=False, **kwargs):
 
-        if 'color' not in kwargs:
-            kwargs['color'] = self._get_lines.get_next_color()
+        _color = self._get_lines.get_next_color()
+        if not fill:
+            kwargs.setdefault('edgecolor', _color)
+        else:
+            kwargs.setdefault('edgecolor', 'none')
+            kwargs.setdefault('facecolor', _color)
 
         if bins is None:
             bins = np.arange(len(vals)+1)
diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py
@@ -33,7 +33,8 @@
 from matplotlib.cbook import silent_list
 from matplotlib.font_manager import FontProperties
 from matplotlib.lines import Line2D
-from matplotlib.patches import Patch, Rectangle, Shadow, FancyBboxPatch, StepPatch
+from matplotlib.patches import (Patch, Rectangle, Shadow, FancyBboxPatch,
+                                StepPatch)
 from matplotlib.collections import (LineCollection, RegularPolyCollection,
                                     CircleCollection, PathCollection,
                                     PolyCollection)
diff --git a/lib/matplotlib/legend_handler.py b/lib/matplotlib/legend_handler.py
@@ -331,7 +331,8 @@ def patch_func(legend=legend, orig_handle=orig_handle,
     def _create_patch(self, legend, orig_handle,
                       xdescent, ydescent, width, height, fontsize):
         if self._patch_func is None:
-            p = Rectangle(xy=(-xdescent, -ydescent), color=orig_handle.get_facecolor(),
+            p = Rectangle(xy=(-xdescent, -ydescent),
+                          color=orig_handle.get_facecolor(),
                           width=width, height=height)
         else:
             p = self._patch_func(legend=legend, orig_handle=orig_handle,
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -990,8 +990,32 @@ def set_path(self, path):
 
 
 class StepPatch(PathPatch):
+    """A stepline path patch."""
+
+    @docstring.dedent_interpd
     def __init__(self, vals, bins=None, *,
                  orientation='horizontal', baseline=0, **kwargs):
+        """
+        Parameters
+        ----------
+        vals : array, len N
+            An array of y-values.
+
+        bins : array, len N+1
+            A array of x-values, between which the curve takes on
+            vals values.
+
+        orientation : {'vertical', 'horizontal'}, default: 'vertical'
+
+        baseline : float or None, default: 0
+            Determines starting value of the bounding edges or when
+            "fill" == True, position of lower edge.
+
+        **kwargs
+            `Patch` properties:
+
+            %(Patch)s
+        """
         self.baseline = baseline
         self.orientation = orientation
         self._bins = bins
@@ -1005,9 +1029,9 @@ def _update_data(self):
             raise ValueError('the length of the bins is wrong')
         verts, codes = [], []
         for idx0, idx1 in cbook.contiguous_regions(~np.isnan(self._vals)):
-            x = np.vstack((self._bins[idx0:idx1+1], 
+            x = np.vstack((self._bins[idx0:idx1+1],
                            self._bins[idx0:idx1+1])).T.flatten()
-            y = np.vstack((self._vals[idx0:idx1], 
+            y = np.vstack((self._vals[idx0:idx1],
                            self._vals[idx0:idx1])).T.flatten()
             if self.baseline is not None:
                 y = np.hstack((self.baseline, y, self.baseline))
@@ -1129,46 +1153,6 @@ def set_xy(self, xy):
                   doc='The vertices of the path as (N, 2) numpy array.')
 
 
-class HistLine(Polygon):
-
-    def __init__(self, vals, bins=None, *, fill=False,
-                 orientation='horizontal', baseline=0, **kwargs):
-        self.baseline = baseline
-        self.orientation = orientation
-        self._color = None
-        self._bins = bins
-        self._vals = vals
-        xy = self._update_data()
-        super(HistLine, self).__init__(xy, closed=False, fill=fill,  **kwargs)
-
-    def _update_data(self):
-        if self._bins.size - 1 != self._vals.size:
-            raise ValueError('the length of the bins is wrong')
-        x = np.vstack((self._bins, self._bins)).T.flatten()
-        y = np.vstack((self._vals, self._vals)).T.flatten()
-        if self.baseline is not None:
-            y = np.hstack((self.baseline, y, self.baseline))
-        else:
-            y = np.hstack((y[0], y, y[-1]))
-        if self.orientation == 'horizontal':
-            return np.vstack([x, y]).T
-        else:
-            return np.vstack([y, x]).T
-
-    def set_bins(self, bins):
-        self._bins = bins
-        self._update_data()
-
-    def set_vals(self, vals):
-        self._vals = vals
-        self._update_data()
-
-    def set_vals_bins(self, vals, bins):
-        self._vals = vals
-        self._bins = bins
-        self._update_data()
-
-
 class Wedge(Patch):
     """Wedge shaped patch."""
 
