modify axes_grid toolkit examples to use axes_grid1 and axisartist

svn path=/trunk/matplotlib/; revision=8226

Author: leejjoon

CHANGELOG

@@ -1,3 +1,5 @@
+2010-04-06 modify axes_grid examples to use axes_grid1 and axisartist. -JJL
+
 2010-04-06 rebase axes_grid using axes_grid1 and axisartist modules. -JJL
 
 2010-04-06 axes_grid toolkit is splitted into two separate modules, 

examples/axes_grid/demo_axes_divider.py

@@ -19,7 +19,7 @@ def demo_simple_image(ax):
 
 def demo_locatable_axes_hard(fig1):
 
-    from mpl_toolkits.axes_grid \
+    from mpl_toolkits.axes_grid1 \
          import SubplotDivider, LocatableAxes, Size
 
     divider = SubplotDivider(fig1, 2, 2, 2, aspect=True)
@@ -57,7 +57,7 @@ def demo_locatable_axes_hard(fig1):
 
 
 def demo_locatable_axes_easy(ax):
-    from mpl_toolkits.axes_grid import make_axes_locatable
+    from mpl_toolkits.axes_grid1 import make_axes_locatable
 
     divider = make_axes_locatable(ax)
 
@@ -76,7 +76,7 @@ def demo_locatable_axes_easy(ax):
 
 
 def demo_images_side_by_sied(ax):
-    from mpl_toolkits.axes_grid import make_axes_locatable
+    from mpl_toolkits.axes_grid1 import make_axes_locatable
 
     divider = make_axes_locatable(ax)
 

examples/axes_grid/demo_axes_grid.py

@@ -1,5 +1,5 @@
 import matplotlib.pyplot as plt
-from mpl_toolkits.axes_grid import AxesGrid
+from mpl_toolkits.axes_grid1 import AxesGrid
 
 def get_demo_image():
     import numpy as np
@@ -38,6 +38,7 @@ def demo_grid_with_single_cbar(fig):
                     axes_pad = 0.0,
                     share_all=True,
                     label_mode = "L",
+                    cbar_location = "top",
                     cbar_mode="single",
                     )
 
@@ -47,6 +48,9 @@ def demo_grid_with_single_cbar(fig):
     #plt.colorbar(im, cax = grid.cbar_axes[0])
     grid.cbar_axes[0].colorbar(im)
 
+    for cax in grid.cbar_axes:
+        cax.toggle_label(False)
+        
     # This affects all axes as share_all = True.
     grid.axes_llc.set_xticks([-2, 0, 2])
     grid.axes_llc.set_yticks([-2, 0, 2])
@@ -72,6 +76,9 @@ def demo_grid_with_each_cbar(fig):
         im = grid[i].imshow(Z, extent=extent, interpolation="nearest")
         grid.cbar_axes[i].colorbar(im)
 
+    for cax in grid.cbar_axes:
+        cax.toggle_label(False)
+
     # This affects all axes because we set share_all = True.
     grid.axes_llc.set_xticks([-2, 0, 2])
     grid.axes_llc.set_yticks([-2, 0, 2])

examples/axes_grid/demo_axes_grid2.py

@@ -1,5 +1,5 @@
 import matplotlib.pyplot as plt
-from mpl_toolkits.axes_grid import ImageGrid
+from mpl_toolkits.axes_grid1 import ImageGrid
 import numpy as np
 
 def get_demo_image():
@@ -57,10 +57,10 @@ def add_inner_title(ax, title, loc, size=None, **kwargs):
 
     for ax, z in zip(grid, ZS):
         ax.cax.toggle_label(True)
-        axis = ax.cax.axis[ax.cax.orientation]
-        axis.label.set_text("counts s$^{-1}$")
-        axis.label.set_size(10)
-        axis.major_ticklabels.set_size(6)
+        #axis = ax.cax.axis[ax.cax.orientation]
+        #axis.label.set_text("counts s$^{-1}$")
+        #axis.label.set_size(10)
+        #axis.major_ticklabels.set_size(6)
 
     # changing the colorbar ticks
     grid[1].cax.set_xticks([-1, 0, 1])

examples/axes_grid/demo_axes_rgb.py

@@ -1,8 +1,16 @@
 import numpy as np
 import matplotlib.pyplot as plt
 
