Skip to content

Make colorbar compatible accepting a list of axes created via gridspec #8755

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 27 commits into from
Closed

Make colorbar compatible accepting a list of axes created via gridspec #8755

Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
1b0ac37
Clarify how a FancyArrowPatch behaves
dstansby Jun 2, 2017
070a578
Clarify in display units
dstansby Jun 7, 2017
089818b
Allow divmod to be overridden by numpy
dstansby Jun 9, 2017
b87778e
Various cleanups to backends code.
anntzer Jun 3, 2017
40fa293
Update FreeType version in test_tightlayout4.
QuLogic Jun 2, 2017
c0ecc7d
Add a unique number to any renderer hash keys.
QuLogic Jun 3, 2017
df672df
Update tests that are marked flaky.
QuLogic Jun 3, 2017
9bf168f
Use itertools.count for renderer unique ID.
QuLogic Jun 4, 2017
454e9d6
Simplify cla sharex/sharey code; alternative to #8710
efiring Jun 4, 2017
edfdc53
MNT: colorbar accept numpy array input (#8739)
jklymak Jun 12, 2017
2284e98
Changed normalization in _spectral_helper() to obtain conistent scali…
DietBru May 6, 2017
234089d
Added note to api_changes
DietBru Jun 11, 2017
a62d3e3
Fix contour colour level determination
dstansby Jun 9, 2017
03c00d7
Correct contour level test
dstansby Jun 9, 2017
65f3906
sort input files
bmwiedemann Jun 12, 2017
62aa006
First pass; seems to work. More testing needed
jklymak Jun 13, 2017
fb3f419
First pass; seems to work. More testing needed
jklymak Jun 13, 2017
89857c7
First pass; seems to work. More testing needed
jklymak Jun 13, 2017
c68a411
First pass; seems to work. More testing needed
jklymak Jun 13, 2017
031d356
First change
jklymak Jun 13, 2017
1c5a14e
Aded comments and cleaned up
jklymak Jun 13, 2017
12737f5
Aded comments and cleaned up
jklymak Jun 13, 2017
600253e
Colormap that handles gridspec
jklymak Jun 13, 2017
fd388aa
Colormap that handles gridspec
jklymak Jun 13, 2017
262fa33
Colormap that handles gridspec
jklymak Jun 13, 2017
37998b4
Fixed subplotspec geometry having None
jklymak Jun 13, 2017
d9b49b5
Fixed subplotspec geometry having None, PEP8 errors
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
Prev Previous commit
Fixed subplotspec geometry having None, PEP8 errors
  • Loading branch information
@jklymak
jklymak committed Jun 13, 2017
commit d9b49b584a87e3d56b9a6291c4fda9b16fa12d77
39 changes: 25 additions & 14 deletions lib/matplotlib/colorbar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1164,12 +1164,15 @@ def make_axes(parents, location=None, orientation=None, fraction=0.15,
cax.set_aspect(aspect, anchor=anchor, adjustable='box')
return cax, kw


# helper functions for row,col to index.
def index2rowcolunm(index,ncols):
def index2rowcolunm(index, ncols):
col = index%ncols + 1
row = int(np.floor(index/ncols)+1)
return row,col
def rowcolunm2index(row,col,ncols):
return row, col


def rowcolunm2index(row, col, ncols):
index = col-1+(row-1)*ncols
return index

Expand Down Expand Up @@ -1228,17 +1231,21 @@ def make_axes_gridspec(parents, **kw):
# the maximum and minimum index into the subplotspec. The result is the
# size the new gridspec that we will create must be.
gsp0 = parents[0].get_subplotspec().get_gridspec()
minind = 10000;maxind = -10000
minind = 10000
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably better to use np.inf and -np.inf or use the values from the first parent.

maxind = -10000
for parent in parents:
gsp = parent.get_subplotspec().get_gridspec()
if gsp == gsp0:
ss = parent.get_subplotspec().get_geometry()
if ss[2]<minind:
ss = list(parent.get_subplotspec().get_geometry())
if ss[3] is None:
ss[3] = ss[2]
if ss[2] < minind:
minind = ss[2]
if ss[3]>maxind:
if ss[3] > maxind:
maxind = ss[3]
else:
raise NotImplementedError('List of axes passed to colorbar must be from the same gridspec or call to plt.subplots')
raise NotImplementedError('List of axes passed to colorbar '
'must be from the same gridspec or call to plt.subplots')
# map the extent of the gridspec from indices to rows and columns.
# We need this below to assign the parents into the new gridspec.
ncols0 = gsp0.get_geometry()[1]
Expand All @@ -1249,7 +1256,7 @@ def make_axes_gridspec(parents, **kw):

# this is subplot spec the region that we need to resize and add
# a colorbar to.
subspec = gridspec.SubplotSpec(gsp0,minind,maxind)
subspec = gridspec.SubplotSpec(gsp0, minind, maxind)

gs_from_subplotspec = gridspec.GridSpecFromSubplotSpec
if orientation == 'vertical':
Expand Down Expand Up @@ -1310,13 +1317,17 @@ def make_axes_gridspec(parents, **kw):

# remap the old max gridspec index (geo[3]) into a new
# index.
oldrow, oldcol = index2rowcolunm(geo[3], ncol0)
newrow = oldrow - minrow+1
newcol = oldcol - mincol+1
newmaxind = rowcolunm2index(newrow, newcol, ncols)
if geo[3] is None:
newmaxind = newminind
else:
oldrow, oldcol = index2rowcolunm(geo[3], ncol0)
newrow = oldrow - minrow+1
newcol = oldcol - mincol+1
newmaxind = rowcolunm2index(newrow, newcol, ncols)

# change the subplotspec for this parent.
parent.set_subplotspec(gridspec.SubplotSpec(gsnew, newminind, newmaxind))
parent.set_subplotspec(
gridspec.SubplotSpec(gsnew, newminind, newmaxind))
parent.update_params()
parent.set_position(parent.figbox)
parent.set_anchor(panchor)
Expand Down