Skip to content

Add the ability to save and load presets #24

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
Chilipp merged 11 commits into from
Jun 29, 2020
Merged

Add the ability to save and load presets #24

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6909873
minor
Chilipp Jun 18, 2020
1b283f5
add method to load presets
Chilipp Jun 18, 2020
4023e48
add saving presets
Chilipp Jun 18, 2020
a545df5
minor fix for creating directories
Chilipp Jun 18, 2020
547c3ce
update intersphinx_mapping
Chilipp Jun 18, 2020
b8f58d3
add preset parameter to plotmethod __call__
Chilipp Jun 18, 2020
0b1fb4a
add presets to command line
Chilipp Jun 18, 2020
9ab9c63
add presets section to docs
Chilipp Jun 18, 2020
79454a8
add presets to CHANGELOG
Chilipp Jun 18, 2020
c4cc90f
minor fix for tests
Chilipp Jun 19, 2020
b6c44ad
Add method to extract fmts from preset
Chilipp Jun 21, 2020
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
add preset parameter to plotmethod __call__
  • Loading branch information
@Chilipp
Chilipp committed Jun 18, 2020
commit b8f58d39dbe3e5fda6a16863b19ec3328527cf2b
21 changes: 19 additions & 2 deletions psyplot/project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ def _resolve_preset_path(preset, if_exists=True):
if osp.exists(osp.join(presets_dir, preset)):
return osp.join(presets_dir, preset)
elif osp.exists(osp.join(presets_dir, preset + '.yml')):
return osp.exists(osp.join(presets_dir, preset + '.yml'))
return osp.join(presets_dir, preset + '.yml')
else:
if if_exists:
raise ValueError(
Expand Down Expand Up @@ -477,7 +477,7 @@ def load_preset(self, preset: str, **kwargs):
if method.is_imported:
sp = getattr(self, pm)
if sp:
valid = method.plotter_cls._get_formatoptions()
valid = list(method.plotter_cls._get_formatoptions())
fmts = {key: val for key, val in defaults.items()
if key in valid}
fmts.update(pm_config.get(pm, {}))
Expand Down Expand Up @@ -613,6 +613,7 @@ def close(self, figs=True, data=False, ds=False, remove_only=False):
docstrings.delete_kwargs('ArrayList.from_dataset.other_parameters',
kwargs='kwargs')
docstrings.keep_params('xarray.open_mfdataset.parameters', 'concat_dim')
docstrings.keep_params('Project._load_preset.parameters', 'preset')

@_only_main
@docstrings.get_sectionsf('Project._add_data',
Expand Down Expand Up @@ -727,6 +728,7 @@ def _add_data(self, plotter_cls, filename_or_obj, fmt={}, make_plot=True,
else:
axes = iter(ax)
clear = clear or (isinstance(ax, tuple) and proj is not None)

for arr in sub_project:
plotter_cls(arr, make_plot=(not bool(share) and make_plot),
draw=False, ax=next(axes), clear=clear,
Expand Down Expand Up @@ -1884,6 +1886,7 @@ def __call__(self, *args, **kwargs):
Parameters
----------
%(ProjectPlotter._add_data.parameters.no_plotter_cls)s
%(Project._load_preset.parameters.preset)s

Other Parameters
----------------
Expand All @@ -1894,6 +1897,20 @@ def __call__(self, *args, **kwargs):
-------
%(ProjectPlotter._add_data.returns)s
"""
preset = kwargs.pop('preset', None)
if preset:
preset = self._project_plotter.project._load_preset(preset)
if len(args) >= 2:
fmt = args[1]
else:
fmt = kwargs.setdefault('fmt', {})
for key, val in preset.get(self._method, {}).items():
fmt.setdefault(key, val)
valid = list(self.plotter_cls._get_formatoptions())
for key, val in preset.items():
if key in valid:
fmt.setdefault(key, val)

return self._project_plotter._add_data(
self.plotter_cls, *args, **dict(chain(
[('prefer_list', self._prefer_list),
Expand Down