Skip to content

Minor fixes and internal improvements #325

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 5 commits into from
Feb 3, 2022
Merged

Minor fixes and internal improvements #325

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a670af1
Support colorbar edgefix in non-PlotAxes
lukelbd Jan 31, 2022
29db0b9
Update pre-commit revisions
lukelbd Feb 3, 2022
981ed04
Fix issue translating 'autoextent' to 'extent'
lukelbd Feb 3, 2022
9b98eff
Cleanup and rename private methods
lukelbd Feb 3, 2022
275bf30
Disable hexbin/hist/hist2d autoreverse (fix #334)
lukelbd Feb 3, 2022
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
Disable hexbin/hist/hist2d autoreverse (fix #334)
  • Loading branch information
@lukelbd
lukelbd committed Feb 3, 2022
commit 275bf30b74aba6ddd9573398ebab1f252e467bf3
6 changes: 5 additions & 1 deletion WHATSNEW.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,11 @@ Bug fixes
arrays to plotting methods (:issue:`320`).
* Fix issue where list-of-string colors passed to `~proplot.axes.Axes.scatter`
are interpreted as data values (:issue:`316`).
* Fix issue where settings passed to `~proplot.axes.Axes.colorbar` after e.g.
* Fix issue where *x* and *y* axis limits are reversed when passing to
`~matplotlib.axes.Axes.hexbin` and `~matplotlib.axes.Axes.hist2d` (:issue:`334`).
* Fix regression where *x* or *y* axis limits are reversed when passing to
`~matplotlib.axes.Axes.hist` and `~matplotlib.axes.Axes.histh` (:issue:`334`).
* Fix issue where settings passed to `~proplot.axes.Axes.colorbar` after calling e.g.
`~proplot.axes.PlotAxes.pcolor` with `colorbar_kw` are ignored (:issue:`314`).
* Fix issues where passing the colorbar `orientation` without a `loc`, or using a non-
standard `orientation` for a given `loc`, triggers tickloc error (:issue:`314`).
Expand Down
31 changes: 21 additions & 10 deletions proplot/axes/plot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3010,7 +3010,9 @@ def parametric(self, x, y, c, *, interp=0, scalex=True, scaley=True, **kwargs):
kw.update(_pop_props(kw, 'collection'))
kw, extents = self._inbounds_extent(**kw)
label = _not_none(**{key: kw.pop(key, None) for key in ('label', 'value')})
x, y, kw = self._parse_1d_args(x, y, autovalues=True, autoreverse=False, values=c, **kw) # noqa: E501
x, y, kw = self._parse_1d_args(
x, y, values=c, autovalues=True, autoreverse=False, **kw
)
c = kw.pop('values', None) # permits auto-inferring values
c = np.arange(y.size) if c is None else inputs._to_numpy_array(c)
if (
Expand Down Expand Up @@ -3458,14 +3460,18 @@ def pie(self, x, explode, *, labelpad=None, labeldistance=None, **kwargs):
"""
kw = kwargs.copy()
pad = _not_none(labeldistance=labeldistance, labelpad=labelpad, default=1.15)
props = _pop_props(kw, 'patch')
wedge_kw = kw.pop('wedgeprops', None) or {}
wedge_kw.update(_pop_props(kw, 'patch'))
edgefix_kw = _pop_params(kw, self._fix_patch_edges)
_, x, kw = self._parse_1d_args(x, autox=False, autoy=False, **kw)
_, x, kw = self._parse_1d_args(
x, autox=False, autoy=False, autoreverse=False, **kw
)
kw = self._parse_cycle(x.size, **kw)
kw['labeldistance'] = pad
objs = self._call_native('pie', x, explode, wedgeprops=props, **kw)
objs = self._call_native(
'pie', x, explode, labeldistance=pad, wedgeprops=wedge_kw, **kw
)
objs = tuple(cbook.silent_list(type(seq[0]).__name__, seq) for seq in objs)
self._fix_patch_edges(objs[0], **edgefix_kw, **props)
self._fix_patch_edges(objs[0], **edgefix_kw, **wedge_kw)
return objs

@staticmethod
Expand Down Expand Up @@ -3735,7 +3741,9 @@ def _apply_hist(
# adds them to the first elements in the container for each column
# of the input data. Make sure that legend() will read both containers
# and individual items inside those containers.
_, xs, kw = self._parse_1d_args(xs, orientation=orientation, **kwargs)
_, xs, kw = self._parse_1d_args(
xs, autoreverse=False, orientation=orientation, **kwargs
)
fill = _not_none(fill=fill, filled=filled)
stack = _not_none(stack=stack, stacked=stacked)
if fill is not None:
Expand Down Expand Up @@ -3793,10 +3801,10 @@ def hist2d(self, x, y, bins, **kwargs):
"""
%(plot.hist2d)s
"""
# Rely on pcolormesh() override for this.
# Rely on the pcolormesh() override for this.
if bins is not None:
kwargs['bins'] = bins
return super().hist2d(x, y, default_discrete=False, **kwargs)
return super().hist2d(x, y, autoreverse=False, default_discrete=False, **kwargs)

# WARNING: breaking change from native 'C'
@inputs._preprocess_or_redirect('x', 'y', 'weights')
Expand All @@ -3809,7 +3817,10 @@ def hexbin(self, x, y, weights, **kwargs):
# WARNING: Cannot use automatic level generation here until counts are
# estimated. Inside _parse_level_vals if no manual levels were provided then
# _parse_level_num is skipped and args like levels=10 or locator=5 are ignored
x, y, kw = self._parse_1d_args(x, y, autovalues=True, **kwargs)
kw = kwargs.copy()
x, y, kw = self._parse_1d_args(
x, y, autoreverse=False, autovalues=True, **kw
)
kw.update(_pop_props(kw, 'collection')) # takes LineCollection props
kw = self._parse_cmap(x, y, y, skip_autolev=True, default_discrete=False, **kw)
norm = kw.get('norm', None)
Expand Down