FIX: made style smaller, fixed formatting, changed cycle order

jklymak · jklymak · commit 39d276f7484f · 2021-03-16T13:56:43.000-07:00
diff --git a/lib/matplotlib/mpl-data/stylelib/cheatsheet_gallery.mplstyle b/lib/matplotlib/mpl-data/stylelib/cheatsheet_gallery.mplstyle
@@ -1,23 +1,8 @@
 # from the Matplotlib cheatsheet as used in our gallery:
 
-
-axes.facecolor: white
-axes.edgecolor: black
-axes.linewidth: 1.0
 axes.grid: True
-axes.axisbelow: True       # grid/ticks are below elements (e.g., lines, text)
-
-xtick.color: 555555
-xtick.direction: out
-
-ytick.color: 555555
-ytick.direction: out
-
-grid.color: b0b0b0
-grid.linewidth: 0.7
-grid.linestyle: -    # solid line
+axes.axisbelow: True
 
-figure.facecolor: white
 figure.figsize: 2, 2
 # make it so the axes labels don't show up.  Obviously 
 # not good style for any quantitative analysis:
@@ -26,3 +11,6 @@ figure.subplot.right: 0.99
 figure.subplot.bottom: 0.01
 figure.subplot.top: 0.99
 
+# colors:
+image.cmap    : Oranges
+axes.prop_cycle : cycler('color', ['ff7f0e', '1f77b4', '2ca02c'])
diff --git a/plot_types/A_basic/a_plot.py b/plot_types/A_basic/a_plot.py
@@ -15,9 +15,10 @@
 with plt.style.context('cheatsheet_gallery'):
     fig, ax = plt.subplots()
 
-    ax.plot(X, Y, color="C1", linewidth=2.0)
-
-    ax.set_xlim(0, 8), ax.set_xticks(np.arange(1, 8))
-    ax.set_ylim(0, 8), ax.set_yticks(np.arange(1, 8))
+    ax.plot(X, Y, linewidth=2.0)
 
+    ax.set_xlim(0, 8)
+    ax.set_xticks(np.arange(1, 8))
+    ax.set_ylim(0, 8)
+    ax.set_yticks(np.arange(1, 8))
     plt.show()
diff --git a/plot_types/A_basic/b_scatter.py b/plot_types/A_basic/b_scatter.py
@@ -16,9 +16,11 @@
     fig, ax = plt.subplots()
 
     ax.scatter(X, Y, 20, zorder=10,
-               edgecolor="none", facecolor="C1", linewidth=0.25)
+               edgecolor="none", linewidth=0.25)
 
-    ax.set_xlim(0, 8), ax.set_xticks(np.arange(1, 8))
-    ax.set_ylim(0, 8), ax.set_yticks(np.arange(1, 8))
+    ax.set_xlim(0, 8)
+    ax.set_xticks(np.arange(1, 8))
+    ax.set_ylim(0, 8)
+    ax.set_yticks(np.arange(1, 8))
 
     plt.show()
diff --git a/plot_types/A_basic/c_bar.py b/plot_types/A_basic/c_bar.py
@@ -15,10 +15,11 @@
 with plt.style.context('cheatsheet_gallery'):
     fig, ax = plt.subplots()
 
-    ax.bar(X, Y, bottom=0, width=1, edgecolor="white",
-           facecolor="C1", linewidth=0.7)
+    ax.bar(X, Y, bottom=0, width=1, edgecolor="white", linewidth=0.7)
 
-    ax.set_xlim(0, 8), ax.set_xticks(np.arange(1, 8))
-    ax.set_ylim(0, 8), ax.set_yticks(np.arange(1, 8))
+    ax.set_xlim(0, 8)
+    ax.set_xticks(np.arange(1, 8))
+    ax.set_ylim(0, 8)
+    ax.set_yticks(np.arange(1, 8))
 
     plt.show()
