Un-pyplot some examples which were already explicitly referencing axes.

anntzer · anntzer · commit 58678836979e · 2022-02-16T15:25:31.000+01:00
diff --git a/examples/axes_grid1/make_room_for_ylabel_using_axesgrid.py b/examples/axes_grid1/make_room_for_ylabel_using_axesgrid.py
@@ -11,8 +11,8 @@
 from mpl_toolkits.axes_grid1.axes_divider import make_axes_area_auto_adjustable
 
 
-plt.figure()
-ax = plt.axes([0, 0, 1, 1])
+fig = plt.figure()
+ax = fig.add_axes([0, 0, 1, 1])
 
 ax.set_yticks([0.5], labels=["very long label"])
 
@@ -21,9 +21,9 @@
 ###############################################################################
 
 
-plt.figure()
-ax1 = plt.axes([0, 0, 1, 0.5])
-ax2 = plt.axes([0, 0.5, 1, 0.5])
+fig = plt.figure()
+ax1 = fig.add_axes([0, 0, 1, 0.5])
+ax2 = fig.add_axes([0, 0.5, 1, 0.5])
 
 ax1.set_yticks([0.5], labels=["very long label"])
 ax1.set_ylabel("Y label")
@@ -37,7 +37,7 @@
 
 
 fig = plt.figure()
-ax1 = plt.axes([0, 0, 1, 1])
+ax1 = fig.add_axes([0, 0, 1, 1])
 divider = make_axes_locatable(ax1)
 
 ax2 = divider.append_axes("right", "100%", pad=0.3, sharey=ax1)
diff --git a/examples/widgets/buttons.py b/examples/widgets/buttons.py
@@ -16,10 +16,10 @@
 freqs = np.arange(2, 20, 3)
 
 fig, ax = plt.subplots()
-plt.subplots_adjust(bottom=0.2)
+fig.subplots_adjust(bottom=0.2)
 t = np.arange(0.0, 1.0, 0.001)
 s = np.sin(2*np.pi*freqs[0]*t)
-l, = plt.plot(t, s, lw=2)
+l, = ax.plot(t, s, lw=2)
 
 
 class Index:
@@ -40,8 +40,8 @@ def prev(self, event):
         plt.draw()
 
 callback = Index()
-axprev = plt.axes([0.7, 0.05, 0.1, 0.075])
-axnext = plt.axes([0.81, 0.05, 0.1, 0.075])
+axprev = fig.add_axes([0.7, 0.05, 0.1, 0.075])
+axnext = fig.add_axes([0.81, 0.05, 0.1, 0.075])
 bnext = Button(axnext, 'Next')
 bnext.on_clicked(callback.next)
 bprev = Button(axprev, 'Previous')
diff --git a/examples/widgets/check_buttons.py b/examples/widgets/check_buttons.py
@@ -9,6 +9,7 @@
 check boxes. There are 3 different sine waves shown and we can choose which
 waves are displayed with the check buttons.
 """
+
 import numpy as np
 import matplotlib.pyplot as plt
 from matplotlib.widgets import CheckButtons
@@ -22,12 +23,12 @@
 l0, = ax.plot(t, s0, visible=False, lw=2, color='k', label='2 Hz')
 l1, = ax.plot(t, s1, lw=2, color='r', label='4 Hz')
 l2, = ax.plot(t, s2, lw=2, color='g', label='6 Hz')
-plt.subplots_adjust(left=0.2)
+fig.subplots_adjust(left=0.2)
 
 lines = [l0, l1, l2]
 
 # Make checkbuttons with all plotted lines with correct visibility
-rax = plt.axes([0.05, 0.4, 0.1, 0.15])
+rax = fig.add_axes([0.05, 0.4, 0.1, 0.15])
 labels = [str(line.get_label()) for line in lines]
 visibility = [line.get_visible() for line in lines]
 check = CheckButtons(rax, labels, visibility)
diff --git a/examples/widgets/radio_buttons.py b/examples/widgets/radio_buttons.py
@@ -9,6 +9,7 @@
 In this case, the buttons let the user choose one of the three different sine
 waves to be shown in the plot.
 """
+
 import numpy as np
 import matplotlib.pyplot as plt
 from matplotlib.widgets import RadioButtons
@@ -20,10 +21,10 @@
 
 fig, ax = plt.subplots()
 l, = ax.plot(t, s0, lw=2, color='red')
-plt.subplots_adjust(left=0.3)
+fig.subplots_adjust(left=0.3)
 
 axcolor = 'lightgoldenrodyellow'
-rax = plt.axes([0.05, 0.7, 0.15, 0.15], facecolor=axcolor)
+rax = fig.add_axes([0.05, 0.7, 0.15, 0.15], facecolor=axcolor)
 radio = RadioButtons(rax, ('2 Hz', '4 Hz', '8 Hz'))
 
 
@@ -34,7 +35,7 @@ def hzfunc(label):
     plt.draw()
 radio.on_clicked(hzfunc)
 
-rax = plt.axes([0.05, 0.4, 0.15, 0.15], facecolor=axcolor)
+rax = fig.add_axes([0.05, 0.4, 0.15, 0.15], facecolor=axcolor)
 radio2 = RadioButtons(rax, ('red', 'blue', 'green'))
 
 
