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

Show file tree
Hide file tree
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
Auto legend cleanup
  • Loading branch information
@lukelbd
lukelbd committed Sep 3, 2019
commit 00bd9ffdc3a59f4e6bd77ec5c5e58b4be06b380a
14 changes: 5 additions & 9 deletions proplot/axes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,8 @@ def __init__(self, *args, number=None,
self._altx_child = None
self._alty_parent = None
self._altx_parent = None
self._auto_colorbar = {} # stores plot handles for auto colorbar
self._auto_colorbar = {} # stores handles and kwargs for auto colorbar
self._auto_legend = {}
self._auto_colorbar_kw = {} # keyword args for auto colorbar()
self._auto_legend_kw = {}
# Axis sharing, new text attributes, custom formatting
self._spanx = spanx # boolean toggles, whether we want to span axes labels
self._spany = spany
Expand Down Expand Up @@ -210,14 +208,12 @@ def _draw_auto_legends_colorbars(self):
"""Generate automatic legends and colorbars. Wrapper funcs
let user add handles to location lists with successive calls to
make successive calls to plotting commands."""
for loc,handles in self._auto_colorbar.items():
self.colorbar(handles, **self._auto_colorbar_kw[loc])
for loc,handles in self._auto_legend.items():
self.legend(handles, **self._auto_legend_kw[loc])
for loc,(handles,kwargs) in self._auto_colorbar.items():
self.colorbar(handles, **kwargs)
for loc,(handles,kwargs) in self._auto_legend.items():
self.legend(handles, **kwargs)
self._auto_legend = {}
self._auto_colorbar = {}
self._auto_legend_kw = {}
self._auto_colorbar_kw = {}

def _get_side_axes(self, side):
"""Returns groups of axes in row or column or the single group in the
Expand Down
14 changes: 6 additions & 8 deletions proplot/wrappers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1589,31 +1589,29 @@ def cycle_wrapper(self, func, *args,
if not isinstance(loc, str):
raise ValueError(f'Invalid on-the-fly location {loc!r}. Must be a preset location. See Axes.colorbar')
if loc not in self._auto_colorbar:
self._auto_colorbar[loc] = []
self._auto_colorbar_kw[loc] = {}
self._auto_colorbar[loc].extend(objs)
self._auto_colorbar[loc] = ([], {})
self._auto_colorbar[loc][0].extend(objs)
# Add keywords
if loc != 'fill':
colorbar_kw.setdefault('loc', loc)
if label_leg:
colorbar_kw.setdefault('label', label_leg)
self._auto_colorbar_kw[loc].update(colorbar_kw)
self._auto_colorbar[loc][1].update(colorbar_kw)
if legend:
# Add handles
panel_kw.setdefault('mode', 'legend')
loc = self._loc_translate(legend, **panel_kw)
if not isinstance(loc, str):
raise ValueError(f'Invalid on-the-fly location {loc!r}. Must be a preset location. See Axes.legend')
if loc not in self._auto_legend:
self._auto_legend[loc] = []
self._auto_legend_kw[loc] = {}
self._auto_legend[loc].extend(objs)
self._auto_legend[loc] = ([], {})
self._auto_legend[loc][0].extend(objs)
# Add keywords
if loc != 'fill':
legend_kw.setdefault('loc', loc)
if label_leg:
legend_kw.setdefault('label', label_leg)
self._auto_legend_kw[loc].update(legend_kw)
self._auto_legend[loc][1].update(legend_kw)

# Return
# WARNING: Make sure plot always returns tuple of objects, and bar always
Expand Down