Skip to content

Re-write stacked step histogram #1724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 1, 2013
Merged

Re-write stacked step histogram #1724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2e1a96d
Re-write stacked step histogram
neggert Jan 30, 2013
f6dfcea
Fix bug in stacked bar histogram. Also, calling hist with `log=True` now
neggert Feb 23, 2013
3ce4b96
Update a few test baseline images
neggert Feb 28, 2013
fa85f9b
PEP8 fixes
neggert Feb 28, 2013
9a83e9f
Remove duplicate test_hist_offset
neggert Feb 28, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 42 additions & 20 deletions lib/matplotlib/axes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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]
Expand Down Expand Up @@ -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)
Expand All @@ -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'):
Expand Down Expand Up @@ -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
Expand All @@ -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':
Expand Down
Binary file removed lib/matplotlib/tests/baseline_images/test_axes/hist_stacked.png
View file
Open in desktop
Binary file not shown.
Binary file added lib/matplotlib/tests/baseline_images/test_axes/hist_stacked_bar.pdf
View file
Open in desktop
Binary file not shown.
Binary file added lib/matplotlib/tests/baseline_images/test_axes/hist_stacked_bar.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading