Merge pull request matplotlib#1724 from neggert/hist_stack_round2

Re-write stacked step histogram

Author: mdboom

lib/matplotlib/axes.py

@@ -4792,11 +4792,10 @@ def make_iterable(x):
         if orientation == 'vertical':
             self._process_unit_info(xdata=left, ydata=height, kwargs=kwargs)
             if log:
-                self.set_yscale('log')
+                self.set_yscale('log', nonposy='clip')
             # size width and bottom according to length of left
             if _bottom is None:
                 if self.get_yscale() == 'log':
-                    bottom = [1e-100]
                     adjust_ylim = True
                 else:
                     bottom = [0]
@@ -4808,11 +4807,10 @@ def make_iterable(x):
         elif orientation == 'horizontal':
             self._process_unit_info(xdata=width, ydata=bottom, kwargs=kwargs)
             if log:
-                self.set_xscale('log')
+                self.set_xscale('log', nonposx='clip')
             # size left and height according to length of bottom
             if _left is None:
                 if self.get_xscale() == 'log':
-                    left = [1e-100]
                     adjust_xlim = True
                 else:
                     left = [0]
@@ -8108,10 +8106,8 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
             hist_kwargs['new'] = True
 
         n = []
-        mlast = None
-        # reversed order is necessary so when stacking histogram, first dataset is on top
-        # if histogram isn't stacked, this doesn't make any difference
-        for i in reversed(xrange(nx)):
+        mlast = bottom
+        for i in xrange(nx):
             # this will automatically overwrite bins,
             # so that each histogram uses the same bins
             m, bins = np.histogram(x[i], bins, weights=w[i], **hist_kwargs)
@@ -8137,8 +8133,6 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
             else:
                 n = [m[slc].cumsum()[slc] for m in n]
 
-        n.reverse() # put them back in the right order
-
         patches = []
 
         if histtype.startswith('bar'):
@@ -8175,24 +8169,34 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
                 _barfunc = self.bar
 
             for m, c in zip(n, color):
-                patch = _barfunc(bins[:-1]+boffset, m, width,
+                if bottom is None:
+                    bottom = np.zeros(len(m), np.float)
+                if stacked:
+                    height = m - bottom
+                else :
+                    height = m
+                patch = _barfunc(bins[:-1]+boffset, height, width,
                                   align='center', log=log,
                                   color=c, bottom=bottom)
                 patches.append(patch)
+                if stacked:
+                    bottom[:] = m
                 boffset += dw
 
         elif histtype.startswith('step'):
-            x = np.zeros( 2*len(bins), np.float )
-            y = np.zeros( 2*len(bins), np.float )
+            # these define the perimeter of the polygon
+            x = np.zeros( 4*len(bins)-3, np.float )
+            y = np.zeros( 4*len(bins)-3, np.float )
 
-            x[0::2], x[1::2] = bins, bins
+            x[0:2*len(bins)-1:2], x[1:2*len(bins)-1:2] = bins, bins[:-1]
+            x[2*len(bins)-1:] = x[1:2*len(bins)-1][::-1]
 
             if log:
                 if orientation == 'horizontal':
-                    self.set_xscale('log')
+                    self.set_xscale('log', nonposx = 'clip')
                     logbase = self.xaxis._scale.base
                 else:  # orientation == 'vertical'
-                    self.set_yscale('log')
+                    self.set_yscale('log', nonposy = 'clip')
                     logbase = self.yaxis._scale.base
 
                 # Setting a minimum of 0 results in problems for log plots
@@ -8219,19 +8223,37 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
             # overriding this
             fill = (histtype == 'stepfilled')
 
-            for m, c in zip(n, color):
-                y[1:-1:2], y[2::2] = m, m
+            xvals, yvals = [], []
+            for m in n:
+                # starting point for drawing polygon
+                y[0] = y[-1]
+                # top of the previous polygon becomes the bottom
+                y[2*len(bins)-1:] = y[1:2*len(bins)-1][::-1]
+                # set the top of this polygon
+                y[1:2*len(bins)-1:2], y[2:2*len(bins):2] = m, m
                 if log:
                     y[y<minimum]=minimum
                 if orientation == 'horizontal':
                     x,y = y,x
 
+                xvals.append(x.copy())
+                yvals.append(y.copy())
+
+            # add patches in reverse order so that when stacking,
+            # items lower in the stack are plottted on top of
+            # items higher in the stack
+            for x, y, c in reversed(zip(xvals, yvals, color)):
                 if fill:
                     patches.append( self.fill(x, y,
-                        closed=False, facecolor=c) )
+                                              closed=False,
+                                              facecolor=c) )
                 else:
                     patches.append( self.fill(x, y,
-                        closed=False, edgecolor=c, fill=False) )
+                                              closed=False, edgecolor=c,
+                                              fill=False) )
+
+            # we return patches, so put it back in the expected order
+            patches.reverse()
 
             # adopted from adjust_x/ylim part of the bar method
             if orientation == 'horizontal':