Support and test for marker cycling

WeatherGod · WeatherGod · commit 8ce47972991d · 2015-08-17T12:43:34.000-04:00
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -593,6 +593,9 @@ def __call__(self, s):
         'markeredgewidth': validate_floatlist,
         'markeredgecolor': validate_colorlist,
         'alpha': validate_floatlist,
+        # No, this isn't a "property", but how long do you think it
+        # will be before someone requests support for cycling markers?
+        'marker': validate_stringlist,
     }
 _prop_aliases = {
         'c': 'color',
diff --git a/lib/matplotlib/tests/baseline_images/test_cycles/marker_cycle.png b/lib/matplotlib/tests/baseline_images/test_cycles/marker_cycle.png
diff --git a/lib/matplotlib/tests/test_cycles.py b/lib/matplotlib/tests/test_cycles.py
@@ -23,6 +23,25 @@ def test_colorcycle_basic():
     ax.legend(loc='upper left')
 
 
+@image_comparison(baseline_images=['marker_cycle'], remove_text=True,
+                  extensions=['png'])
+def test_marker_cycle():
+    fig = plt.figure()
+    ax = fig.add_subplot(111)
+    ax.set_prop_cycle(cycler('color', ['r', 'g', 'y']) +
+                      cycler('marker', ['.', '*', 'x']))
+    xs = np.arange(10)
+    ys = 0.25 * xs + 2
+    ax.plot(xs, ys, label='red dot', lw=4, ms=16)
+    ys = 0.45 * xs + 3
+    ax.plot(xs, ys, label='green star', lw=4, ms=16)
+    ys = 0.65 * xs + 4
+    ax.plot(xs, ys, label='yellow x', lw=4, ms=16)
+    ys = 0.85 * xs + 5
+    ax.plot(xs, ys, label='red2 dot', lw=4, ms=16)
+    ax.legend(loc='upper left')
+
+
 @image_comparison(baseline_images=['lineprop_cycle_basic'], remove_text=True,
                   extensions=['png'])
 def test_linestylecycle_basic():
