Permalink
Browse files

Merge branch 'v1.2.x'

Conflicts:
	lib/matplotlib/tests/baseline_images/test_axes/errorbar_mixed.pdf
	lib/matplotlib/tests/baseline_images/test_axes/errorbar_mixed.png
  • Loading branch information...
2 parents 034b12b + 527fd07 commit 1efa8323e15b42b23db44e1640773abd66636eef @dmcdougall committed Jan 20, 2013
View
@@ -5384,6 +5384,8 @@ def errorbar(self, x, y, yerr=None, xerr=None,
lines_kw['lw'] = kwargs['lw']
if 'transform' in kwargs:
lines_kw['transform'] = kwargs['transform']
+ if 'alpha' in kwargs:
+ lines_kw['alpha'] = kwargs['alpha']
if 'zorder' in kwargs:
lines_kw['zorder'] = kwargs['zorder']
@@ -5440,6 +5442,8 @@ def xywhere(xs, ys, mask):
plot_kw['mew'] = kwargs['mew']
if 'transform' in kwargs:
plot_kw['transform'] = kwargs['transform']
+ if 'alpha' in kwargs:
+ plot_kw['alpha'] = kwargs['alpha']
if 'zorder' in kwargs:
plot_kw['zorder'] = kwargs['zorder']
View
@@ -319,6 +319,7 @@ def __init__(self,
self._hold = rcParams['axes.hold']
self.canvas = None
+ self._suptitle = None
if subplotpars is None:
subplotpars = SubplotParams()
@@ -491,8 +492,14 @@ def suptitle(self, t, **kwargs):
if ('verticalalignment' not in kwargs) and ('va' not in kwargs):
kwargs['verticalalignment'] = 'top'
- t = self.text(x, y, t, **kwargs)
- return t
+ sup = self.text(x, y, t, **kwargs)
+ if self._suptitle is not None:
+ self._suptitle.set_text(t)
+ self._suptitle.set_position((x, y))
+ self._suptitle.update_from(sup)
+ else:
+ self._suptitle = sup
+ return self._suptitle
def set_canvas(self, canvas):
"""
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Large diffs are not rendered by default.

Oops, something went wrong.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.

0 comments on commit 1efa832

Please sign in to comment.