Merge pull request matplotlib#3384 from cimarronm/test_marker_styles

TST : Test marker styles

Author: tacaswell

lib/matplotlib/tests/baseline_images/test_axes/marker_styles.png

@@ -532,14 +532,14 @@ def test_nonfinite_limits():
 @image_comparison(baseline_images=['imshow'],
                   remove_text=True)
 def test_imshow():
-    #Create a NxN image
+    # Create a NxN image
     N = 100
     (x, y) = np.indices((N, N))
     x -= N//2
     y -= N//2
     r = np.sqrt(x**2+y**2-x*y)
 
-    #Create a contour plot at N/4 and extract both the clip path and transform
+    # Create a contour plot at N/4 and extract both the clip path and transform
     fig = plt.figure()
     ax = fig.add_subplot(111)
 
@@ -550,14 +550,14 @@ def test_imshow():
 def test_imshow_clip():
     # As originally reported by Gellule Xg <[email protected]>
 
-    #Create a NxN image
+    # Create a NxN image
     N = 100
     (x, y) = np.indices((N, N))
     x -= N//2
     y -= N//2
     r = np.sqrt(x**2+y**2-x*y)
 
-    #Create a contour plot at N/4 and extract both the clip path and transform
+    # Create a contour plot at N/4 and extract both the clip path and transform
     fig = plt.figure()
     ax = fig.add_subplot(111)
 
@@ -569,7 +569,7 @@ def test_imshow_clip():
     from matplotlib.transforms import TransformedPath
     clip_path = TransformedPath(clipPath, clipTransform)
 
-    #Plot the image clipped by the contour
+    # Plot the image clipped by the contour
     ax.imshow(r, clip_path=clip_path)
 
 
