Skip to content

Allow numpy arrays in markevery #17276

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
merged 1 commit into from
Jun 3, 2020
Merged

Allow numpy arrays in markevery #17276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions lib/matplotlib/lines.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ def set_markevery(self, every):
Parameters
----------
every : None or int or (int, int) or slice or List[int] or float or \
(float, float)
(float, float) or List[bool]
Which markers to plot.

- every=None, every point will be plotted.
Expand All @@ -549,6 +549,8 @@ def set_markevery(self, every):
point start, up to but not including point end, will be plotted.
- every=[i, j, m, n], only markers at points i, j, m, and n
will be plotted.
- every=[True, False, True], positions that are True will be
plotted.
- every=0.1, (i.e. a float) then markers will be spaced at
approximately equal distances along the line; the distance
along the line between markers is determined by multiplying the
Expand Down Expand Up @@ -580,9 +582,8 @@ def set_markevery(self, every):
axes-bounding-box-diagonal regardless of the actual axes data limits.

"""
if self._markevery != every:
self.stale = True
self._markevery = every
self.stale = True

def get_markevery(self):
"""
Expand Down
24 changes: 24 additions & 0 deletions lib/matplotlib/tests/test_lines.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,30 @@ def test_step_markers(fig_test, fig_ref):
fig_ref.subplots().plot([0, 0, 1], [0, 1, 1], "-o", markevery=[0, 2])


@check_figures_equal(extensions=('png',))
def test_markevery(fig_test, fig_ref):
np.random.seed(42)
t = np.linspace(0, 3, 14)
y = np.random.rand(len(t))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Optional: There is no gain from random numbers here. You could just use y = t**2 or any other simple function.


casesA = [None, 4, (2, 5), [1, 5, 11],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this would be more readable:

    cases = [
        (None, "11111111111111"),
        (4, "10001000100010"),
        ...
    ]

    for ax_test, ax_ref, (markevery, pattern) in zip(axs_test, axs_ref, cases):
        ax_test.plot(t, y, "-gD", markevery=markevery)
        ax_ref.plot(t, y, "-gD",
                    markevery=np.array(list(pattern)).astype(int).astype(bool))

[0, -1], slice(5, 10, 2), 0.3, (0.3, 0.4),
np.arange(len(t))[y > 0.5]]
casesB = ["11111111111111", "10001000100010", "00100001000010",
"01000100000100", "10000000000001", "00000101010000",
"11011011011110", "01010011011101", "01110001110110"]

axsA = fig_ref.subplots(3, 3)
axsB = fig_test.subplots(3, 3)

for ax, case in zip(axsA.flat, casesA):
ax.plot(t, y, "-gD", markevery=case)

for ax, case in zip(axsB.flat, casesB):
me = np.array(list(case)).astype(int).astype(bool)
ax.plot(t, y, "-gD", markevery=me)


def test_marker_as_markerstyle():
fig, ax = plt.subplots()
line, = ax.plot([2, 4, 3], marker=MarkerStyle("D"))
Expand Down