-from demo_axes_divider import get_demo_image
-from mpl_toolkits.axes_grid.axes_rgb import make_rgb_axes, RGBAxes
+from mpl_toolkits.axes_grid1.axes_rgb import make_rgb_axes, RGBAxes
+
+def get_demo_image():
+    from matplotlib.cbook import get_sample_data
+    f = get_sample_data("axes_grid/bivariate_normal.npy", asfileobj=False)
+    z = np.load(f)
+    # z is a numpy array of 15x15
+    return z, (-3,4,-4,3)
+
+
 
 def get_rgb():
     Z, extent = get_demo_image()
@@ -67,9 +75,11 @@ def demo_rgb2():
     ax.RGB.set_ylim(0.9, 10.6)
 
     for ax1 in [ax.RGB, ax.R, ax.G, ax.B]:
-        for axisline in ax1._axislines.values():
-            axisline.line.set_color("w")
-            axisline.major_ticks.set_mec("w")
+        for sp1 in ax1.spines.values():
+            sp1.set_color("w")
+        for tick in ax1.xaxis.get_major_ticks() + ax1.yaxis.get_major_ticks():
+            tick.tick1line.set_mec("w")
+            tick.tick2line.set_mec("w")
 
     return ax
 

examples/axes_grid/demo_colorbar_with_inset_locator.py

@@ -1,7 +1,6 @@
 import matplotlib.pyplot as plt
 
-from mpl_toolkits.axes_grid.inset_locator import inset_axes
-from mpl_toolkits.axes_grid.colorbar import colorbar
+from mpl_toolkits.axes_grid1.inset_locator import inset_axes
 
 fig = plt.figure(1, [6, 3])
 
@@ -14,7 +13,7 @@
                     loc=1)
 
 im1=ax1.imshow([[1,2],[2, 3]])
-colorbar(im1, cax=axins1, orientation="horizontal", ticks=[1,2,3])
+plt.colorbar(im1, cax=axins1, orientation="horizontal", ticks=[1,2,3])
 axins1.xaxis.set_ticks_position("bottom")
 
 # first subplot
@@ -34,7 +33,7 @@
 # the bbox_to_anchor coordinate.
 
 im=ax.imshow([[1,2],[2, 3]])
-colorbar(im, cax=axins, ticks=[1,2,3])
+plt.colorbar(im, cax=axins, ticks=[1,2,3])
 
 plt.draw()
 plt.show()

examples/axes_grid/demo_floating_axes.py

@@ -1,12 +1,11 @@
 from matplotlib.transforms import Affine2D
 
-from mpl_toolkits.axes_grid.floating_axes import FloatingSubplot,\
-     GridHelperCurveLinear
+import mpl_toolkits.axisartist.floating_axes as floating_axes
 
 import numpy as np
-import  mpl_toolkits.axes_grid.angle_helper as angle_helper
+import  mpl_toolkits.axisartist.angle_helper as angle_helper
 from matplotlib.projections import PolarAxes
-from mpl_toolkits.axes_grid.grid_finder import FixedLocator, MaxNLocator, \
+from mpl_toolkits.axisartist.grid_finder import FixedLocator, MaxNLocator, \
      DictFormatter
 
 def setup_axes1(fig, rect):
@@ -15,9 +14,9 @@ def setup_axes1(fig, rect):
     """
     tr = Affine2D().scale(2, 1).rotate_deg(30)
 
-    grid_helper = GridHelperCurveLinear(tr, extremes=(0, 4, 0, 4))
+    grid_helper = floating_axes.GridHelperCurveLinear(tr, extremes=(0, 4, 0, 4))
 
-    ax1 = FloatingSubplot(fig, rect, grid_helper=grid_helper)
+    ax1 = floating_axes.FloatingSubplot(fig, rect, grid_helper=grid_helper)
     fig.add_subplot(ax1)
 
     grid_helper.grid_finder.grid_locator1._nbins = 4
@@ -45,15 +44,15 @@ def setup_axes2(fig, rect):
 
     grid_locator2 = MaxNLocator(2)
 
-    grid_helper = GridHelperCurveLinear(tr,
+    grid_helper = floating_axes.GridHelperCurveLinear(tr,
                                         extremes=(.5*pi, 0, 2, 1),
                                         grid_locator1=grid_locator1,
                                         grid_locator2=grid_locator2,
                                         tick_formatter1=tick_formatter1,
                                         tick_formatter2=None,
                                         )
 
-    ax1 = FloatingSubplot(fig, rect, grid_helper=grid_helper)
+    ax1 = floating_axes.FloatingSubplot(fig, rect, grid_helper=grid_helper)
     fig.add_subplot(ax1)
 
     # create a parasite axes whose transData in RA, cz
@@ -88,15 +87,15 @@ def setup_axes3(fig, rect):
 
     ra0, ra1 = 8.*15, 14.*15
     cz0, cz1 = 0, 14000
-    grid_helper = GridHelperCurveLinear(tr,
+    grid_helper = floating_axes.GridHelperCurveLinear(tr,
                                         extremes=(ra0, ra1, cz0, cz1),
                                         grid_locator1=grid_locator1,
                                         grid_locator2=grid_locator2,
                                         tick_formatter1=tick_formatter1,
                                         tick_formatter2=None,
                                         )
 
-    ax1 = FloatingSubplot(fig, rect, grid_helper=grid_helper)
+    ax1 = floating_axes.FloatingSubplot(fig, rect, grid_helper=grid_helper)
     fig.add_subplot(ax1)
 
     # adjust axis

examples/axes_grid/demo_floating_axis.py

@@ -9,13 +9,13 @@ def curvelinear_test2(fig):
     """
     global ax1
     import numpy as np
