8000 Uses tight_layout.get_subplotspec_list to check if all axes are compatible w/ tight_layout by leejjoon · Pull Request #1170 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Uses tight_layout.get_subplotspec_list to check if all axes are compatible w/ tight_layout #1170

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 2 commits into from
Sep 1, 2012
Merged

Uses tight_layout.get_subplotspec_list to check if all axes are compatible w/ tight_layout #1170

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77e245a
implement tight_layout.get_subplotspec_list and uses this to check if…
leejjoon Aug 29, 2012
1d80e7f
tight_layout.py: pep8 fix and some refactoring
leejjoon Aug 30, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments. 8000
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
tight_layout.py: pep8 fix and some refactoring
  • Loading branch information
@leejjoon
leejjoon committed Aug 30, 2012
commit 1d80e7fe78d3b3ad56d9a5db0c18c027a54e815b
15 changes: 9 additions & 6 deletions lib/matplotlib/figure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1422,17 +1422,20 @@ def tight_layout(self, renderer=None, pad=1.08, h_pad=None, w_pad=None, rect=Non
labels) will fit into. Default is (0, 0, 1, 1).
"""

from tight_layout import get_renderer, get_tight_layout_figure, \
get_subplotspec_list
from tight_layout import (get_renderer, get_tight_layout_figure,
get_subplotspec_list)

if None in get_subplotspec_list(self.axes):
warnings.warn("tight_layout can only process Axes that descend "
"from SubplotBase; results might be incorrect.")
subplotspec_list = get_subplotspec_list(self.axes)
if None in subplotspec_list:
warnings.warn("This figure includes Axes that are not "
"compatible with tight_layout, so its "
"results might be incorrect.")

if renderer is None:
renderer = get_renderer(self)

kwargs = get_tight_layout_figure(self, self.axes, renderer,
kwargs = get_tight_layout_figure(self, self.axes, subplotspec_list,
renderer,
pad=pad, h_pad=h_pad, w_pad=w_pad,
rect=rect)

Expand Down
33 changes: 18 additions & 15 deletions lib/matplotlib/tight_layout.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,25 +218,24 @@ def get_subplotspec_list(axes_list):
"""
subplotspec_list = []
for ax in axes_list:
locator = ax.get_axes_locator()
if hasattr(locator, "get_subplotspec"):
subplotspec = locator.get_subplotspec().get_topmost_subplotspec()
elif hasattr(ax, "get_subplotspec"):
subplotspec = ax.get_subplotspec().get_topmost_subplotspec()
axes_or_locator = ax.get_axes_locator()
if axes_or_locator is None:
axes_or_locator = ax

if hasattr(axes_or_locator, "get_subplotspec"):
subplotspec = axes_or_locator.get_subplotspec()
subplotspec = subplotspec.get_topmost_subplotspec()
if subplotspec.get_gridspec().locally_modified_subplot_params():
subplotspec = None
else:
subplotspec = None

if subplotspec is not None and \
subplotspec.get_gridspec().locally_modified_subplot_params():

subplotspec = None

subplotspec_list.append(subplotspec)

return subplotspec_list


def get_tight_layout_figure(fig, axes_list, renderer,
def get_tight_layout_figure(fig, axes_list, subplotspec_list, renderer,
pad=1.08, h_pad=None, w_pad=None, rect=None):
"""
Return subplot parameters for tight-layouted-figure with specified
Expand All @@ -248,6 +247,9 @@ def get_tight_layout_figure(fig, axes_list, renderer,

*axes_list* : a list of axes

*subplotspec_list* : a list of subplotspec associated with each
axes in axes_list

*renderer* : renderer instance

*pad* : float
Expand All @@ -265,7 +267,6 @@ def get_tight_layout_figure(fig, axes_list, renderer,
"""


subplotspec_list = []
subplot_list = []
nrows_list = []
ncols_list = []
Expand All @@ -275,8 +276,10 @@ def get_tight_layout_figure(fig, axes_list, renderer,
# same subplot_interface (e.g, axes_grid1). Thus
# we need to join them together.

subplotspec_list2 = []

for ax, subplotspec in zip(axes_list,
get_subplotspec_list(axes_list)):
subplotspec_list):
if subplotspec is None:
continue

762F Expand All @@ -286,7 +289,7 @@ def get_tight_layout_figure(fig, axes_list, renderer,
myrows, mycols, _, _ = subplotspec.get_geometry()
nrows_list.append(myrows)
ncols_list.append(mycols)
subplotspec_list.append(subplotspec)
subplotspec_list2.append(subplotspec)
subplot_list.append(subplots)
ax_bbox_list.append(subplotspec.get_position(fig))

Expand All @@ -296,7 +299,7 @@ def get_tight_layout_figure(fig, axes_list, renderer,
max_ncols = max(ncols_list)

num1num2_list = []
for subplotspec in subplotspec_list:
for subplotspec in subplotspec_list2:
rows, cols, num1, num2 = subplotspec.get_geometry()
div_row, mod_row = divmod(max_nrows, rows)
div_col, mod_col = divmod(max_ncols, cols)
Expand Down
0