Revision: 7231
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7231&view=rev
Author: jswhit
Date: 2009-06-23 12:39:21 +0000 (Tue, 23 Jun 2009)
Log Message:
-----------
change mlab.load to np.loadtxt
Modified Paths:
--------------
trunk/toolkits/basemap/examples/contour_demo.py
trunk/toolkits/basemap/examples/maskoceans.py
trunk/toolkits/basemap/examples/panelplot.py
trunk/toolkits/basemap/examples/plotmap.py
trunk/toolkits/basemap/examples/plotmap_masked.py
trunk/toolkits/basemap/examples/plotmap_shaded.py
trunk/toolkits/basemap/examples/polarmaps.py
trunk/toolkits/basemap/examples/simpletest.py
trunk/toolkits/basemap/examples/simpletest_oo.py
trunk/toolkits/basemap/examples/test.py
Modified: trunk/toolkits/basemap/examples/contour_demo.py
===================================================================
--- trunk/toolkits/basemap/examples/contour_demo.py 2009-06-21 18:53:49 UTC
(rev 7230)
+++ trunk/toolkits/basemap/examples/contour_demo.py 2009-06-23 12:39:21 UTC
(rev 7231)
@@ -1,14 +1,13 @@
from mpl_toolkits.basemap import Basemap, shiftgrid
import numpy as np
import matplotlib.pyplot as plt
-import matplotlib.mlab as mlab
# examples of filled contour plots on map projections.
# read in data on lat/lon grid.
-hgt = mlab.load('500hgtdata.gz')
-lons = mlab.load('500hgtlons.gz')
-lats = mlab.load('500hgtlats.gz')
+hgt = np.loadtxt('500hgtdata.gz')
+lons = np.loadtxt('500hgtlons.gz')
+lats = np.loadtxt('500hgtlats.gz')
# shift data so lons go from -180 to 180 instead of 0 to 360.
hgt,lons = shiftgrid(180.,hgt,lons,start=False)
lons, lats = np.meshgrid(lons, lats)
Modified: trunk/toolkits/basemap/examples/maskoceans.py
===================================================================
--- trunk/toolkits/basemap/examples/maskoceans.py 2009-06-21 18:53:49 UTC
(rev 7230)
+++ trunk/toolkits/basemap/examples/maskoceans.py 2009-06-23 12:39:21 UTC
(rev 7231)
@@ -1,13 +1,12 @@
from mpl_toolkits.basemap import Basemap, shiftgrid, maskoceans, interp
import numpy as np
import matplotlib.pyplot as plt
-import matplotlib.mlab as mlab
# example showing how to mask out 'wet' areas on a contour or pcolor plot.
-topodatin = mlab.load('etopo20data.gz')
-lonsin = mlab.load('etopo20lons.gz')
-latsin = mlab.load('etopo20lats.gz')
+topodatin = np.loadtxt('etopo20data.gz')
+lonsin = np.loadtxt('etopo20lons.gz')
+latsin = np.loadtxt('etopo20lats.gz')
# shift data so lons go from -180 to 180 instead of 20 to 380.
topoin,lons1 = shiftgrid(180.,topodatin,lonsin,start=False)
Modified: trunk/toolkits/basemap/examples/panelplot.py
===================================================================
--- trunk/toolkits/basemap/examples/panelplot.py 2009-06-21 18:53:49 UTC
(rev 7230)
+++ trunk/toolkits/basemap/examples/panelplot.py 2009-06-23 12:39:21 UTC
(rev 7231)
@@ -3,13 +3,12 @@
from matplotlib.ticker import MultipleLocator
import numpy as np
import matplotlib.pyplot as plt
-import matplotlib.mlab as mlab
# read in data on lat/lon grid.
-hgt = mlab.load('500hgtdata.gz')
-lons = mlab.load('500hgtlons.gz')
-lats = mlab.load('500hgtlats.gz')
+hgt = np.loadtxt('500hgtdata.gz')
+lons = np.loadtxt('500hgtlons.gz')
+lats = np.loadtxt('500hgtlats.gz')
lons, lats = np.meshgrid(lons, lats)
# Example to show how to make multi-panel plots.
Modified: trunk/toolkits/basemap/examples/plotmap.py
===================================================================
--- trunk/toolkits/basemap/examples/plotmap.py 2009-06-21 18:53:49 UTC (rev
7230)
+++ trunk/toolkits/basemap/examples/plotmap.py 2009-06-23 12:39:21 UTC (rev
7231)
@@ -7,13 +7,12 @@
from mpl_toolkits.basemap import Basemap, shiftgrid
import numpy as np
import matplotlib.pyplot as plt
-import matplotlib.mlab as mlab
# read in topo data (on a regular lat/lon grid)
# longitudes go from 20 to 380.
-topoin = mlab.load('etopo20data.gz')
-lons = mlab.load('etopo20lons.gz')
-lats = mlab.load('etopo20lats.gz')
+topoin = np.loadtxt('etopo20data.gz')
+lons = np.loadtxt('etopo20lons.gz')
+lats = np.loadtxt('etopo20lats.gz')
# shift data so lons go from -180 to 180 instead of 20 to 380.
topoin,lons = shiftgrid(180.,topoin,lons,start=False)
@@ -30,18 +29,19 @@
fig=plt.figure(figsize=(8,8))
# add an axes, leaving room for colorbar on the right.
ax = fig.add_axes([0.1,0.1,0.7,0.7])
+# associate this axes with the Basemap instance.
+m.ax = ax
# plot image over map with imshow.
im = m.imshow(topodat,plt.cm.jet)
# setup colorbar axes instance.
pos = ax.get_position()
l, b, w, h = pos.bounds
cax = plt.axes([l+w+0.075, b, 0.05, h])
-plt.colorbar(cax=cax) # draw colorbar
-plt.axes(ax) # make the original axes current again
+plt.colorbar(im,cax=cax) # draw colorbar
# plot blue dot on boulder, colorado and label it as such.
xpt,ypt = m(-104.237,40.125)
m.plot([xpt],[ypt],'bo')
-plt.text(xpt+100000,ypt+100000,'Boulder')
+ax.text(xpt+100000,ypt+100000,'Boulder')
# draw coastlines and political boundaries.
m.drawcoastlines()
m.drawcountries()
@@ -53,6 +53,5 @@
meridians = np.arange(10.,360.,30.)
m.drawmeridians(meridians,labels=[1,1,0,1])
# set title.
-plt.title('ETOPO Topography - Lambert Conformal Conic')
-#plt.savefig('plotmap.pdf')
+ax.set_title('ETOPO Topography - Lambert Conformal Conic')
plt.show()
Modified: trunk/toolkits/basemap/examples/plotmap_masked.py
===================================================================
--- trunk/toolkits/basemap/examples/plotmap_masked.py 2009-06-21 18:53:49 UTC
(rev 7230)
+++ trunk/toolkits/basemap/examples/plotmap_masked.py 2009-06-23 12:39:21 UTC
(rev 7231)
@@ -9,14 +9,13 @@
import numpy.ma as ma
import numpy as np
import matplotlib.pyplot as plt
-import matplotlib.mlab as mlab
import matplotlib.colors as colors
# read in topo data (on a regular lat/lon grid)
# longitudes go from 20 to 380.
-topoin = mlab.load('etopo20data.gz')
-lonsin = mlab.load('etopo20lons.gz')
-latsin = mlab.load('etopo20lats.gz')
+topoin = np.loadtxt('etopo20data.gz')
+lonsin = np.loadtxt('etopo20lons.gz')
+latsin = np.loadtxt('etopo20lats.gz')
# shift data so lons go from -180 to 180 instead of 20 to 380.
topoin,lonsin = shiftgrid(180.,topoin,lonsin,start=False)
@@ -33,6 +32,8 @@
fig=plt.figure(figsize=(8,8))
# add an axes, leaving room for colorbar on the right.
ax = fig.add_axes([0.1,0.1,0.7,0.7])
+# associate this axes with the Basemap instance.
+m.ax = ax
# make topodat a masked array, masking values lower than sea level.
topodat = np.where(topodat < 0.,1.e10,topodat)
topodatm = ma.masked_values(topodat, 1.e10)
@@ -44,12 +45,11 @@
pos = ax.get_position()
l, b, w, h = pos.bounds
cax = plt.axes([l+w+0.075, b, 0.05, h])
-plt.colorbar(cax=cax) # draw colorbar
-plt.axes(ax) # make the original axes current again
+plt.colorbar(im,cax=cax) # draw colorbar
# plot blue dot on boulder, colorado and label it as such.
xpt,ypt = m(-104.237,40.125)
m.plot([xpt],[ypt],'bo')
-plt.text(xpt+100000,ypt+100000,'Boulder')
+ax.text(xpt+100000,ypt+100000,'Boulder')
# draw coastlines and political boundaries.
m.drawcoastlines()
m.drawcountries()
@@ -61,5 +61,5 @@
meridians = np.arange(10.,360.,30.)
m.drawmeridians(meridians,labels=[1,1,0,1])
# set title.
-plt.title('Masked ETOPO Topography - via imshow')
+ax.set_title('Masked ETOPO Topography - via imshow')
plt.show()
Modified: trunk/toolkits/basemap/examples/plotmap_shaded.py
===================================================================
--- trunk/toolkits/basemap/examples/plotmap_shaded.py 2009-06-21 18:53:49 UTC
(rev 7230)
+++ trunk/toolkits/basemap/examples/plotmap_shaded.py 2009-06-23 12:39:21 UTC
(rev 7231)
@@ -6,7 +6,6 @@
from mpl_toolkits.basemap import Basemap, shiftgrid
import numpy as np
import matplotlib.pyplot as plt
-import matplotlib.mlab as mlab
try:
from matplotlib.colors import LightSource
except ImportError:
@@ -15,9 +14,9 @@
# read in topo data (on a regular lat/lon grid)
# longitudes go from 20 to 380.
-topoin = mlab.load('etopo20data.gz')
-lons = mlab.load('etopo20lons.gz')
-lats = mlab.load('etopo20lats.gz')
+topoin = np.loadtxt('etopo20data.gz')
+lons = np.loadtxt('etopo20lons.gz')
+lats = np.loadtxt('etopo20lats.gz')
# shift data so lons go from -180 to 180 instead of 20 to 380.
topoin,lons = shiftgrid(180.,topoin,lons,start=False)
Modified: trunk/toolkits/basemap/examples/polarmaps.py
===================================================================
--- trunk/toolkits/basemap/examples/polarmaps.py 2009-06-21 18:53:49 UTC
(rev 7230)
+++ trunk/toolkits/basemap/examples/polarmaps.py 2009-06-23 12:39:21 UTC
(rev 7231)
@@ -8,13 +8,12 @@
from mpl_toolkits.basemap import Basemap
import numpy as np
import matplotlib.pyplot as plt
-import matplotlib.mlab as mlab
# read in topo data (on a regular lat/lon grid)
# longitudes go from 20 to 380.
-etopo = mlab.load('etopo20data.gz')
-lons = mlab.load('etopo20lons.gz')
-lats = mlab.load('etopo20lats.gz')
+etopo = np.loadtxt('etopo20data.gz')
+lons = np.loadtxt('etopo20lons.gz')
+lats = np.loadtxt('etopo20lats.gz')
print 'min/max etopo20 data:'
print etopo.min(),etopo.max()
Modified: trunk/toolkits/basemap/examples/simpletest.py
===================================================================
--- trunk/toolkits/basemap/examples/simpletest.py 2009-06-21 18:53:49 UTC
(rev 7230)
+++ trunk/toolkits/basemap/examples/simpletest.py 2009-06-23 12:39:21 UTC
(rev 7231)
@@ -1,11 +1,10 @@
from mpl_toolkits.basemap import Basemap
import numpy as np
import matplotlib.pyplot as plt
-import matplotlib.mlab as mlab
# read in topo data (on a regular lat/lon grid)
-etopo=mlab.load('etopo20data.gz')
-lons=mlab.load('etopo20lons.gz')
-lats=mlab.load('etopo20lats.gz')
+etopo=np.loadtxt('etopo20data.gz')
+lons=np.loadtxt('etopo20lons.gz')
+lats=np.loadtxt('etopo20lats.gz')
# create Basemap instance for Robinson projection.
m = Basemap(projection='robin',lon_0=0.5*(lons[0]+lons[-1]))
# make filled contour plot.
Modified: trunk/toolkits/basemap/examples/simpletest_oo.py
===================================================================
--- trunk/toolkits/basemap/examples/simpletest_oo.py 2009-06-21 18:53:49 UTC
(rev 7230)
+++ trunk/toolkits/basemap/examples/simpletest_oo.py 2009-06-23 12:39:21 UTC
(rev 7231)
@@ -8,15 +8,13 @@
from mpl_toolkits.basemap import Basemap
from matplotlib.figure import Figure
import numpy as np
-import matplotlib.mlab as mlab
import matplotlib.cm as cm
-from matplotlib.mlab import load
# read in topo data (on a regular lat/lon grid)
# longitudes go from 20 to 380.
-etopo = mlab.load('etopo20data.gz')
-lons = mlab.load('etopo20lons.gz')
-lats = mlab.load('etopo20lats.gz')
+etopo = np.loadtxt('etopo20data.gz')
+lons = np.loadtxt('etopo20lons.gz')
+lats = np.loadtxt('etopo20lats.gz')
# create figure.
fig = Figure()
canvas = FigureCanvas(fig)
Modified: trunk/toolkits/basemap/examples/test.py
===================================================================
--- trunk/toolkits/basemap/examples/test.py 2009-06-21 18:53:49 UTC (rev
7230)
+++ trunk/toolkits/basemap/examples/test.py 2009-06-23 12:39:21 UTC (rev
7231)
@@ -6,14 +6,13 @@
from mpl_toolkits.basemap import Basemap, shiftgrid
import numpy as np
import matplotlib.pyplot as plt
-import matplotlib.mlab as mlab
import matplotlib.colors as colors
# read in topo data (on a regular lat/lon grid)
# longitudes go from 20 to 380.
-topodatin = mlab.load('etopo20data.gz')
-lonsin = mlab.load('etopo20lons.gz')
-latsin = mlab.load('etopo20lats.gz')
+topodatin = np.loadtxt('etopo20data.gz')
+lonsin = np.loadtxt('etopo20lons.gz')
+latsin = np.loadtxt('etopo20lats.gz')
# shift data so lons go from -180 to 180 instead of 20 to 380.
topoin,lons = shiftgrid(180.,topodatin,lonsin,start=False)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Are you an open source citizen? Join us for the Open Source Bridge conference!
Portland, OR, June 17-19. Two days of sessions, one day of unconference: $250.
Need another reason to go? 24-hour hacker lounge. Register today!
http://ad.doubleclick.net/clk;215844324;13503038;v?http://opensourcebridge.org
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
