Merge pull request #13391 from dstansby/ex-remove-colours

jklymak · web-flow · commit bd99dfb8da74 · 2019-02-08T19:36:27.000-08:00
Remove colour specification from some examples
diff --git a/examples/event_handling/legend_picking.py b/examples/event_handling/legend_picking.py
@@ -14,8 +14,8 @@
 
 fig, ax = plt.subplots()
 ax.set_title('Click on legend line to toggle line on/off')
-line1, = ax.plot(t, y1, lw=2, color='red', label='1 HZ')
-line2, = ax.plot(t, y2, lw=2, color='blue', label='2 HZ')
+line1, = ax.plot(t, y1, lw=2, label='1 HZ')
+line2, = ax.plot(t, y2, lw=2, label='2 HZ')
 leg = ax.legend(loc='upper left', fancybox=True, shadow=True)
 leg.get_frame().set_alpha(0.4)
 
diff --git a/examples/misc/bbox_intersect.py b/examples/misc/bbox_intersect.py
@@ -18,7 +18,8 @@
 
 
 left, bottom, width, height = (-1, -1, 2, 2)
-rect = plt.Rectangle((left, bottom), width, height, facecolor="#aaaaaa")
+rect = plt.Rectangle((left, bottom), width, height,
+                     facecolor="black", alpha=0.1)
 
 fig, ax = plt.subplots()
 ax.add_patch(rect)
diff --git a/examples/misc/demo_ribbon_box.py b/examples/misc/demo_ribbon_box.py
@@ -1,7 +1,7 @@
 """
-===============
-Demo Ribbon Box
-===============
+==========
+Ribbon Box
+==========
 
 """
 
diff --git a/examples/mplot3d/hist3d.py b/examples/mplot3d/hist3d.py
@@ -31,6 +31,6 @@
 dx = dy = 0.5 * np.ones_like(zpos)
 dz = hist.ravel()
 
-ax.bar3d(xpos, ypos, zpos, dx, dy, dz, color='b', zsort='average')
+ax.bar3d(xpos, ypos, zpos, dx, dy, dz, zsort='average')
 
 plt.show()
diff --git a/examples/mplot3d/scatter3d.py b/examples/mplot3d/scatter3d.py
@@ -30,11 +30,11 @@ def randrange(n, vmin, vmax):
 
 # For each set of style and range settings, plot n random points in the box
 # defined by x in [23, 32], y in [0, 100], z in [zlow, zhigh].
-for c, m, zlow, zhigh in [('r', 'o', -50, -25), ('b', '^', -30, -5)]:
+for m, zlow, zhigh in [('o', -50, -25), ('^', -30, -5)]:
     xs = randrange(n, 23, 32)
     ys = randrange(n, 0, 100)
     zs = randrange(n, zlow, zhigh)
-    ax.scatter(xs, ys, zs, c=c, marker=m)
+    ax.scatter(xs, ys, zs, marker=m)
 
 ax.set_xlabel('X Label')
 ax.set_ylabel('Y Label')
diff --git a/examples/mplot3d/surface3d_2.py b/examples/mplot3d/surface3d_2.py
@@ -24,6 +24,6 @@
 z = 10 * np.outer(np.ones(np.size(u)), np.cos(v))
 
 # Plot the surface
-ax.plot_surface(x, y, z, color='b')
+ax.plot_surface(x, y, z)
 
 plt.show()
diff --git a/examples/pyplots/fig_axes_labels_simple.py b/examples/pyplots/fig_axes_labels_simple.py
@@ -1,7 +1,7 @@
 """
-======================
-Fig Axes Labels Simple
-======================
+==================
+Simple axes labels
+==================
 
 Label the axes of a plot.
 """
@@ -15,15 +15,14 @@
 ax1.set_title('a sine wave')
 
 t = np.arange(0.0, 1.0, 0.01)
-s = np.sin(2*np.pi*t)
-line, = ax1.plot(t, s, color='blue', lw=2)
+s = np.sin(2 * np.pi * t)
+line, = ax1.plot(t, s, lw=2)
 
 # Fixing random state for reproducibility
 np.random.seed(19680801)
 
 ax2 = fig.add_axes([0.15, 0.1, 0.7, 0.3])
-n, bins, patches = ax2.hist(np.random.randn(1000), 50,
-    facecolor='yellow', edgecolor='yellow')
+n, bins, patches = ax2.hist(np.random.randn(1000), 50)
 ax2.set_xlabel('time (s)')
 
 plt.show()
diff --git a/examples/pyplots/fig_x.py b/examples/pyplots/fig_x.py
@@ -1,20 +1,17 @@
 """
-=====
-Fig X
-=====
+=======================
+Adding lines to figures
+=======================
 
-Add lines to a figure (without axes).
+Adding lines to a figure without any axes.
 """
 import matplotlib.pyplot as plt
 import matplotlib.lines as lines
 
 
 fig = plt.figure()
-
 l1 = lines.Line2D([0, 1], [0, 1], transform=fig.transFigure, figure=fig)
