Merge pull request matplotlib#5997 from QuLogic/example-defaults

Use new defaults more often in examples

Author: tacaswell

examples/api/collections_demo.py

@@ -38,9 +38,9 @@
 yo = rs.randn(npts)
 xyo = list(zip(xo, yo))
 
-# Make a list of colors cycling through the rgbcmyk series.
+# Make a list of colors cycling through the default series.
 colors = [colorConverter.to_rgba(c)
-          for c in ('r', 'g', 'b', 'c', 'y', 'm', 'k')]
+          for c in plt.rcParams['axes.prop_cycle'].by_key()['color']]
 
 fig, axes = plt.subplots(2, 2)
 ((ax1, ax2), (ax3, ax4)) = axes  # unpack the axes

examples/api/filled_step.py

@@ -172,7 +172,7 @@ def stack_hist(ax, stacked_data, sty_cycle, bottoms=None,
 hist_func = partial(np.histogram, bins=edges)
 
 # set up style cycles
-color_cycle = cycler('facecolor', 'rgbm')
+color_cycle = cycler(facecolor=plt.rcParams['axes.prop_cycle'][:4])
 label_cycle = cycler('label', ['set {n}'.format(n=n) for n in range(4)])
 hatch_cycle = cycler('hatch', ['/', '*', '+', '|'])
 

examples/pie_and_polar_charts/polar_bar_demo.py

@@ -15,7 +15,7 @@
 
 # Use custom colors and opacity
 for r, bar in zip(radii, bars):
-    bar.set_facecolor(plt.cm.jet(r / 10.))
+    bar.set_facecolor(plt.cm.viridis(r / 10.))
     bar.set_alpha(0.5)
 
 plt.show()

examples/pylab_examples/anchored_artists.py

@@ -27,7 +27,7 @@ def __init__(self, transform, size, label, loc,
         sep in points.
         """
         self.size_bar = AuxTransformBox(transform)
-        self.size_bar.add_artist(Rectangle((0, 0), size, 0, fc="none"))
+        self.size_bar.add_artist(Rectangle((0, 0), size, 0, fc="none", lw=1.0))
 
         self.txt_label = TextArea(label, minimumdescent=False)
 

examples/pylab_examples/axes_props.py

@@ -19,7 +19,7 @@
     line.set_linewidth(3)
 
 for line in gridlines:
-    line.set_linestyle('-')
+    line.set_linestyle('-.')
 
 for label in ticklabels:
     label.set_color('r')

examples/pylab_examples/axhspan_demo.py

@@ -6,7 +6,7 @@
 
 plt.plot(t, s)
 # draw a thick red hline at y=0 that spans the xrange
-l = plt.axhline(linewidth=4, color='r')
+l = plt.axhline(linewidth=8, color='#d62728')
 
 # draw a default hline at y=1 that spans the xrange
 l = plt.axhline(y=1)
@@ -16,15 +16,15 @@
 
 # draw a thick blue vline at x=0 that spans the upper quadrant of
 # the yrange
-l = plt.axvline(x=0, ymin=0.75, linewidth=4, color='b')
+l = plt.axvline(x=0, ymin=0.75, linewidth=8, color='#1f77b4')
 
 # draw a default hline at y=.5 that spans the middle half of
 # the axes
 l = plt.axhline(y=.5, xmin=0.25, xmax=0.75)
 
 p = plt.axhspan(0.25, 0.75, facecolor='0.5', alpha=0.5)
 
-p = plt.axvspan(1.25, 1.55, facecolor='g', alpha=0.5)
+p = plt.axvspan(1.25, 1.55, facecolor='#2ca02c', alpha=0.5)
 
 plt.axis([-1, 2, -1, 2])
 

examples/pylab_examples/bar_stacked.py

@@ -12,7 +12,7 @@
 ind = np.arange(N)    # the x locations for the groups
 width = 0.35       # the width of the bars: can also be len(x) sequence
 
-p1 = plt.bar(ind, menMeans, width, yerr=menStd)
+p1 = plt.bar(ind, menMeans, width, color='#d62728', yerr=menStd)
 p2 = plt.bar(ind, womenMeans, width,
              bottom=menMeans, yerr=womenStd)
 

examples/pylab_examples/cohere_demo.py

@@ -22,7 +22,7 @@
 s2 = 0.01*np.sin(2*np.pi*10*t) + cnse2
 
 plt.subplot(211)
-plt.plot(t, s1, 'b-', t, s2, 'g-')
+plt.plot(t, s1, t, s2)
 plt.xlim(0, 5)
 plt.xlabel('time')
 plt.ylabel('s1 and s2')

examples/pylab_examples/color_by_yvalue.py

@@ -13,5 +13,5 @@
 slower = np.ma.masked_where(s > lower, s)
 smiddle = np.ma.masked_where(np.logical_or(s < lower, s > upper), s)
 
-plt.plot(t, slower, 'r', t, smiddle, 'b', t, supper, 'g')
+plt.plot(t, smiddle, t, slower, t, supper)
 plt.show()

examples/pylab_examples/csd_demo.py

@@ -22,7 +22,7 @@
 s2 = 0.01*np.sin(2*np.pi*10*t) + cnse2
 
 plt.subplot(211)
-plt.plot(t, s1, 'b-', t, s2, 'g-')
+plt.plot(t, s1, t, s2)
 plt.xlim(0, 5)
 plt.xlabel('time')
 plt.ylabel('s1 and s2')