8000 Merge remote-tracking branch 'upstream/v1.2.x' · matplotlib/matplotlib@f8fc588 · GitHub
[go: up one dir, main page]

Skip to content

Commit f8fc588

Browse files
committed
Merge remote-tracking branch 'upstream/v1.2.x'
Conflicts: lib/matplotlib/axes.py
2 parents ee8b68e + d960f03 commit f8fc588

File tree

7 files changed

+695
-8
lines changed

7 files changed

+695
-8
lines changed

lib/matplotlib/axes.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4674,7 +4674,7 @@ def legend(self, *args, **kwargs):
46744674
46754675
*framealpha*: [*None* | float]
46764676
If not None, alpha channel for legend frame. Default *None*.
4677-
4677+
46784678
*ncol* : integer
46794679
number of columns. default is 1
46804680
@@ -8300,7 +8300,7 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
83008300
hist_kwargs = dict(range=bin_range)
83018301

83028302
n = []
8303-
mlast = bottom
8303+
mlast = None
83048304
# reversed order is necessary so when stacking histogram, first
83058305
# dataset is on top if histogram isn't stacked, this doesn't make any
83068306
# difference
@@ -8318,6 +8318,8 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
83188318
mlast[:] = m
83198319
n.append(m)
83208320

8321+
8322+
83218323
if cumulative:
83228324
slc = slice(None)
83238325
if cbook.is_numlike(cumulative) and cumulative < 0:
@@ -8369,7 +8371,7 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
83698371
for m, c in zip(n, color):
83708372
patch = _barfunc(bins[:-1] + boffset, m, width,
83718373
align='center', log=log,
8372-
color=c)
8374+
color=c, bottom=bottom)
83738375
patches.append(patch)
83748376
boffset += dw
83758377

Binary file not shown.
Loading

0 commit comments

Comments
 (0)
0