restructured fig and axes

ericmjl · ericmjl · commit e35dc8911ca1 · 2015-07-31T23:16:54.000-04:00
diff --git a/examples/pylab_examples/newscalarformatter_demo.py b/examples/pylab_examples/newscalarformatter_demo.py
@@ -4,123 +4,92 @@
 
 ## Example 1 ## 
 x = np.arange(0, 1, .01)
-f = plt.figure(figsize=(6, 6))
-f.text(0.5, 0.975, 'The old formatter',
+fig, [[ax1, ax2], [ax3, ax4]] = plt.subplots(2, 2, figsize=(6, 6))
+fig.text(0.5, 0.975, 'The old formatter',
        horizontalalignment='center', verticalalignment='top')
-
-plt.subplot(221)
-plt.plot(x * 1e5 + 1e10, x * 1e-10 + 1e-5)
-ax1 = plt.gca()
+ax1.plot(x * 1e5 + 1e10, x * 1e-10 + 1e-5)
 ax1.xaxis.set_major_formatter(OldScalarFormatter())
 ax1.yaxis.set_major_formatter(OldScalarFormatter())
 
-plt.subplot(222)
-plt.plot(x * 1e5, x * 1e-4)
-ax2 = plt.gca()
+ax2.plot(x * 1e5, x * 1e-4)
 ax2.xaxis.set_major_formatter(OldScalarFormatter())
 ax2.yaxis.set_major_formatter(OldScalarFormatter())
 
-plt.subplot(223)
-plt.plot(-x * 1e5 - 1e10, -x * 1e-5 - 1e-10)
-ax3 = plt.gca()
+ax3.plot(-x * 1e5 - 1e10, -x * 1e-5 - 1e-10)
 ax3.xaxis.set_major_formatter(OldScalarFormatter())
 ax3.yaxis.set_major_formatter(OldScalarFormatter())
 
-plt.subplot(224)
-plt.plot(-x * 1e5, -x * 1e-4)
+ax4.plot(-x * 1e5, -x * 1e-4)
 ax4 = plt.gca()
 ax4.xaxis.set_major_formatter(OldScalarFormatter())
 ax4.yaxis.set_major_formatter(OldScalarFormatter())
 
 ## Example 2 ##
 x = np.arange(0, 1, .01)
-f = plt.figure(figsize=(6, 6))
-f.text(0.5, 0.975, 'The new formatter, default settings',
+fig, [[ax1, ax2], [ax3, ax4]] = plt.subplots(2, 2, figsize=(6, 6))
+fig.text(0.5, 0.975, 'The new formatter, default settings',
        horizontalalignment='center',
        verticalalignment='top')
 
-plt.subplot(221)
-plt.plot(x * 1e5 + 1e10, x * 1e-10 + 1e-5)
-ax1 = plt.gca()
+ax1.plot(x * 1e5 + 1e10, x * 1e-10 + 1e-5)
 ax1.xaxis.set_major_formatter(ScalarFormatter())
 ax1.yaxis.set_major_formatter(ScalarFormatter())
 
-plt.subplot(222)
-plt.plot(x * 1e5, x * 1e-4)
-ax2 = plt.gca()
+ax2.plot(x * 1e5, x * 1e-4)
 ax2.xaxis.set_major_formatter(ScalarFormatter())
 ax2.yaxis.set_major_formatter(ScalarFormatter())
 
-plt.subplot(223)
-plt.plot(-x * 1e5 - 1e10, -x * 1e-5 - 1e-10)
-ax3 = plt.gca()
+ax3.plot(-x * 1e5 - 1e10, -x * 1e-5 - 1e-10)
 ax3.xaxis.set_major_formatter(ScalarFormatter())
 ax3.yaxis.set_major_formatter(ScalarFormatter())
 
-plt.subplot(224)
-plt.plot(-x * 1e5, -x * 1e-4)
-ax4 = plt.gca()
+ax4.plot(-x * 1e5, -x * 1e-4)
 ax4.xaxis.set_major_formatter(ScalarFormatter())
 ax4.yaxis.set_major_formatter(ScalarFormatter())
 
 ## Example 3 ##
 x = np.arange(0, 1, .01)
-f = plt.figure(figsize=(6, 6))
-f.text(0.5, 0.975, 'The new formatter, no numerical offset',
+fig, [[ax1, ax2], [ax3, ax4]] = plt.subplots(2, 2, figsize=(6, 6))
+fig.text(0.5, 0.975, 'The new formatter, no numerical offset',
        horizontalalignment='center',
        verticalalignment='top')
 
-plt.subplot(221)
-plt.plot(x * 1e5 + 1e10, x * 1e-10 + 1e-5)
-ax1 = plt.gca()
+ax1.plot(x * 1e5 + 1e10, x * 1e-10 + 1e-5)
 ax1.xaxis.set_major_formatter(ScalarFormatter(useOffset=False))
 ax1.yaxis.set_major_formatter(ScalarFormatter(useOffset=False))
 
-plt.subplot(222)
-plt.plot(x * 1e5, x * 1e-4)
-ax2 = plt.gca()
+ax2.plot(x * 1e5, x * 1e-4)
 ax2.xaxis.set_major_formatter(ScalarFormatter(useOffset=False))
 ax2.yaxis.set_major_formatter(ScalarFormatter(useOffset=False))
 
-plt.subplot(223)
-plt.plot(-x * 1e5 - 1e10, -x * 1e-5 - 1e-10)
-ax3 = plt.gca()
+ax3.plot(-x * 1e5 - 1e10, -x * 1e-5 - 1e-10)
 ax3.xaxis.set_major_formatter(ScalarFormatter(useOffset=False))
 ax3.yaxis.set_major_formatter(ScalarFormatter(useOffset=False))
 
-plt.subplot(224)
-plt.plot(-x * 1e5, -x * 1e-4)
-ax4 = plt.gca()
+ax4.plot(-x * 1e5, -x * 1e-4)
 ax4.xaxis.set_major_formatter(ScalarFormatter(useOffset=False))
 ax4.yaxis.set_major_formatter(ScalarFormatter(useOffset=False))
 
 ## Example 4 ##
 x = np.arange(0, 1, .01)
-f = plt.figure(figsize=(6, 6))
-f.text(0.5, 0.975, 'The new formatter, with mathtext',
+fig, [[ax1, ax2], [ax3, ax4]] = plt.subplots(2, 2, figsize=(6, 6))
+fig.text(0.5, 0.975, 'The new formatter, with mathtext',
        horizontalalignment='center',
        verticalalignment='top')
-plt.subplot(221)
-plt.plot(x * 1e5 + 1e10, x * 1e-10 + 1e-5)
-ax1 = plt.gca()
+
+ax1.plot(x * 1e5 + 1e10, x * 1e-10 + 1e-5)
 ax1.xaxis.set_major_formatter(ScalarFormatter(useMathText=True))
 ax1.yaxis.set_major_formatter(ScalarFormatter(useMathText=True))
 
-plt.subplot(222)
-plt.plot(x * 1e5, x * 1e-4)
-ax2 = plt.gca()
+ax2.plot(x * 1e5, x * 1e-4)
 ax2.xaxis.set_major_formatter(ScalarFormatter(useMathText=True))
 ax2.yaxis.set_major_formatter(ScalarFormatter(useMathText=True))
 
-plt.subplot(223)
-plt.plot(-x * 1e5 - 1e10, -x * 1e-5 - 1e-10)
-ax3 = plt.gca()
+ax3.plot(-x * 1e5 - 1e10, -x * 1e-5 - 1e-10)
 ax3.xaxis.set_major_formatter(ScalarFormatter(useMathText=True))
 ax3.yaxis.set_major_formatter(ScalarFormatter(useMathText=True))
 
-plt.subplot(224)
-plt.plot(-x * 1e5, -x * 1e-4)
-ax4 = plt.gca()
+ax4.plot(-x * 1e5, -x * 1e-4)
 ax4.xaxis.set_major_formatter(ScalarFormatter(useMathText=True))
 ax4.yaxis.set_major_formatter(ScalarFormatter(useMathText=True))
 plt.show()