-    import  mpl_toolkits.axes_grid.angle_helper as angle_helper
+    import  mpl_toolkits.axisartist.angle_helper as angle_helper
     from matplotlib.projections import PolarAxes
     from matplotlib.transforms import Affine2D
 
-    from mpl_toolkits.axes_grid.parasite_axes import SubplotHost
+    from mpl_toolkits.axisartist import SubplotHost
 
-    from mpl_toolkits.axes_grid.grid_helper_curvelinear import GridHelperCurveLinear
+    from mpl_toolkits.axisartist import GridHelperCurveLinear
 
     # see demo_curvelinear_grid.py for details
     tr = Affine2D().scale(np.pi/180., 1.) + PolarAxes.PolarTransform()

examples/axes_grid/demo_parasite_axes2.py

@@ -1,29 +1,28 @@
-from mpl_toolkits.axes_grid.parasite_axes import SubplotHost
+from mpl_toolkits.axes_grid1.parasite_axes import SubplotHost
 import matplotlib.pyplot as plt
 
 if 1:
     fig = plt.figure(1)
 
     host = SubplotHost(fig, 111)
 
-    host.set_ylabel("Density")
-    host.set_xlabel("Distance")
-
     par1 = host.twinx()
     par2 = host.twinx()
 
-    par1.set_ylabel("Temperature")
-
-    par2.axis["right"].set_visible(False)
-
-    offset = 60, 0
-    new_axisline = par2.get_grid_helper().new_fixed_axis
-    par2.axis["right2"] = new_axisline(loc="right",
-                                       axes=par2,
-                                       offset=offset)
+    offset = 60
+    if hasattr(par2.axis["right"].line, "set_position"):
+        # use spine method
+        par2.axis["right"].line.set_position(('outward',offset))
+        # set_position calls axis.cla()
+        par2.axis["left"].toggle(all=False)
+    else:
+        new_axisline = par2.get_grid_helper().new_fixed_axis
+        par2.axis["right"] = new_axisline(loc="right",
+                                          axes=par2,
+                                          offset=(offset, 0))
+        
+    par2.axis["right"].toggle(all=True)
 
-    par2.axis["right2"].label.set_visible(True)
-    par2.axis["right2"].set_label("Velocity")
 
     fig.add_axes(host)
     plt.subplots_adjust(right=0.75)
@@ -34,6 +33,7 @@
     host.set_xlabel("Distance")
     host.set_ylabel("Density")
     par1.set_ylabel("Temperature")
+    par2.set_ylabel("Velocity")
 
     p1, = host.plot([0, 1, 2], [0, 1, 2], label="Density")
     p2, = par1.plot([0, 1, 2], [0, 3, 2], label="Temperature")
@@ -46,7 +46,7 @@
 
     host.axis["left"].label.set_color(p1.get_color())
     par1.axis["right"].label.set_color(p2.get_color())
-    par2.axis["right2"].label.set_color(p3.get_color())
+    par2.axis["right"].label.set_color(p3.get_color())
 
     plt.draw()
     plt.show()

examples/axes_grid/inset_locator_demo.py

@@ -1,7 +1,7 @@
 import matplotlib.pyplot as plt
 
-from mpl_toolkits.axes_grid.inset_locator import inset_axes, zoomed_inset_axes
-from mpl_toolkits.axes_grid.anchored_artists import AnchoredSizeBar
+from mpl_toolkits.axes_grid1.inset_locator import inset_axes, zoomed_inset_axes
+from mpl_toolkits.axes_grid1.anchored_artists import AnchoredSizeBar
 
 
 def add_sizebar(ax, size):

examples/axes_grid/inset_locator_demo2.py

@@ -1,7 +1,7 @@
 import matplotlib.pyplot as plt
 