diff --git a/plot_types/A_basic/d_stem.py b/plot_types/A_basic/d_stem.py
@@ -15,8 +15,10 @@
 with plt.style.context('cheatsheet_gallery'):
     fig, ax = plt.subplots()
 
-    ax.stem(X, Y, bottom=0, linefmt="C1-", markerfmt="C1d")
+    ax.stem(X, Y, bottom=0, linefmt="-", markerfmt="d")
 
-    ax.set_xlim(0, 8), ax.set_xticks(np.arange(1, 8))
-    ax.set_ylim(0, 8), ax.set_yticks(np.arange(1, 8))
+    ax.set_xlim(0, 8)
+    ax.set_xticks(np.arange(1, 8))
+    ax.set_ylim(0, 8)
+    ax.set_yticks(np.arange(1, 8))
     plt.show()
diff --git a/plot_types/A_basic/e_step.py b/plot_types/A_basic/e_step.py
@@ -15,8 +15,10 @@
 with plt.style.context('cheatsheet_gallery'):
     fig, ax = plt.subplots()
 
-    ax.step(X, Y, color="C1", linewidth=2.5)
+    ax.step(X, Y, linewidth=2.5)
 
-    ax.set_xlim(0, 8), ax.set_xticks(np.arange(1, 8))
-    ax.set_ylim(0, 8), ax.set_yticks(np.arange(1, 8))
+    ax.set_xlim(0, 8)
+    ax.set_xticks(np.arange(1, 8))
+    ax.set_ylim(0, 8)
+    ax.set_yticks(np.arange(1, 8))
     plt.show()
diff --git a/plot_types/A_basic/f_pie.py b/plot_types/A_basic/f_pie.py
@@ -7,22 +7,25 @@
 import matplotlib.pyplot as plt
 import numpy as np
 
-# make data
-X = [1, 2, 3, 4]
-colors = np.zeros((len(X), 4))
-colors[:] = mpl.colors.to_rgba("C1")
-colors[:, 3] = np.linspace(0.25, 0.75, len(X))
 
 # plot
 with plt.style.context('cheatsheet_gallery'):
     fig, ax = plt.subplots()
+    
+    # make data
+    X = [1, 2, 3, 4]
+    colors = np.zeros((len(X), 4))
+    colors[:] = mpl.colors.to_rgba("C0")
+    colors[:, 3] = np.linspace(0.25, 0.75, len(X))
 
     ax.pie(X, colors=["white"]*len(X), radius=3, center=(4, 4),
             wedgeprops={"linewidth": 1, "edgecolor": "white"}, frame=True)
     ax.pie(X, colors=colors, radius=3, center=(4, 4),
             wedgeprops={"linewidth": 1, "edgecolor": "white"}, frame=True)
 
-    ax.set_xlim(0, 8), ax.set_xticks(np.arange(1, 8))
-    ax.set_ylim(0, 8), ax.set_yticks(np.arange(1, 8))
+    ax.set_xlim(0, 8)
+    ax.set_xticks(np.arange(1, 8))
+    ax.set_ylim(0, 8)
+    ax.set_yticks(np.arange(1, 8))
 
 plt.show()
diff --git a/plot_types/A_basic/g_fill_between.py b/plot_types/A_basic/g_fill_between.py
@@ -16,10 +16,12 @@
 with plt.style.context('cheatsheet_gallery'):
     fig, ax = plt.subplots()
 
-    ax.fill_between(X, Y1, Y2, color="C1", alpha=.5, linewidth=0)
-    ax.plot(X, (Y1+Y2)/2, color="C1", linewidth=2.5)
+    ax.fill_between(X, Y1, Y2, alpha=.5, linewidth=0)
+    ax.plot(X, (Y1+Y2)/2, linewidth=2.5)
 
-    ax.set_xlim(0, 8), ax.set_xticks(np.arange(1, 8))
-    ax.set_ylim(0, 8), ax.set_yticks(np.arange(1, 8))
+    ax.set_xlim(0, 8)
+    ax.set_xticks(np.arange(1, 8))
+    ax.set_ylim(0, 8)
+    ax.set_yticks(np.arange(1, 8))
 
 plt.show()
