Skip to content

Remove PanelAxes class, remove panel references from "subplots()" #31

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
lukelbd merged 18 commits into from
Sep 5, 2019
Merged

Remove PanelAxes class, remove panel references from "subplots()" #31

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
506e636
Change existing gridspec when adding panels, instead of allotting zer…
lukelbd Sep 2, 2019
ace9794
Rearrange
lukelbd Sep 2, 2019
79b988f
Intermediate changes
lukelbd Sep 2, 2019
ba2ce6f
Merge branch 'master' into panels-change-gridspec
lukelbd Sep 2, 2019
bad8024
Remove PanelAxes, and remove 'panels' args from subplots()! Colorbar …
lukelbd Sep 3, 2019
aa4cccf
On-the-fly figure colorbars and legends!
lukelbd Sep 3, 2019
c264999
Return axes_grid of panels, fix _panels_kwargs bug
lukelbd Sep 3, 2019
088a537
Fix axes_grid docstring
lukelbd Sep 3, 2019
bf87d3a
Minor
lukelbd Sep 3, 2019
cfe7e66
axes_grid docstring
lukelbd Sep 3, 2019
3205230
Zoom attribute change
lukelbd Sep 3, 2019
00bd9ff
Auto legend cleanup
lukelbd Sep 3, 2019
25934db
Comments
lukelbd Sep 3, 2019
73dd02c
Better 'span' fig panel aliases
lukelbd Sep 3, 2019
7b6e4e0
Misc bugfixes and cleanup
lukelbd Sep 5, 2019
b8df9e1
Panels bugfix
lukelbd Sep 5, 2019
c67c3f8
Remove print statement
lukelbd Sep 5, 2019
5643867
Update documentation to reflect new colorbars, legends usage, add ins…
lukelbd Sep 5, 2019
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
Next Next commit
Return axes_grid of panels, fix _panels_kwargs bug
  • Loading branch information
@lukelbd
lukelbd committed Sep 3, 2019
commit c264999ee5c6ed6329d9d39905ee223430cd594b
14 changes: 6 additions & 8 deletions proplot/subplots.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,12 +209,8 @@ def __getattr__(self, attr):
def null_iterator(*args, **kwargs):
return None
return null_iterator
# Panels
if all(isinstance(_, (axes_grid, axes.Axes))
for _ in attrs):
return axes_grid(attrs)
# Objects
elif not any(callable(_) for _ in attrs):
if not any(callable(_) for _ in attrs):
if len(self) == 1:
return attrs[0]
else:
Expand All @@ -231,6 +227,8 @@ def axes_grid_iterator(*args, **kwargs):
return ret[0]
elif all(res is None for res in ret):
return None
elif all(isinstance(res, axes.Axes) for res in ret):
return axes_grid(ret, n=self._n, order=self._order)
else:
return ret
return axes_grid_iterator
Expand Down Expand Up @@ -752,7 +750,7 @@ def _add_axes_panel(self, ax, side, filled=False, **kwargs):
raise ValueError(f'Invalid side {side!r}.')
side = _side_translate[s]
share, width, space, space_orig = _panels_kwargs(s,
kwargs, filled=filled, figure=False)
filled=filled, figure=False, **kwargs)

# Get gridspec and subplotspec indices
subplotspec = ax.get_subplotspec()
Expand Down Expand Up @@ -798,8 +796,8 @@ def _add_figure_panel(self, side, span=None, **kwargs):
if s not in 'lrbt':
raise ValueError(f'Invalid side {side!r}.')
side = _side_translate[s]
_, width, space, space_orig = _panels_kwargs(s, kwargs,
filled=True, figure=True)
_, width, space, space_orig = _panels_kwargs(s,
filled=True, figure=True, **kwargs)

# Get props
subplots_kw = self._subplots_kw
Expand Down