Skip to content

Colorbar compatible gridspec2 #8758

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

Closed
wants to merge 7 commits into from
Closed

Colorbar compatible gridspec2 #8758

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f4399ec
First pass; seems to work. More testing needed
jklymak Jun 13, 2017
b9a07ac
First pass; seems to work. More testing needed
jklymak Jun 13, 2017
9cccda0
Huh?
jklymak Jun 13, 2017
f1724f4
Merge branch 'master' of git://github.com/matplotlib/matplotlib
jklymak Jun 13, 2017
2d0d155
Changes to colorbar to allow list of SubplotSpec as the argument to
jklymak Jun 13, 2017
2332114
Changes to colorbar to allow list of SubplotSpec as the argument to
jklymak Jun 13, 2017
6b5971d
Changes to colorbar to allow list of SubplotSpec as the argument to ax
jklymak Jun 13, 2017
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
31 changes: 11 additions & 20 deletions lib/matplotlib/colorbar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
import matplotlib.patches as mpatches
import matplotlib.path as mpath
import matplotlib.ticker as ticker
import matplotlib.transforms as mtransforms
import matplotlib.transforms as mtrans

from matplotlib import docstring

Expand Down Expand Up @@ -317,7 +317,7 @@ def __init__(self, ax, cmap=None,
linthresh=self.norm.linthresh)
else:
self.formatter = ticker.ScalarFormatter()
elif isinstance(format, six.string_types):
elif cbook.is_string_like(format):
self.formatter = ticker.FormatStrFormatter(format)
else:
self.formatter = format # Assume it is a Formatter
Expand All @@ -344,7 +344,6 @@ def draw_all(self):
Calculate any free parameters based on the current cmap and norm,
and do all the drawing.
'''

self._process_values()
self._find_range()
X, Y = self._mesh()
Expand Down Expand Up @@ -400,10 +399,6 @@ def set_ticks(self, ticks, update_ticks=True):
self.update_ticks()
self.stale = True

def get_ticks(self, minor=False):
"""Return the x ticks as a list of locations"""
return self._tick_data_values

def set_ticklabels(self, ticklabels, update_ticks=True):
"""
set tick labels. Tick labels are updated immediately unless
Expand Down Expand Up @@ -616,7 +611,6 @@ def _ticker(self):
else:
eps = (intv[1] - intv[0]) * 1e-10
b = b[(b <= intv[1] + eps) & (b >= intv[0] - eps)]
self._tick_data_values = b
ticks = self._locate(b)
formatter.set_locs(b)
ticklabels = [formatter(t, i) for i, t in enumerate(b)]
Expand Down Expand Up @@ -687,10 +681,9 @@ def _process_values(self, b=None):
self.norm.vmin = 0
self.norm.vmax = 1

self.norm.vmin, self.norm.vmax = mtransforms.nonsingular(
self.norm.vmin,
self.norm.vmax,
expander=0.1)
self.norm.vmin, self.norm.vmax = mtrans.nonsingular(self.norm.vmin,
self.norm.vmax,
expander=0.1)

b = self.norm.inverse(self._uniform_y(self.cmap.N + 1))

Expand Down Expand Up @@ -1117,19 +1110,17 @@ def make_axes(parents, location=None, orientation=None, fraction=0.15,
parent_anchor = kw.pop('panchor', loc_settings['panchor'])
pad = kw.pop('pad', loc_settings['pad'])

# turn parents into a list if it is not already. We do this w/ np
# because `plt.subplots` can return an ndarray and is natural to
# pass to `colorbar`.
parents = np.atleast_1d(parents).ravel()
# turn parents into a list if it is not already
parents = np.atleast_1d(parents).ravel().tolist()

fig = parents[0].get_figure()
if not all(fig is ax.get_figure() for ax in parents):
raise ValueError('Unable to create a colorbar axes as not all '
'parents share the same figure.')

# take a bounding box around all of the given axes
parents_bbox = mtransforms.Bbox.union(
[ax.get_position(original=True).frozen() for ax in parents])
parents_bbox = mtrans.Bbox.union([ax.get_position(original=True).frozen()
for ax in parents])

pb = parents_bbox
if location in ('left', 'right'):
Expand All @@ -1150,12 +1141,12 @@ def make_axes(parents, location=None, orientation=None, fraction=0.15,

# define a transform which takes us from old axes coordinates to
# new axes coordinates
shrinking_trans = mtransforms.BboxTransform(parents_bbox, pb1)
shrinking_trans = mtrans.BboxTransform(parents_bbox, pb1)

# transform each of the axes in parents using the new transform
for ax in parents:
new_posn = shrinking_trans.transform(ax.get_position())
new_posn = mtransforms.Bbox(new_posn)
new_posn = mtrans.Bbox(new_posn)
ax.set_position(new_posn)
if parent_anchor is not False:
ax.set_anchor(parent_anchor)
Expand Down
Loading