Accept same types to errorevery as markevery by QuLogic · Pull Request #18556 · matplotlib/matplotlib · GitHub
Skip to content

Accept same types to errorevery as markevery #18556

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
tacaswell merged 2 commits into from
Sep 25, 2020
Merged

Accept same types to errorevery as markevery #18556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc9ae2f
Don't pass *markevery* to errorbar lines/caps.
QuLogic Sep 23, 2020
fda57b0
Accept same types to errorevery as markevery.
QuLogic Sep 24, 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
20 changes: 20 additions & 0 deletions doc/users/next_whats_new/errorbar_errorevery.rst
View file
Open in desktop
43 changes: 30 additions & 13 deletions lib/matplotlib/axes/_axes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import itertools
import logging
import math
from numbers import Number
from numbers import Integral, Number

import numpy as np
from numpy import ma
Expand Down Expand Up @@ -3147,17 +3147,6 @@ def errorbar(self, x, y, yerr=None, xerr=None,
kwargs = {k: v for k, v in kwargs.items() if v is not None}
kwargs.setdefault('zorder', 2)

try:
offset, errorevery = errorevery
except TypeError:
offset = 0

if errorevery < 1 or int(errorevery) != errorevery:
raise ValueError(
'errorevery must be positive integer or tuple of integers')
if int(offset) != offset:
raise ValueError("errorevery's starting index must be an integer")

self._process_unit_info([("x", x), ("y", y)], kwargs, convert=False)

# Make sure all the args are iterable; use lists not arrays to preserve
Expand All @@ -3179,6 +3168,33 @@ def errorbar(self, x, y, yerr=None, xerr=None,
if not np.iterable(yerr):
yerr = [yerr] * len(y)

if isinstance(errorevery, Integral):
errorevery = (0, errorevery)
if isinstance(errorevery, tuple):
if (len(errorevery) == 2 and
isinstance(errorevery[0], Integral) and
isinstance(errorevery[1], Integral)):
errorevery = slice(errorevery[0], None, errorevery[1])
else:
raise ValueError(
f'errorevery={errorevery!r} is a not a tuple of two '
f'integers')

elif isinstance(errorevery, slice):
pass

elif not isinstance(errorevery, str) and np.iterable(errorevery):
# fancy indexing
try:
x[errorevery]
except (ValueError, IndexError) as err:
raise ValueError(
f"errorevery={errorevery!r} is iterable but not a valid "
f"NumPy fancy index to match 'xerr'/'yerr'") from err
else:
raise ValueError(
f"errorevery={errorevery!r} is not a recognized value")

label = kwargs.pop("label", None)
kwargs['label'] = '_nolegend_'

Expand Down Expand Up @@ -3219,6 +3235,7 @@ def errorbar(self, x, y, yerr=None, xerr=None,
base_style.pop('markerfacecolor', None)
base_style.pop('markeredgewidth', None)
base_style.pop('markeredgecolor', None)
base_style.pop('markevery', None)
base_style.pop('linestyle', None)

# Make the style dict for the line collections (the bars).
Expand Down Expand Up @@ -3260,7 +3277,7 @@ def errorbar(self, x, y, yerr=None, xerr=None,
xuplims = np.broadcast_to(xuplims, len(x)).astype(bool)

everymask = np.zeros(len(x), bool)
everymask[offset::errorevery] = True
everymask[errorevery] = True

def apply_mask(arrays, mask):
# Return, for each array in *arrays*, the elements for which *mask*
Expand Down
42 changes: 40 additions & 2 deletions lib/matplotlib/tests/test_axes.py
View file
Open in desktop