Merge pull request #8898 from dmgt/egs_to_OO_status

NelleV · web-flow · commit a6ceb3b3cb04 · 2017-07-17T16:51:31.000-07:00
[WIP] Update some pylab examples to OO format
diff --git a/examples/pylab_examples/simple_plot.py b/examples/pylab_examples/simple_plot.py
@@ -8,13 +8,18 @@
 import matplotlib.pyplot as plt
 import numpy as np
 
+# Data for plotting
 t = np.arange(0.0, 2.0, 0.01)
 s = 1 + np.sin(2*np.pi*t)
-plt.plot(t, s)
 
-plt.xlabel('time (s)')
-plt.ylabel('voltage (mV)')
-plt.title('About as simple as it gets, folks')
-plt.grid(True)
-plt.savefig("test.png")
+# Note that using plt.subplots below is equivalent to using
+# fig = plt.figure and then ax = fig.add_subplot(111)
+fig, ax = plt.subplots()
+ax.plot(t, s)
+
+ax.set(xlabel='time (s)', ylabel='voltage (mV)',
+       title='About as simple as it gets, folks')
+ax.grid()
+
+fig.savefig("test.png")
 plt.show()
diff --git a/examples/subplots_axes_and_figures/subplot_demo.py b/examples/subplots_axes_and_figures/subplot_demo.py
@@ -1,28 +1,28 @@
 """
-============
-Subplot Demo
-============
+==================
+Basic Subplot Demo
+==================
 
-Simple demo with multiple subplots.
+Demo with two subplots.
+For more options, see
+:ref:`sphx_glr_gallery_subplots_axes_and_figures_subplots_demo.py`
 """
 import numpy as np
 import matplotlib.pyplot as plt
 
-
+# Data for plotting
 x1 = np.linspace(0.0, 5.0)
 x2 = np.linspace(0.0, 2.0)
-
 y1 = np.cos(2 * np.pi * x1) * np.exp(-x1)
 y2 = np.cos(2 * np.pi * x2)
 
-plt.subplot(2, 1, 1)
-plt.plot(x1, y1, 'ko-')
-plt.title('A tale of 2 subplots')
-plt.ylabel('Damped oscillation')
+# Create two subplots sharing y axis
+fig, (ax1, ax2) = plt.subplots(2, sharey=True)
+
+ax1.plot(x1, y1, 'ko-')
+ax1.set(title='A tale of 2 subplots', ylabel='Damped oscillation')
 
-plt.subplot(2, 1, 2)
-plt.plot(x2, y2, 'r.-')
-plt.xlabel('time (s)')
-plt.ylabel('Undamped')
+ax2.plot(x2, y2, 'r.-')
+ax2.set(xlabel='time (s)', ylabel='Undamped')
 
 plt.show()