-
 l2 = lines.Line2D([0, 1], [1, 0], transform=fig.transFigure, figure=fig)
-
 fig.lines.extend([l1, l2])
 
 plt.show()
diff --git a/examples/pyplots/whats_new_1_subplot3d.py b/examples/pyplots/whats_new_1_subplot3d.py
@@ -21,8 +21,8 @@
 X, Y = np.meshgrid(X, Y)
 R = np.sqrt(X**2 + Y**2)
 Z = np.sin(R)
-surf = ax.plot_surface(X, Y, Z, rstride=1, cstride=1, cmap=cm.jet,
-        linewidth=0, antialiased=False)
+surf = ax.plot_surface(X, Y, Z, rstride=1, cstride=1, cmap=cm.viridis,
+                       linewidth=0, antialiased=False)
 ax.set_zlim3d(-1.01, 1.01)
 
 #ax.w_zaxis.set_major_locator(LinearLocator(10))
diff --git a/examples/shapes_and_collections/artist_reference.py b/examples/shapes_and_collections/artist_reference.py
@@ -1,9 +1,9 @@
 """
 ================================
-Reference for matplotlib artists
+Reference for Matplotlib artists
 ================================
 
-This example displays several of matplotlib's graphics primitives (artists)
+This example displays several of Matplotlib's graphics primitives (artists)
 drawn using matplotlib API. A full list of artists and the documentation is
 available at :ref:`the artist API <artist-api>`.
 
diff --git a/examples/statistics/barchart_demo.py b/examples/statistics/barchart_demo.py
@@ -28,9 +28,9 @@
 
 fig, ax = plt.subplots()
 rects1 = ax.bar(ind - width/2, men_means, width, yerr=men_std,
-                color='SkyBlue', label='Men')
+                label='Men')
 rects2 = ax.bar(ind + width/2, women_means, width, yerr=women_std,
-                color='IndianRed', label='Women')
+                label='Women')
 
 # Add some text for labels, title and custom x-axis tick labels, etc.
 ax.set_ylabel('Scores')
@@ -53,7 +53,7 @@ def autolabel(rects, xpos='center'):
 
     for rect in rects:
         height = rect.get_height()
-        ax.text(rect.get_x() + rect.get_width()*offset[xpos], 1.01*height,
+        ax.text(rect.get_x() + rect.get_width() * offset[xpos], 1.01 * height,
                 '{}'.format(height), ha=ha[xpos], va='bottom')
 
 
@@ -130,7 +130,7 @@ def plot_student_results(student, scores, cohort_size):
 
     rects = ax1.barh(pos, [scores[k].percentile for k in testNames],
                      align='center',
-                     height=0.5, color='m',
+                     height=0.5,
                      tick_label=testNames)
 
     ax1.set_title(student.name)
@@ -186,13 +186,13 @@ def plot_student_results(student, scores, cohort_size):
             align = 'left'
         else:
             # Shift the text to the left side of the right edge
-            xloc = 0.98*width
+            xloc = 0.98 * width
             # White on magenta
             clr = 'white'
             align = 'right'
 
         # Center the text vertically in the bar
-        yloc = rect.get_y() + rect.get_height()/2.0
+        yloc = rect.get_y() + rect.get_height() / 2
         label = ax1.text(xloc, yloc, rankStr, horizontalalignment=align,
                          verticalalignment='center', color=clr, weight='bold',
                          clip_on=True)
@@ -208,12 +208,13 @@ def plot_student_results(student, scores, cohort_size):
             'perc_labels': rect_labels,
             'cohort_label': cohort_label}
 
+
 student = Student('Johnny Doe', 2, 'boy')
 scores = dict(zip(testNames,
                   (Score(v, p) for v, p in
                    zip(['7', '48', '12:52', '17', '14'],
                        np.round(np.random.uniform(0, 1,
-                                                  len(testNames))*100, 0)))))
+                                                  len(testNames)) * 100, 0)))))
 cohort_size = 62  # The number of other 2nd grade boys
 
 arts = plot_student_results(student, scores, cohort_size)
diff --git a/examples/statistics/histogram_multihist.py b/examples/statistics/histogram_multihist.py
@@ -1,7 +1,7 @@
 """
-=============================================================
-Demo of the histogram (hist) function with multiple data sets
-=============================================================
+=====================================================
+The histogram (hist) function with multiple data sets
+=====================================================
 
 Plot histogram with multiple sample sets and demonstrate:
 
diff --git a/examples/subplots_axes_and_figures/axes_margins.py b/examples/subplots_axes_and_figures/axes_margins.py
@@ -23,16 +23,16 @@ def f(t):
 
 ax1 = plt.subplot(212)
 ax1.margins(0.05)           # Default margin is 0.05, value 0 means fit
-ax1.plot(t1, f(t1), 'k')
+ax1.plot(t1, f(t1))
 
 ax2 = plt.subplot(221)
 ax2.margins(2, 2)           # Values >0.0 zoom out