diff --git a/plot_types/B_arrays/a_imshow.py b/plot_types/B_arrays/a_imshow.py
@@ -20,6 +20,6 @@
     ax.imshow(Z, extent=[0, 8, 0, 8], interpolation="nearest",
               cmap=plt.get_cmap('Oranges'), vmin=0, vmax=1.6)
 
-    ax.set_xlim(0, 8), ax.set_xticks([])
-    ax.set_ylim(0, 8), ax.set_yticks([])
+    ax.set_xticks([])
+    ax.set_yticks([])
     plt.show()
diff --git a/plot_types/B_arrays/b_pcolormesh.py b/plot_types/B_arrays/b_pcolormesh.py
@@ -10,19 +10,18 @@
 import matplotlib.pyplot as plt
 import numpy as np
 
-# make data:
-np.random.seed(3)
-Z = np.random.uniform(0.1, 1.0, (8, 8))
-x = np.array([0, 0.5, 1.5, 3, 5.2, 6.3, 7.2, 7.5, 8])
-y = 1.2**np.arange(0, 9)
+# make data
+X, Y = np.meshgrid(np.linspace(-3, 3, 256), np.linspace(-3, 3, 256))
+Z = (1 - X/2. + X**5 + Y**3) * np.exp(-X**2 - Y**2)
+Z = Z - Z.min()
 
 # plot
 with plt.style.context('cheatsheet_gallery'):
     fig, ax = plt.subplots()
 
     # plot:
-    ax.pcolormesh(x, y, Z, cmap=plt.get_cmap('Oranges'), vmin=0, vmax=1.1)
+    ax.pcolormesh(X, Y, Z, vmin=0, vmax=1.1)
 
-    ax.set_ylim(1, np.max(y))
-    ax.set_xlim(np.min(x), np.max(x))
+    #ax.set_ylim(np.min(Y), np.max(Y))
+    #ax.set_xlim(np.min(X), np.max(X))
     plt.show()
diff --git a/plot_types/B_arrays/c_contourf.py b/plot_types/B_arrays/c_contourf.py
@@ -16,7 +16,7 @@
 with plt.style.context('cheatsheet_gallery'):
     fig, ax = plt.subplots()
 
-    plt.contourf(X, Y, Z, levels=levs, cmap=plt.get_cmap('Oranges'))
+    plt.contourf(X, Y, Z, levels=levs)
     plt.contour(X, Y, Z, levels=levs, colors="white", linewidths=0.5)
 
     plt.show()
diff --git a/plot_types/B_arrays/d_quiver.py b/plot_types/B_arrays/d_quiver.py
@@ -15,10 +15,12 @@
 with plt.style.context('cheatsheet_gallery'):
     fig, ax = plt.subplots()
 
