Add contour and tricontour plots to plot types

timhoffm · timhoffm · commit ec5d88953502 · 2021-09-19T20:45:00.000+02:00
diff --git a/examples/frontpage/contour_frontpage.py b/examples/frontpage/contour_frontpage.py
diff --git a/plot_types/arrays/contour.py b/plot_types/arrays/contour.py
@@ -0,0 +1,25 @@
+"""
+================
+contour(X, Y, Z)
+================
+
+See `~matplotlib.axes.Axes.contour`.
+"""
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.style.use('mpl_plot_gallery')
+
+# 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()
+levels = np.linspace(np.min(Z), np.max(Z), 7)
+
+# plot
+fig, ax = plt.subplots()
+ax.grid(False)
+
+ax.contour(X, Y, Z, levels=levels)
+
+plt.show()
diff --git a/plot_types/arrays/contourf.py b/plot_types/arrays/contourf.py
@@ -1,9 +1,9 @@
 """
-====================================
-contour(X, Y, Z) / contourf(X, Y, Z)
-====================================
+=================
+contourf(X, Y, Z)
+=================
 
-See `~matplotlib.axes.Axes.contour` / `~matplotlib.axes.Axes.contourf`.
+See `~matplotlib.axes.Axes.contourf`.
 """
 import matplotlib.pyplot as plt
 import numpy as np
@@ -12,13 +12,12 @@
 
 # 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 = (1 - X/2 + X**5 + Y**3) * np.exp(-X**2 - Y**2)
 levels = np.linspace(Z.min(), Z.max(), 7)
 
 # plot
 fig, ax = plt.subplots()
 
 ax.contourf(X, Y, Z, levels=levels)
-ax.contour(X, Y, Z, levels=levels, colors="white", linewidths=0.5)
 
 plt.show()
diff --git a/plot_types/unstructured/tricontour.py b/plot_types/unstructured/tricontour.py
@@ -1,9 +1,9 @@
 """
-==========================================
-tricontour(x, y, z) / tricontourf(x, y, z)
-==========================================
+===================
+tricontour(x, y, z)
+===================
 
-See `~matplotlib.axes.Axes.tricontour` / `~matplotlib.axes.Axes.tricontourf`.
+See `~matplotlib.axes.Axes.tricontour`.
 """
 import matplotlib.pyplot as plt
 import numpy as np
@@ -12,7 +12,8 @@
 
 # make structured 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 = (1 - X/2 + X**5 + Y**3) * np.exp(-X**2 - Y**2)
+levels = np.linspace(Z.min(), Z.max(), 7)
 
 # sample it to make unstructured x, y, z
 np.random.seed(1)
@@ -24,10 +25,10 @@
 
 # plot:
 fig, ax = plt.subplots()
+ax.grid(False)
 
-ax.plot(x, y, '.k', alpha=0.5)
-levels = np.linspace(Z.min(), Z.max(), 7)
-ax.tricontourf(x, y, z, levels=levels)
+ax.plot(x, y, 'o', markersize=2, color='lightgrey')
+ax.tricontour(x, y, z, levels=levels)
 
 ax.set(xlim=(-3, 3), ylim=(-3, 3))
 
diff --git a/plot_types/unstructured/tricontourf.py b/plot_types/unstructured/tricontourf.py
@@ -0,0 +1,36 @@
+"""
+====================
+tricontourf(x, y, z)
+====================
+
+See `~matplotlib.axes.Axes.tricontourf`.
+"""
+import matplotlib.pyplot as plt
+import numpy as np
+
+plt.style.use('mpl_plot_gallery')
+
+# make structured 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()
+levels = np.linspace(np.min(Z), np.max(Z), 7)
+
+# sample it to make unstructured x, y, z
+np.random.seed(1)
+ysamp = np.random.randint(0, 256, size=250)
+xsamp = np.random.randint(0, 256, size=250)
+y = Y[:, 0][ysamp]
+x = X[0, :][xsamp]
+z = Z[ysamp, xsamp]
+
+# plot:
+fig, ax = plt.subplots()
+ax.grid(False)
+
+ax.plot(x, y, 'o', markersize=2, color='grey')
+ax.tricontourf(x, y, z, levels=levels)
+
+ax.set(xlim=(-3, 3), ylim=(-3, 3))
+
+plt.show()
diff --git a/plot_types/unstructured/tripcolor.py b/plot_types/unstructured/tripcolor.py
@@ -12,7 +12,7 @@
 
 # make structured 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 = (1 - X/2 + X**5 + Y**3) * np.exp(-X**2 - Y**2)
 
 # sample it to make unstructured x, y, z
 np.random.seed(1)
@@ -25,7 +25,7 @@
 # plot:
 fig, ax = plt.subplots()
 
-ax.plot(x, y, '.k', alpha=0.5)
+ax.plot(x, y, 'o', markersize=2, color='grey')
 ax.tripcolor(x, y, z)
 
 ax.set(xlim=(-3, 3), ylim=(-3, 3))
diff --git a/plot_types/unstructured/triplot.py b/plot_types/unstructured/triplot.py
@@ -22,6 +22,7 @@
 
 # plot:
 fig, ax = plt.subplots()
+ax.grid(False)
 
 ax.triplot(x, y)
 
