doc: Use default colours in more examples.

QuLogic · QuLogic · commit 7a0647f54a59 · 2016-02-17T18:45:29.000-05:00
diff --git a/examples/api/collections_demo.py b/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
diff --git a/examples/api/filled_step.py b/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', ['/', '*', '+', '|'])
 
diff --git a/examples/pylab_examples/axhspan_demo.py b/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=4, 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=4, 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])
 
diff --git a/examples/pylab_examples/cohere_demo.py b/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')
diff --git a/examples/pylab_examples/color_by_yvalue.py b/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()
diff --git a/examples/pylab_examples/csd_demo.py b/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')
diff --git a/examples/pylab_examples/interp_demo.py b/examples/pylab_examples/interp_demo.py
@@ -9,5 +9,5 @@
 yi = stineman_interp(xi, x, y, yp)
 
 fig, ax = plt.subplots()
-ax.plot(x, y, 'ro', xi, yi, '-b.')
+ax.plot(x, y, 'o', xi, yi, '.')
 plt.show()
diff --git a/examples/pylab_examples/legend_demo5.py b/examples/pylab_examples/legend_demo5.py
@@ -52,7 +52,7 @@ def create_artists(self, legend, orig_handle,
 x = np.linspace(0, 5, 100)
 
 plt.figure()
-colors = ['red', 'orange', 'yellow', 'green', 'blue']
+colors = plt.rcParams['axes.prop_cycle'].by_key()['color'][:5]
 styles = ['solid', 'dashed', 'dashed', 'dashed', 'solid']
 lines = []
 for i, color, style in zip(range(5), colors, styles):
diff --git a/examples/pylab_examples/line_collection.py b/examples/pylab_examples/line_collection.py
@@ -30,7 +30,8 @@
 #          where onoffseq is an even length tuple of on and off ink in points.
 #          If linestyle is omitted, 'solid' is used
 # See matplotlib.collections.LineCollection for more information
-colors = [colorConverter.to_rgba(i) for i in 'bgrcmyk']
+colors = [colorConverter.to_rgba(c)
+          for c in plt.rcParams['axes.prop_cycle'].by_key()['color']]
 
 line_segments = LineCollection(segs, linewidths=(0.5, 1, 1.5, 2),
                                colors=colors, linestyle='solid')
diff --git a/examples/pylab_examples/masked_demo.py b/examples/pylab_examples/masked_demo.py
@@ -15,7 +15,7 @@
 ym1 = np.ma.masked_where(y1 > 0.5, y1)
 ym2 = np.ma.masked_where(y2 < -0.5, y2)
 
-lines = plt.plot(x, y, 'r', x, ym1, 'g', x, ym2, 'bo')
+lines = plt.plot(x, y, x, ym1, x, ym2, 'o')
 plt.setp(lines[0], linewidth=4)
 plt.setp(lines[1], linewidth=2)
 plt.setp(lines[2], markersize=10)
diff --git a/examples/pylab_examples/stem_plot.py b/examples/pylab_examples/stem_plot.py
@@ -3,7 +3,6 @@
 
 x = np.linspace(0.1, 2*np.pi, 10)
 markerline, stemlines, baseline = plt.stem(x, np.cos(x), '-.')
-plt.setp(markerline, 'markerfacecolor', 'b')
 plt.setp(baseline, 'color', 'r', 'linewidth', 2)
 
 plt.show()
diff --git a/examples/pylab_examples/stock_demo.py b/examples/pylab_examples/stock_demo.py
@@ -7,7 +7,7 @@
 d1, p1, d2, p2 = get_two_stock_data()
 
 fig, ax = plt.subplots()
-lines = plt.plot(d1, p1, 'bs', d2, p2, 'go')
+lines = plt.plot(d1, p1, 's', d2, p2, 'o')
 plt.xlabel('Days')
 plt.ylabel('Normalized price')
 plt.xlim(0, 3)
diff --git a/examples/pylab_examples/vline_hline_demo.py b/examples/pylab_examples/vline_hline_demo.py
@@ -20,12 +20,12 @@ def f(t):
 vax = fig.add_subplot(121)
 hax = fig.add_subplot(122)
 
-vax.plot(t, s + nse, 'b^')
+vax.plot(t, s + nse, '^')
 vax.vlines(t, [0], s)
 vax.set_xlabel('time (s)')
 vax.set_title('Vertical lines demo')
 
-hax.plot(s + nse, t, 'b^')
+hax.plot(s + nse, t, '^')
 hax.hlines(t, [0], s, lw=2)
 hax.set_xlabel('time (s)')
 hax.set_title('Horizontal lines demo')
