DOC: add inset axes example

jklymak · jklymak · commit 84a9e3a5a2f3 · 2018-06-18T16:03:42.000-07:00
diff --git a/examples/subplots_axes_and_figures/zoom_inset_axes.py b/examples/subplots_axes_and_figures/zoom_inset_axes.py
@@ -31,7 +31,11 @@ def get_demo_image():
           origin="lower")
 
 # inset axes....
+<<<<<<< HEAD
 axins = ax.inset_axes_rect([0.5, 0.5, 0.47, 0.47])
+=======
+axins = ax.inset_axes([0.5, 0.5, 0.47, 0.47])
+>>>>>>> 97a72b10a... DOC: add inset axes example
 axins.imshow(Z2, extent=extent, interpolation="nearest",
           origin="lower")
 # sub region of the original image
@@ -41,7 +45,11 @@ def get_demo_image():
 axins.set_xticklabels('')
 axins.set_yticklabels('')
 
+<<<<<<< HEAD
 ax.zoom_inset_indicator(axins)
+=======
+ax.zoom_inset_rectangle(axins)
+>>>>>>> 97a72b10a... DOC: add inset axes example
 
 plt.show()
 
@@ -55,6 +63,11 @@ def get_demo_image():
 # The use of the following functions and methods is shown in this example:
 
 import matplotlib
+<<<<<<< HEAD
 matplotlib.axes.Axes.inset_axes_rect
 matplotlib.axes.Axes.zoom_inset_indicator
+=======
+matplotlib.axes.Axes.inset_axes
+matplotlib.axes.Axes.zoom_inset_rectangle
+>>>>>>> 97a72b10a... DOC: add inset axes example
 matplotlib.axes.Axes.imshow
