allow numpy arrays in markevery

ImportanceOfBeingErnest · ImportanceOfBeingErnest · commit d047d138fa90 · 2020-05-02T15:30:43.000+02:00
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -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.
@@ -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
@@ -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):
         """
diff --git a/lib/matplotlib/tests/test_lines.py b/lib/matplotlib/tests/test_lines.py
@@ -199,6 +199,61 @@ 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))
+#
+#    casesA = [None, 4, (2, 5), [1, 5, 11],
+#              [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):
+#        ax.plot(t, y, "-gD", markevery=np.array(list(case)).astype(bool))
+#    fig_test.canvas.draw()
+#    fig_ref.canvas.draw()
+
+
+@check_figures_equal(extensions=('png',))
+def test_markevery_debug(fig_test, fig_ref):
+    """
+    This is just a debugging test - needs to be removed!!!!
+    """
+    t = np.arange(3)
+    y = np.array([1,3,2])
+
+    caseA = np.arange(len(t))[y > 1.5]
+    caseB = "011"
+
+    axsA = fig_ref.subplots()
+    axsB = fig_test.subplots()
+
+    lA, = axsA.plot(t, y, "-gD", markevery=caseA)
+    lA1, = axsA.plot(t, y+.5, "-gD", markevery=caseA)
+    me = np.array(list(caseB)).astype(bool)
+    me2 = np.arange(len(t))[me]
+    lB, = axsB.plot(t, y, "-gD", markevery=me)
+    lB1, = axsB.plot(t, y+.5, "-gD", markevery=me2)
+    
+    for ax in [axsA, axsB]:
+        ax.text(0.3, 1.6, f"{lA.get_markevery()}")
+        ax.text(0.3, 1.5, f"{lB.get_markevery()}")
+        ax.text(0.3, 1.2, f"{lA1.get_markevery()}")
+        ax.text(0.3, 1.1, f"{lB1.get_markevery()}")
+    fig_test.canvas.draw()
+    fig_ref.canvas.draw()
+
+
 def test_marker_as_markerstyle():
     fig, ax = plt.subplots()
     line, = ax.plot([2, 4, 3], marker=MarkerStyle("D"))