@@ -43,7 +44,7 @@ def colorfunc(label):
     plt.draw()
 radio2.on_clicked(colorfunc)
 
-rax = plt.axes([0.05, 0.1, 0.15, 0.15], facecolor=axcolor)
+rax = fig.add_axes([0.05, 0.1, 0.15, 0.15], facecolor=axcolor)
 radio3 = RadioButtons(rax, ('-', '--', '-.', 'steps', ':'))
 
 
diff --git a/examples/widgets/range_slider.py b/examples/widgets/range_slider.py
@@ -26,14 +26,14 @@
 img = np.random.randn(N, N)
 
 fig, axs = plt.subplots(1, 2, figsize=(10, 5))
-plt.subplots_adjust(bottom=0.25)
+fig.subplots_adjust(bottom=0.25)
 
 im = axs[0].imshow(img)
 axs[1].hist(img.flatten(), bins='auto')
 axs[1].set_title('Histogram of pixel intensities')
 
 # Create the RangeSlider
-slider_ax = plt.axes([0.20, 0.1, 0.60, 0.03])
+slider_ax = fig.add_axes([0.20, 0.1, 0.60, 0.03])
 slider = RangeSlider(slider_ax, "Threshold", img.min(), img.max())
 
 # Create the Vertical lines on the histogram
diff --git a/examples/widgets/slider_demo.py b/examples/widgets/slider_demo.py
@@ -12,6 +12,7 @@
 See :doc:`/gallery/widgets/range_slider` for an example of using
 a ``RangeSlider`` to define a range of values.
 """
+
 import numpy as np
 import matplotlib.pyplot as plt
 from matplotlib.widgets import Slider, Button
@@ -29,14 +30,14 @@ def f(t, amplitude, frequency):
 
 # Create the figure and the line that we will manipulate
 fig, ax = plt.subplots()
-line, = plt.plot(t, f(t, init_amplitude, init_frequency), lw=2)
+line, = ax.plot(t, f(t, init_amplitude, init_frequency), lw=2)
 ax.set_xlabel('Time [s]')
 
 # adjust the main plot to make room for the sliders
-plt.subplots_adjust(left=0.25, bottom=0.25)
+fig.subplots_adjust(left=0.25, bottom=0.25)
 
 # Make a horizontal slider to control the frequency.
-axfreq = plt.axes([0.25, 0.1, 0.65, 0.03])
+axfreq = fig.add_axes([0.25, 0.1, 0.65, 0.03])
 freq_slider = Slider(
     ax=axfreq,
     label='Frequency [Hz]',
@@ -46,7 +47,7 @@ def f(t, amplitude, frequency):
 )
 
 # Make a vertically oriented slider to control the amplitude
-axamp = plt.axes([0.1, 0.25, 0.0225, 0.63])
+axamp = fig.add_axes([0.1, 0.25, 0.0225, 0.63])
 amp_slider = Slider(
     ax=axamp,
     label="Amplitude",
@@ -68,7 +69,7 @@ def update(val):
 amp_slider.on_changed(update)
 
 # Create a `matplotlib.widgets.Button` to reset the sliders to initial values.
-resetax = plt.axes([0.8, 0.025, 0.1, 0.04])
+resetax = fig.add_axes([0.8, 0.025, 0.1, 0.04])
 button = Button(resetax, 'Reset', hovercolor='0.975')
 
 
diff --git a/examples/widgets/slider_snap_demo.py b/examples/widgets/slider_snap_demo.py
@@ -15,6 +15,7 @@
 See :doc:`/gallery/widgets/range_slider` for an example of using
 a ``RangeSlider`` to define a range of values.
 """
+
 import numpy as np
 import matplotlib.pyplot as plt
 from matplotlib.widgets import Slider, Button
@@ -25,11 +26,11 @@
 s = a0 * np.sin(2 * np.pi * f0 * t)
 
 fig, ax = plt.subplots()
-plt.subplots_adjust(bottom=0.25)
-l, = plt.plot(t, s, lw=2)
+fig.subplots_adjust(bottom=0.25)
+l, = ax.plot(t, s, lw=2)
 
-ax_freq = plt.axes([0.25, 0.1, 0.65, 0.03])
-ax_amp = plt.axes([0.25, 0.15, 0.65, 0.03])
+ax_freq = fig.add_axes([0.25, 0.1, 0.65, 0.03])
+ax_amp = fig.add_axes([0.25, 0.15, 0.65, 0.03])
 
 # define the values to use for snapping
 allowed_amplitudes = np.concatenate([np.linspace(.1, 5, 100), [6, 7, 8, 9]])
@@ -58,7 +59,7 @@ def update(val):
 sfreq.on_changed(update)
 samp.on_changed(update)
 
-ax_reset = plt.axes([0.8, 0.025, 0.1, 0.04])
+ax_reset = fig.add_axes([0.8, 0.025, 0.1, 0.04])
 button = Button(ax_reset, 'Reset', hovercolor='0.975')
 
 