-ax2.plot(t1, f(t1), 'r')
+ax2.plot(t1, f(t1))
 ax2.set_title('Zoomed out')
 
 ax3 = plt.subplot(222)
 ax3.margins(x=0, y=-0.25)   # Values in (-0.5, 0.0) zooms in to center
-ax3.plot(t1, f(t1), 'g')
+ax3.plot(t1, f(t1))
 ax3.set_title('Zoomed in')
 
 plt.show()
diff --git a/examples/text_labels_and_annotations/mathtext_demo.py b/examples/text_labels_and_annotations/mathtext_demo.py
@@ -11,7 +11,7 @@
 
 fig, ax = plt.subplots()
 
-ax.plot([1, 2, 3], 'r', label=r'$\sqrt{x^2}$')
+ax.plot([1, 2, 3], label=r'$\sqrt{x^2}$')
 ax.legend()
 
 ax.set_xlabel(r'$\Delta_i^j$', fontsize=20)
diff --git a/examples/text_labels_and_annotations/rainbow_text.py b/examples/text_labels_and_annotations/rainbow_text.py
@@ -5,7 +5,7 @@
 
 The example shows how to string together several text objects.
 
-HISTORY
+History
 -------
 On the matplotlib-users list back in February 2012, Gökhan Sever asked the
 following question:
diff --git a/examples/text_labels_and_annotations/usetex_demo.py b/examples/text_labels_and_annotations/usetex_demo.py
@@ -29,8 +29,8 @@
              xytext=(delta / 2., 0.1), textcoords='data',
              arrowprops=dict(arrowstyle="<->", connectionstyle="arc3"))
 plt.text(0, 0.1, r'$\delta$',
-         {'color': 'k', 'fontsize': 24, 'ha': 'center', 'va': 'center',
-          'bbox': dict(boxstyle="round", fc="w", ec="k", pad=0.2)})
+         {'color': 'black', 'fontsize': 24, 'ha': 'center', 'va': 'center',
+          'bbox': dict(boxstyle="round", fc="white", ec="black", pad=0.2)})
 
 # Use tex in labels
 plt.xticks((-1, 0, 1), ('$-1$', r'$\pm 0$', '$+1$'), color='k', size=20)
diff --git a/examples/ticks_and_spines/spines_bounds.py b/examples/ticks_and_spines/spines_bounds.py
@@ -16,8 +16,8 @@
 y2 = y + 0.1 * np.random.normal(size=x.shape)
 
 fig, ax = plt.subplots()
-ax.plot(x, y, 'k--')
-ax.plot(x, y2, 'ro')
+ax.plot(x, y)
+ax.plot(x, y2)
 
 # set ticks and tick labels
 ax.set_xlim((0, 2*np.pi))
diff --git a/examples/ticks_and_spines/ticklabels_rotation.py b/examples/ticks_and_spines/ticklabels_rotation.py
@@ -12,7 +12,7 @@
 y = [1, 4, 9, 6]
 labels = ['Frogs', 'Hogs', 'Bogs', 'Slogs']
 
-plt.plot(x, y, 'ro')
+plt.plot(x, y)
 # You can specify a rotation for the tick labels in degrees or with keywords.
 plt.xticks(x, labels, rotation='vertical')
 # Pad margins so that markers don't get clipped by the axes
diff --git a/examples/units/bar_unit_demo.py b/examples/units/bar_unit_demo.py
@@ -24,13 +24,12 @@
 
 ind = np.arange(N)    # the x locations for the groups
 width = 0.35         # the width of the bars
-p1 = ax.bar(ind, menMeans, width, color='r', bottom=0*cm, yerr=menStd)
+p1 = ax.bar(ind, menMeans, width, bottom=0*cm, yerr=menStd)
 
 
 womenMeans = (145*cm, 149*cm, 172*cm, 165*cm, 200*cm)
 womenStd = (30*cm, 25*cm, 20*cm, 31*cm, 22*cm)
-p2 = ax.bar(ind + width, womenMeans, width,
-            color='y', bottom=0*cm, yerr=womenStd)
+p2 = ax.bar(ind + width, womenMeans, width, bottom=0*cm, yerr=womenStd)
 
 ax.set_title('Scores by group and gender')
 ax.set_xticks(ind + width / 2)
diff --git a/examples/widgets/slider_demo.py b/examples/widgets/slider_demo.py
@@ -19,8 +19,8 @@
 a0 = 5
 f0 = 3
 delta_f = 5.0
-s = a0*np.sin(2*np.pi*f0*t)
-l, = plt.plot(t, s, lw=2, color='red')
+s = a0 * np.sin(2 * np.pi * f0 * t)
+l, = plt.plot(t, s, lw=2)
 plt.axis([0, 1, -10, 10])
 
 axcolor = 'lightgoldenrodyellow'
@@ -36,6 +36,8 @@ def update(val):
     freq = sfreq.val
     l.set_ydata(amp*np.sin(2*np.pi*freq*t))
     fig.canvas.draw_idle()
+
+
 sfreq.on_changed(update)
 samp.on_changed(update)
 