-from mpl_toolkits.axes_grid.inset_locator import zoomed_inset_axes
-from mpl_toolkits.axes_grid.inset_locator import mark_inset
+from mpl_toolkits.axes_grid1.inset_locator import zoomed_inset_axes
+from mpl_toolkits.axes_grid1.inset_locator import mark_inset
 
 import numpy as np
 

examples/axes_grid/parasite_simple2.py

@@ -1,6 +1,6 @@
 import matplotlib.transforms as mtransforms
 import matplotlib.pyplot as plt
-from mpl_toolkits.axes_grid.parasite_axes import SubplotHost
+from mpl_toolkits.axes_grid1.parasite_axes import SubplotHost
 
 obs = [["01_S1", 3.88, 0.14, 1970, 63],
        ["01_S4", 5.6, 0.82, 1622, 150],

examples/axes_grid/scatter_hist.py

@@ -8,7 +8,7 @@
 
 fig = plt.figure(1, figsize=(5.5,5.5))
 
-from mpl_toolkits.axes_grid import make_axes_locatable
+from mpl_toolkits.axes_grid1 import make_axes_locatable
 
 axScatter = plt.subplot(111)
 divider = make_axes_locatable(axScatter)

examples/axes_grid/simple_anchored_artists.py

@@ -2,7 +2,7 @@
 
 
 def draw_text(ax):
-    from mpl_toolkits.axes_grid.anchored_artists import AnchoredText
+    from mpl_toolkits.axes_grid1.anchored_artists import AnchoredText
     at = AnchoredText("Figure 1a",
                       loc=2, prop=dict(size=8), frameon=True,
                       )
@@ -18,7 +18,7 @@ def draw_text(ax):
     ax.add_artist(at2)
 
 def draw_circle(ax): # circle in the canvas coordinate
-    from mpl_toolkits.axes_grid.anchored_artists import AnchoredDrawingArea
+    from mpl_toolkits.axes_grid1.anchored_artists import AnchoredDrawingArea
     from matplotlib.patches import Circle
     ada = AnchoredDrawingArea(20, 20, 0, 0,
                               loc=1, pad=0., frameon=False)
@@ -27,15 +27,15 @@ def draw_circle(ax): # circle in the canvas coordinate
     ax.add_artist(ada)
 
 def draw_ellipse(ax):
-    from mpl_toolkits.axes_grid.anchored_artists import AnchoredEllipse
+    from mpl_toolkits.axes_grid1.anchored_artists import AnchoredEllipse
     # draw an ellipse of width=0.1, height=0.15 in the data coordinate
     ae = AnchoredEllipse(ax.transData, width=0.1, height=0.15, angle=0.,
                          loc=3, pad=0.5, borderpad=0.4, frameon=True)
 
     ax.add_artist(ae)
 
 def draw_sizebar(ax):
-    from mpl_toolkits.axes_grid.anchored_artists import AnchoredSizeBar
+    from mpl_toolkits.axes_grid1.anchored_artists import AnchoredSizeBar
     # draw a horizontal bar with length of 0.1 in Data coordinate
     # (ax.transData) with a label underneath.
     asb =  AnchoredSizeBar(ax.transData,

examples/axes_grid/simple_axesgrid.py

@@ -1,12 +1,12 @@
 import matplotlib.pyplot as plt
-from mpl_toolkits.axes_grid import AxesGrid
+from mpl_toolkits.axes_grid1 import ImageGrid
 import numpy as np
 
 im = np.arange(100)
 im.shape = 10, 10
 
 fig = plt.figure(1, (4., 4.))
-grid = AxesGrid(fig, 111, # similar to subplot(111)
+grid = ImageGrid(fig, 111, # similar to subplot(111)
                 nrows_ncols = (2, 2), # creates 2x2 grid of axes
                 axes_pad=0.1, # pad between axes in inch.
                 )

examples/axes_grid/simple_axesgrid2.py

@@ -1,5 +1,5 @@
 import matplotlib.pyplot as plt
-from mpl_toolkits.axes_grid import AxesGrid
+from mpl_toolkits.axes_grid1 import ImageGrid
 
 def get_demo_image():
     import numpy as np
@@ -10,7 +10,7 @@ def get_demo_image():
     return z, (-3,4,-4,3)
 
 F = plt.figure(1, (5.5, 3.5))
-grid = AxesGrid(F, 111, # similar to subplot(111)
+grid = ImageGrid(F, 111, # similar to subplot(111)
                 nrows_ncols = (1, 3),
                 axes_pad = 0.1,
                 add_all=True,