SF.net SVN: matplotlib: [5340] trunk/toolkits/basemap/examples
Revision: 5340
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5340&view=rev
Author: jswhit
Date: 2008-05-31 05:26:21 -0700 (Sat, 31 May 2008)
Log Message:
---
replace "faceted=False" with "edgecolors='none' to suppress deprecation warning
Modified Paths:
--
trunk/toolkits/basemap/examples/plotcities.py
trunk/toolkits/basemap/examples/randompoints.py
Modified: trunk/toolkits/basemap/examples/plotcities.py
===
--- trunk/toolkits/basemap/examples/plotcities.py 2008-05-30 22:24:06 UTC
(rev 5339)
+++ trunk/toolkits/basemap/examples/plotcities.py 2008-05-31 12:26:21 UTC
(rev 5340)
@@ -18,6 +18,6 @@
colors.append(plt.cm.jet(float(rank)/100.))
m.drawcoastlines()
m.fillcontinents()
-m.scatter(x,y,25,colors,marker='o',faceted=False,zorder=10)
+m.scatter(x,y,25,colors,marker='o',edgecolors='none',zorder=10)
plt.title('City Locations colored by Population Rank')
plt.show()
Modified: trunk/toolkits/basemap/examples/randompoints.py
===
--- trunk/toolkits/basemap/examples/randompoints.py 2008-05-30 22:24:06 UTC
(rev 5339)
+++ trunk/toolkits/basemap/examples/randompoints.py 2008-05-31 12:26:21 UTC
(rev 5340)
@@ -28,7 +28,7 @@
# draw colored markers.
# use zorder=10 to make sure markers are drawn last.
# (otherwise they are covered up when continents are filled)
-#m.scatter(x,y,25,z,cmap=plt.cm.jet,marker='o',faceted=False,zorder=10)
+#m.scatter(x,y,25,z,cmap=plt.cm.jet,marker='o',edgecolors='none',zorder=10)
# create a list of strings containing z values
# or, plot actual numbers as color-coded text strings.
zn = [ '%2i' % zz for zz in z ]
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5341] trunk/toolkits/basemap/lib/mpl_toolkits/ basemap/basemap.py
Revision: 5341 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5341&view=rev Author: jswhit Date: 2008-05-31 05:57:10 -0700 (Sat, 31 May 2008) Log Message: --- fixed warpimage method to work with recent matplotlib change "2008-05-29 matplotlib.image.imread now no longer always returns RGBA" Modified Paths: -- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/basemap.py Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/basemap.py === --- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/basemap.py 2008-05-31 12:26:21 UTC (rev 5340) +++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/basemap.py 2008-05-31 12:57:10 UTC (rev 5341) @@ -2802,12 +2802,12 @@ dx = 2.*np.pi*self.rmajor/float(nlons) nx = int((self.xmax-self.xmin)/dx)+1 ny = int((self.ymax-self.ymin)/dx)+1 -self._bm_rgba_warped = np.zeros((ny,nx,4),np.float64) +self._bm_rgba_warped = np.ones((ny,nx,4),np.float64) # interpolate rgba values from geographic coords (proj='cyl') # to map projection coords. # if masked=True, values outside of # projection limb will be masked. -for k in range(4): +for k in range(3): self._bm_rgba_warped[:,:,k],x,y = \ self.transform_scalar(self._bm_rgba[:,:,k],\ self._bm_lons,self._bm_lats,nx,ny,returnxy=True) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5342] trunk/toolkits/basemap/examples
Revision: 5342 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5342&view=rev Author: jswhit Date: 2008-05-31 06:03:28 -0700 (Sat, 31 May 2008) Log Message: --- use "import numpy.ma as ma" instead of "from numpy import ma" Modified Paths: -- trunk/toolkits/basemap/examples/ccsm_popgrid.py trunk/toolkits/basemap/examples/fcstmaps.py trunk/toolkits/basemap/examples/plotmap_masked.py trunk/toolkits/basemap/examples/pnganim.py Modified: trunk/toolkits/basemap/examples/ccsm_popgrid.py === --- trunk/toolkits/basemap/examples/ccsm_popgrid.py 2008-05-31 12:57:10 UTC (rev 5341) +++ trunk/toolkits/basemap/examples/ccsm_popgrid.py 2008-05-31 13:03:28 UTC (rev 5342) @@ -21,7 +21,7 @@ POP grids are used extensively locally in oceanographic and ice models. """ from matplotlib import rcParams -from numpy import ma +import numpy.ma as ma import numpy as np import matplotlib.pyplot as plt from mpl_toolkits.basemap import Basemap, NetCDFFile Modified: trunk/toolkits/basemap/examples/fcstmaps.py === --- trunk/toolkits/basemap/examples/fcstmaps.py 2008-05-31 12:57:10 UTC (rev 5341) +++ trunk/toolkits/basemap/examples/fcstmaps.py 2008-05-31 13:03:28 UTC (rev 5342) @@ -3,7 +3,7 @@ import numpy as np import matplotlib.pyplot as plt import sys -from numpy import ma +import numpy.ma as ma import datetime from mpl_toolkits.basemap import Basemap, NetCDFFile, addcyclic, num2date Modified: trunk/toolkits/basemap/examples/plotmap_masked.py === --- trunk/toolkits/basemap/examples/plotmap_masked.py 2008-05-31 12:57:10 UTC (rev 5341) +++ trunk/toolkits/basemap/examples/plotmap_masked.py 2008-05-31 13:03:28 UTC (rev 5342) @@ -6,7 +6,7 @@ # (in this case the oceans) from mpl_toolkits.basemap import Basemap, shiftgrid -from numpy import ma +import numpy.ma as ma import numpy as np import matplotlib.pyplot as plt import matplotlib.mlab as mlab Modified: trunk/toolkits/basemap/examples/pnganim.py === --- trunk/toolkits/basemap/examples/pnganim.py 2008-05-31 12:57:10 UTC (rev 5341) +++ trunk/toolkits/basemap/examples/pnganim.py 2008-05-31 13:03:28 UTC (rev 5342) @@ -7,7 +7,7 @@ import numpy as np import matplotlib.pyplot as plt import matplotlib.mlab as mlab -from numpy import ma +import numpy.ma as ma import datetime, sys, time, subprocess from mpl_toolkits.basemap import Basemap, shiftgrid, NetCDFFile, num2date This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5343] trunk/toolkits/basemap/lib/mpl_toolkits/ basemap/basemap.py
Revision: 5343 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5343&view=rev Author: jswhit Date: 2008-05-31 06:05:26 -0700 (Sat, 31 May 2008) Log Message: --- use "import numpy.ma as ma" instead of "from numpy import ma" Modified Paths: -- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/basemap.py Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/basemap.py === --- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/basemap.py 2008-05-31 13:03:28 UTC (rev 5342) +++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/basemap.py 2008-05-31 13:05:26 UTC (rev 5343) @@ -34,7 +34,7 @@ import pyproj, sys, os, math, dbflib from proj import Proj import numpy as np -from numpy import ma +import numpy.ma as ma from shapelib import ShapeFile import _geoslib, pupynere, netcdftime This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5344] trunk/toolkits/basemap/Changelog
Revision: 5344 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5344&view=rev Author: jswhit Date: 2008-05-31 06:12:55 -0700 (Sat, 31 May 2008) Log Message: --- fix to warpimage method Modified Paths: -- trunk/toolkits/basemap/Changelog Modified: trunk/toolkits/basemap/Changelog === --- trunk/toolkits/basemap/Changelog2008-05-31 13:05:26 UTC (rev 5343) +++ trunk/toolkits/basemap/Changelog2008-05-31 13:12:55 UTC (rev 5344) @@ -1,4 +1,5 @@ -version 0.99 (svn revision 5339) +version 0.99 (svn revision 5344) + * fix to warpimage method for API change in matplotlib 0.98.0. * updated pyproj to 1.8.6. * fixed bug in NetCDFFile creating masked arrays when both _FillValue and missing_value exist. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5345] trunk/toolkits/basemap/MANIFEST.in
Revision: 5345 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5345&view=rev Author: jswhit Date: 2008-05-31 07:30:09 -0700 (Sat, 31 May 2008) Log Message: --- add missing example Modified Paths: -- trunk/toolkits/basemap/MANIFEST.in Modified: trunk/toolkits/basemap/MANIFEST.in === --- trunk/toolkits/basemap/MANIFEST.in 2008-05-31 13:12:55 UTC (rev 5344) +++ trunk/toolkits/basemap/MANIFEST.in 2008-05-31 14:30:09 UTC (rev 5345) @@ -43,6 +43,7 @@ include examples/ortho_demo.py include examples/geos_demo.py include examples/geos_demo_2.py +include examples/geos_demo_3.py include examples/200706041200-msg-ch01-SAfrica.jpg include examples/fcstmaps.py include examples/plotsst.py This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
