Skip to content

Simplify Colorbar.set_label, inline Colorbar._edges. #18645

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 1 commit into from
Oct 3, 2020
Merged

Simplify Colorbar.set_label, inline Colorbar._edges. #18645

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 5 additions & 31 deletions lib/matplotlib/colorbar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,39 +766,12 @@ def set_label(self, label, *, loc=None, **kwargs):
`~.Axes.set_ylabel`.
Supported keywords are *labelpad* and `.Text` properties.
"""
_pos_xy = 'y' if self.orientation == 'vertical' else 'x'
_protected_kw = [_pos_xy, 'horizontalalignment', 'ha']
if any([k in kwargs for k in _protected_kw]):
if loc is not None:
raise TypeError(f'Specifying *loc* is disallowed when any of '
f'its corresponding low level keyword '
f'arguments {_protected_kw} are also supplied')
loc = 'center'
if self.orientation == "vertical":
self.ax.set_ylabel(label, loc=loc, **kwargs)
else:
if loc is None:
loc = mpl.rcParams['%saxis.labellocation' % _pos_xy]
if self.orientation == 'vertical':
_api.check_in_list(('bottom', 'center', 'top'), loc=loc)
else:
_api.check_in_list(('left', 'center', 'right'), loc=loc)
if loc in ['right', 'top']:
kwargs[_pos_xy] = 1.
kwargs['horizontalalignment'] = 'right'
elif loc in ['left', 'bottom']:
kwargs[_pos_xy] = 0.
kwargs['horizontalalignment'] = 'left'
if self.orientation == 'vertical':
self.ax.set_ylabel(label, **kwargs)
else:
self.ax.set_xlabel(label, **kwargs)
self.ax.set_xlabel(label, loc=loc, **kwargs)
self.stale = True

def _edges(self, X, Y):
"""Return the separator line segments; helper for _add_solids."""
# Using the non-array form of these line segments is much
# simpler than making them into arrays.
return [list(zip(X[i], Y[i])) for i in range(1, len(X) - 1)]

def _add_solids(self, X, Y, C):
"""Draw the colors; optionally add separators."""
# Cleanup previously set artists.
Expand All @@ -814,7 +787,8 @@ def _add_solids(self, X, Y, C):
self._add_solids_patches(X, Y, C, mappable)
else:
self._add_solids_pcolormesh(X, Y, C)
self.dividers.set_segments(self._edges(X, Y) if self.drawedges else [])
self.dividers.set_segments(
np.dstack([X, Y])[1:-1] if self.drawedges else [])

def _add_solids_pcolormesh(self, X, Y, C):
_log.debug('Setting pcolormesh')
Expand Down