@@ -851,12 +851,12 @@ def test_markevery_line():
                   remove_text=True)
 def test_markevery_linear_scales():
     cases = [None,
-         8,
-         (30, 8),
-         [16, 24, 30], [0,-1],
-         slice(100, 200, 3),
-         0.1, 0.3, 1.5,
-         (0.0, 0.1), (0.45, 0.1)]
+             8,
+             (30, 8),
+             [16, 24, 30], [0, -1],
+             slice(100, 200, 3),
+             0.1, 0.3, 1.5,
+             (0.0, 0.1), (0.45, 0.1)]
 
     cols = 3
     gs = matplotlib.gridspec.GridSpec(len(cases) // cols + 1, cols)
@@ -872,16 +872,17 @@ def test_markevery_linear_scales():
         plt.title('markevery=%s' % str(case))
         plt.plot(x, y, 'o', ls='-', ms=4,  markevery=case)
 
+
 @image_comparison(baseline_images=['markevery_linear_scales_zoomed'],
                   remove_text=True)
 def test_markevery_linear_scales_zoomed():
     cases = [None,
-         8,
-         (30, 8),
-         [16, 24, 30], [0,-1],
-         slice(100, 200, 3),
-         0.1, 0.3, 1.5,
-         (0.0, 0.1), (0.45, 0.1)]
+             8,
+             (30, 8),
+             [16, 24, 30], [0, -1],
+             slice(100, 200, 3),
+             0.1, 0.3, 1.5,
+             (0.0, 0.1), (0.45, 0.1)]
 
     cols = 3
     gs = matplotlib.gridspec.GridSpec(len(cases) // cols + 1, cols)
@@ -904,12 +905,12 @@ def test_markevery_linear_scales_zoomed():
                   remove_text=True)
 def test_markevery_log_scales():
     cases = [None,
-         8,
-         (30, 8),
-         [16, 24, 30], [0,-1],
-         slice(100, 200, 3),
-         0.1, 0.3, 1.5,
-         (0.0, 0.1), (0.45, 0.1)]
+             8,
+             (30, 8),
+             [16, 24, 30], [0, -1],
+             slice(100, 200, 3),
+             0.1, 0.3, 1.5,
+             (0.0, 0.1), (0.45, 0.1)]
 
     cols = 3
     gs = matplotlib.gridspec.GridSpec(len(cases) // cols + 1, cols)
@@ -927,16 +928,17 @@ def test_markevery_log_scales():
         plt.yscale('log')
         plt.plot(x, y, 'o', ls='-', ms=4,  markevery=case)
 
+
 @image_comparison(baseline_images=['markevery_polar'],
                   remove_text=True)
 def test_markevery_polar():
     cases = [None,
-         8,
-         (30, 8),
-         [16, 24, 30], [0,-1],
-         slice(100, 200, 3),
-         0.1, 0.3, 1.5,
-         (0.0, 0.1), (0.45, 0.1)]
+             8,
+             (30, 8),
+             [16, 24, 30], [0, -1],
+             slice(100, 200, 3),
+             0.1, 0.3, 1.5,
+             (0.0, 0.1), (0.45, 0.1)]
 
     cols = 3
     gs = matplotlib.gridspec.GridSpec(len(cases) // cols + 1, cols)
@@ -947,7 +949,7 @@ def test_markevery_polar():
     for i, case in enumerate(cases):
         row = (i // cols)
         col = i % cols
-        plt.subplot(gs[row, col], polar = True)
+        plt.subplot(gs[row, col], polar=True)
         plt.title('markevery=%s' % str(case))
         plt.plot(theta, r, 'o', ls='-', ms=4,  markevery=case)
 
@@ -988,7 +990,6 @@ def test_hist_steplog():
     ax = plt.subplot(4, 1, 2)
     plt.hist(data_pos, 100, histtype='stepfilled', log=True)
 
-
     ax = plt.subplot(4, 1, 3)
     plt.hist(data, 100, weights=weights, histtype='stepfilled', log=True)
 
@@ -1040,7 +1041,7 @@ def test_contour_colorbar():
 @image_comparison(baseline_images=['hist2d'])
 def test_hist2d():
     np.random.seed(0)
-    #make it not symetric in case we switch x and y axis
+    # make it not symetric in case we switch x and y axis
     x = np.random.randn(100)*2+5
     y = np.random.randn(100)-2
     fig = plt.figure()
@@ -1051,8 +1052,8 @@ def test_hist2d():
 @image_comparison(baseline_images=['hist2d_transpose'])
 def test_hist2d_transpose():
     np.random.seed(0)
-    #make sure the the output from np.histogram is transposed before
-    #passing to pcolorfast
+    # make sure the the output from np.histogram is transposed before
+    # passing to pcolorfast
     x = np.array([5]*100)
     y = np.random.randn(100)-2
     fig = plt.figure()
@@ -1601,6 +1602,7 @@ def test_boxplot_bad_medians_1():
     fig, ax = plt.subplots()
     assert_raises(ValueError, ax.boxplot, x,  usermedians=[1, 2])
 
+
 @cleanup
 def test_boxplot_bad_medians_2():
     x = np.linspace(-7, 7, 140)
@@ -1808,7 +1810,7 @@ def test_manage_xticks():
     np.random.seed(0)
     y1 = np.random.normal(10, 3, 20)
     y2 = np.random.normal(3, 1, 20)
-    ax.boxplot([y1, y2], positions = [1,2],
+    ax.boxplot([y1, y2], positions=[1, 2],
                manage_xticks=False)
     new_xlim = ax.get_xlim()
     assert_array_equal(old_xlim, new_xlim)
@@ -2192,6 +2194,16 @@ def test_empty_eventplot():
     plt.draw()
 
 
+@image_comparison(baseline_images=['marker_styles'], extensions=['png'], remove_text=True)
+def test_marker_styles():
+    fig = plt.figure()
+    ax = fig.add_subplot(111)
+    for y, marker in enumerate(sorted(matplotlib.markers.MarkerStyle.markers.keys(),
+                                      key=lambda x: str(type(x))+str(x))):
+        ax.plot((y % 2)*5 + np.arange(10)*10, np.ones(10)*10*y, linestyle='', marker=marker,
+                markersize=10+y/5, label=marker)
+
+
 @image_comparison(baseline_images=['vertex_markers'], extensions=['png'],
                   remove_text=True)
 def test_vertex_markers():
@@ -3251,7 +3263,7 @@ def test_vline_limit():
 
 @cleanup
 def test_empty_shared_subplots():
-    #empty plots with shared axes inherit limits from populated plots
+    # empty plots with shared axes inherit limits from populated plots
     fig, axes = plt.subplots(nrows=1, ncols=2, sharex=True, sharey=True)
     axes[0].plot([1, 2, 3], [2, 4, 6])
     x0, x1 = axes[1].get_xlim()
@@ -3305,7 +3317,7 @@ def test_pie_linewidth_0():
     labels = 'Frogs', 'Hogs', 'Dogs', 'Logs'
     sizes = [15, 30, 45, 10]
     colors = ['yellowgreen', 'gold', 'lightskyblue', 'lightcoral']
-    explode = (0, 0.1, 0, 0) # only "explode" the 2nd slice (i.e. 'Hogs')
+    explode = (0, 0.1, 0, 0)  # only "explode" the 2nd slice (i.e. 'Hogs')
 
     plt.pie(sizes, explode=explode, labels=labels, colors=colors,
             autopct='%1.1f%%', shadow=True, startangle=90,
@@ -3320,7 +3332,7 @@ def test_pie_linewidth_2():
     labels = 'Frogs', 'Hogs', 'Dogs', 'Logs'
     sizes = [15, 30, 45, 10]
     colors = ['yellowgreen', 'gold', 'lightskyblue', 'lightcoral']
-    explode = (0, 0.1, 0, 0) # only "explode" the 2nd slice (i.e. 'Hogs')
+    explode = (0, 0.1, 0, 0)  # only "explode" the 2nd slice (i.e. 'Hogs')
 
     plt.pie(sizes, explode=explode, labels=labels, colors=colors,
             autopct='%1.1f%%', shadow=True, startangle=90,
@@ -3335,14 +3347,15 @@ def test_pie_ccw_true():
     labels = 'Frogs', 'Hogs', 'Dogs', 'Logs'
     sizes = [15, 30, 45, 10]
     colors = ['yellowgreen', 'gold', 'lightskyblue', 'lightcoral']
-    explode = (0, 0.1, 0, 0) # only "explode" the 2nd slice (i.e. 'Hogs')
+    explode = (0, 0.1, 0, 0)  # only "explode" the 2nd slice (i.e. 'Hogs')
 
     plt.pie(sizes, explode=explode, labels=labels, colors=colors,
             autopct='%1.1f%%', shadow=True, startangle=90,
             counterclock=True)
     # Set aspect ratio to be equal so that pie is drawn as a circle.
     plt.axis('equal')
 
+
 @cleanup
 def test_margins():
     # test all ways margins can be called
@@ -3363,6 +3376,7 @@ def test_margins():
     ax3.margins(x=1, y=0.5)
     assert_equal(ax3.margins(), (1, 0.5))
 
+
 @cleanup
 def test_pathological_hexbin():
     # issue #2863