-    plt.quiver(X, Y, U, V, color="C1", angles='xy',
+    plt.quiver(X, Y, U, V, color="C0", angles='xy',
                scale_units='xy', scale=0.5, width=.05)
 
-    ax.set_xlim(0, 8), ax.set_xticks(np.arange(1, 8))
-    ax.set_ylim(0, 8), ax.set_yticks(np.arange(1, 8))
+    ax.set_xlim(0, 8)
+    ax.set_xticks(np.arange(1, 8))
+    ax.set_ylim(0, 8)
+    ax.set_yticks(np.arange(1, 8))
 
 plt.show()
diff --git a/plot_types/B_arrays/e_streamplot.py b/plot_types/B_arrays/e_streamplot.py
@@ -18,8 +18,8 @@
 with plt.style.context('cheatsheet_gallery'):
     fig, ax = plt.subplots()
     # contour stream function
-    ax.contour(X, Y, Z, colors='C0', alpha=0.5, zorder=1, linewidths=3)
+    ax.contour(X, Y, Z, colors='C1', alpha=0.5, zorder=1, linewidths=3)
     # plot stream plot
-    ax.streamplot(X[1:, 1:], Y[1:, 1:], U, V, color='C1', zorder=2)
+    ax.streamplot(X[1:, 1:], Y[1:, 1:], U, V, zorder=2)
 
 plt.show()
diff --git a/plot_types/C_stats/a_hist.py b/plot_types/C_stats/a_hist.py
@@ -14,9 +14,11 @@
 with plt.style.context('cheatsheet_gallery'):
     fig, ax = plt.subplots()
 
-    ax.hist(X, bins=8, facecolor="C1", linewidth=0.5, edgecolor="white",)
+    ax.hist(X, bins=8, linewidth=0.5, edgecolor="white",)
 
-    ax.set_xlim(0, 8), ax.set_xticks(np.arange(1, 8))
-    ax.set_ylim(0, 80), ax.set_yticks(np.arange(1, 80, 10))
+    ax.set_xlim(0, 8)
+    ax.set_xticks(np.arange(1, 8))
+    ax.set_ylim(0, 80)
+    ax.set_yticks(np.arange(1, 80, 10))
 
 plt.show()
diff --git a/plot_types/C_stats/b_boxplot.py b/plot_types/C_stats/b_boxplot.py
@@ -13,20 +13,22 @@
 # plot
 with plt.style.context('cheatsheet_gallery'):
     fig, ax = plt.subplots()
-
+    orange = '#ff7f0e'
     VP = ax.boxplot(D, positions=[2, 4, 6], widths=1.5, patch_artist=True,
                     showmeans=False, showfliers=False,
                     medianprops={"color": "white",
                                  "linewidth": 0.5},
-                    boxprops={"facecolor": "C1",
+                    boxprops={"facecolor": orange,
                               "edgecolor": "white",
                               "linewidth": 0.5},
-                    whiskerprops={"color": "C1",
+                    whiskerprops={"color": orange,
                                   "linewidth": 1.5},
-                    capprops={"color": "C1",
+                    capprops={"color": orange,
                               "linewidth": 1.5})
 
-    ax.set_xlim(0, 8), ax.set_xticks(np.arange(1, 8))
-    ax.set_ylim(0, 8), ax.set_yticks(np.arange(1, 8))
+    ax.set_xlim(0, 8)
+    ax.set_xticks(np.arange(1, 8))
+    ax.set_ylim(0, 8)
+    ax.set_yticks(np.arange(1, 8))
 
 plt.show()
diff --git a/plot_types/C_stats/c_errorbar.py b/plot_types/C_stats/c_errorbar.py
@@ -18,7 +18,9 @@
 
     ax.errorbar(X, Y, E, color="C1", linewidth=2, capsize=6)
 
-    ax.set_xlim(0, 8), ax.set_xticks(np.arange(1, 8))
-    ax.set_ylim(0, 8), ax.set_yticks(np.arange(1, 8))
+    ax.set_xlim(0, 8)
+    ax.set_xticks(np.arange(1, 8))
+    ax.set_ylim(0, 8)
+    ax.set_yticks(np.arange(1, 8))
 
 plt.show()
diff --git a/plot_types/C_stats/d_violin.py b/plot_types/C_stats/d_violin.py
@@ -18,10 +18,11 @@
                        showmeans=False, showmedians=False, showextrema=False)
     #style:
     for body in VP['bodies']:
-        body.set_facecolor('C1')
         body.set_alpha(0.9)
 
-ax.set_xlim(0, 8), ax.set_xticks(np.arange(1, 8))
-ax.set_ylim(0, 8), ax.set_yticks(np.arange(1, 8))
+ax.set_xlim(0, 8)
+ax.set_xticks(np.arange(1, 8))
+ax.set_ylim(0, 8)
+ax.set_yticks(np.arange(1, 8))
 
 plt.show()
diff --git a/plot_types/C_stats/e_barbs.py b/plot_types/C_stats/e_barbs.py
@@ -20,7 +20,9 @@
     ax.barbs(X, Y, U, V, barbcolor="C1", flagcolor="C1",
              length=10, linewidth=1.5)
 
-ax.set_xlim(0, 8), ax.set_xticks(np.arange(1, 8))
-ax.set_ylim(0, 8), ax.set_yticks(np.arange(1, 8))
+ax.set_xlim(0, 8)
+ax.set_xticks(np.arange(1, 8))
+ax.set_ylim(0, 8)
+ax.set_yticks(np.arange(1, 8))
 
 plt.show()
diff --git a/plot_types/C_stats/f_eventplot.py b/plot_types/C_stats/f_eventplot.py
@@ -15,10 +15,12 @@
 with plt.style.context('cheatsheet_gallery'):
     fig, ax = plt.subplots()
 
-    ax.eventplot(D, colors="C1", orientation="vertical",
+    ax.eventplot(D, colors="C0", orientation="vertical",
                  lineoffsets=X, linewidth=0.75)
 
-    ax.set_xlim(0, 8), ax.set_xticks(np.arange(1, 8))
-    ax.set_ylim(0, 8), ax.set_yticks(np.arange(1, 8))
+    ax.set_xlim(0, 8)
+    ax.set_xticks(np.arange(1, 8))
+    ax.set_ylim(0, 8)
+    ax.set_yticks(np.arange(1, 8))
 
 plt.show()
diff --git a/plot_types/C_stats/g_hist2d.py b/plot_types/C_stats/g_hist2d.py
@@ -15,8 +15,7 @@
 with plt.style.context('cheatsheet_gallery'):
     fig, ax = plt.subplots()
 
-    ax.hist2d(x, y, bins=(np.arange(-3, 3, 0.1), np.arange(-3, 3, 0.1)),
-              cmap=plt.get_cmap('Oranges'))
+    ax.hist2d(x, y, bins=(np.arange(-3, 3, 0.1), np.arange(-3, 3, 0.1)))
 
 ax.set_xlim(-2, 2)
 ax.set_ylim(-3, 3)
diff --git a/plot_types/C_stats/h_hexbin.py b/plot_types/C_stats/h_hexbin.py
@@ -15,7 +15,7 @@
 with plt.style.context('cheatsheet_gallery'):
     fig, ax = plt.subplots()
 
-    ax.hexbin(x, y, gridsize=20, cmap=plt.get_cmap('Oranges'))
+    ax.hexbin(x, y, gridsize=20)
 
 ax.set_xlim(-2, 2)
 ax.set_ylim(-3, 3)
diff --git a/plot_types/D_unstructured/a_tricontour.py b/plot_types/D_unstructured/a_tricontour.py
@@ -25,7 +25,7 @@
 
     ax.plot(x, y, '.k', alpha=0.5)
     levs = np.linspace(np.min(Z), np.max(Z), 7)
-    ax.tricontourf(x, y, z, levels=levs, cmap=plt.get_cmap('Oranges'))
+    ax.tricontourf(x, y, z, levels=levs)
 
     ax.set_xlim(-3, 3)
     ax.set_ylim(-3, 3)
diff --git a/plot_types/D_unstructured/b_tripcolor.py b/plot_types/D_unstructured/b_tripcolor.py
@@ -24,7 +24,7 @@
     fig, ax = plt.subplots()
 
     ax.plot(x, y, '.k', alpha=0.5)
-    ax.tripcolor(x, y, z, cmap=plt.get_cmap('Oranges'))
+    ax.tripcolor(x, y, z)
 
     ax.set_xlim(-3, 3)
     ax.set_ylim(-3, 3)
diff --git a/plot_types/D_unstructured/c_triplot.py b/plot_types/D_unstructured/c_triplot.py
@@ -20,7 +20,7 @@
 with plt.style.context('cheatsheet_gallery'):
     fig, ax = plt.subplots()
 
-    ax.triplot(x, y, color='C1')
+    ax.triplot(x, y)
 
     ax.set_xlim(-3, 3)
     ax.set_ylim(-3, 3)
