SF.net SVN: matplotlib: [4739] trunk/toolkits/basemap/examples/plotsst.py

2007-12-15 Thread jswhit
Revision: 4739
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4739&view=rev
Author:   jswhit
Date: 2007-12-15 05:39:05 -0800 (Sat, 15 Dec 2007)

Log Message:
---
add title

Modified Paths:
--
trunk/toolkits/basemap/examples/plotsst.py

Modified: trunk/toolkits/basemap/examples/plotsst.py
===
--- trunk/toolkits/basemap/examples/plotsst.py  2007-12-15 02:33:26 UTC (rev 
4738)
+++ trunk/toolkits/basemap/examples/plotsst.py  2007-12-15 13:39:05 UTC (rev 
4739)
@@ -3,7 +3,8 @@
 # read in sea-surface temperature and ice data
 # can be a local file, a URL for a remote opendap dataset,
 # or (if PyNIO is installed) a GRIB or HDF file.
-ncfile = 
NetCDFFile('http://nomads.ncdc.noaa.gov:8085/thredds/dodsC/oisst/2007/AVHRR/sst4-navy-eot.20071213.nc')
+date = '20071214'
+ncfile = 
NetCDFFile('http://nomads.ncdc.noaa.gov:8085/thredds/dodsC/oisst/'+date[0:4]+'/AVHRR/sst4-navy-eot.'+date+'.nc')
 # read sst.  Will automatically create a masked array using
 # missing_value variable attribute.
 sst = ncfile.variables['sst'][:]
@@ -25,6 +26,7 @@
 # create Basemap instance for mollweide projection.
 # coastlines not used, so resolution set to None to skip
 # continent processing (this speeds things up a bit)
+#m = Basemap(projection='ortho',lon_0=-110,lat_0=20,resolution=None)
 m = Basemap(projection='moll',lon_0=lons.mean(),lat_0=0,resolution=None)
 # compute map projection coordinates of grid.
 x, y = m(*numpy.meshgrid(lons, lats))
@@ -40,5 +42,6 @@
 m.drawmeridians(numpy.arange(0.,420.,60.))
 # draw horizontal colorbar.
 pylab.colorbar(im1,orientation='horizontal')
-# display the plot.
+# display the plot with a title.
+pylab.title('SST and ICE analysis for %s'%date)
 pylab.show()


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins


SF.net SVN: matplotlib: [4740] trunk/toolkits/basemap/lib

2007-12-15 Thread jswhit
Revision: 4740
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4740&view=rev
Author:   jswhit
Date: 2007-12-15 10:18:03 -0800 (Sat, 15 Dec 2007)

Log Message:
---
don't use namespace packages

Modified Paths:
--
trunk/toolkits/basemap/lib/dap/__init__.py
trunk/toolkits/basemap/lib/matplotlib/__init__.py

Modified: trunk/toolkits/basemap/lib/dap/__init__.py
===
--- trunk/toolkits/basemap/lib/dap/__init__.py  2007-12-15 13:39:05 UTC (rev 
4739)
+++ trunk/toolkits/basemap/lib/dap/__init__.py  2007-12-15 18:18:03 UTC (rev 
4740)
@@ -9,4 +9,7 @@
 For more information about the protocol, please check http://opendap.org.
 """
 
-__import__('pkg_resources').declare_namespace(__name__)
+#try:
+#__import__('pkg_resources').declare_namespace(__name__)
+#except ImportError:
+#pass # must not have setuptools

Modified: trunk/toolkits/basemap/lib/matplotlib/__init__.py
===
--- trunk/toolkits/basemap/lib/matplotlib/__init__.py   2007-12-15 13:39:05 UTC 
(rev 4739)
+++ trunk/toolkits/basemap/lib/matplotlib/__init__.py   2007-12-15 18:18:03 UTC 
(rev 4740)
@@ -1,4 +1,4 @@
-try:
-__import__('pkg_resources').declare_namespace(__name__)
-except ImportError:
-pass # must not have setuptools
+#try:
+#__import__('pkg_resources').declare_namespace(__name__)
+#except ImportError:
+#pass # must not have setuptools


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins


SF.net SVN: matplotlib: [4741] trunk/toolkits/basemap/README

2007-12-15 Thread jswhit
Revision: 4741
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4741&view=rev
Author:   jswhit
Date: 2007-12-15 11:02:17 -0800 (Sat, 15 Dec 2007)

Log Message:
---
add LD_LIBRARY_PATH to instructions.

Modified Paths:
--
trunk/toolkits/basemap/README

Modified: trunk/toolkits/basemap/README
===
--- trunk/toolkits/basemap/README   2007-12-15 18:18:03 UTC (rev 4740)
+++ trunk/toolkits/basemap/README   2007-12-15 19:02:17 UTC (rev 4741)
@@ -82,9 +82,14 @@
  > make; make install
 
 3) cd back to the top level basemap directory (basemap-X.Y.Z) and
-run the usual 'python setup.py install'.
+run the usual 'python setup.py install'. 
 
-4) if you want the full-resolution coastlines, download 
+4) To test, cd to the examples directory and run 'python simpletest.py'.
+On linux, if you get an import error (with a message about not
+finding libgeos.so) you may need to set the LD_LIBRARY_PATH environment
+to include $GEOS_DIR/lib.
+
+5) if you want the full-resolution coastlines, download 
 basemap-data-fullres-X.Y.Z.tar.gz (about 70 mb), untar
 it, cd into basemap-data-fullres-X.Y.Z and
 run 'python setup-data.py install'.


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins


SF.net SVN: matplotlib: [4742] trunk/toolkits/basemap/setupegg-data.py

2007-12-15 Thread jswhit
Revision: 4742
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4742&view=rev
Author:   jswhit
Date: 2007-12-15 11:10:31 -0800 (Sat, 15 Dec 2007)

Log Message:
---
new file

Added Paths:
---
trunk/toolkits/basemap/setupegg-data.py

Added: trunk/toolkits/basemap/setupegg-data.py
===
--- trunk/toolkits/basemap/setupegg-data.py (rev 0)
+++ trunk/toolkits/basemap/setupegg-data.py 2007-12-15 19:10:31 UTC (rev 
4742)
@@ -0,0 +1,6 @@
+"""
+Poor man's setuptools script...
+"""
+
+from setuptools import setup
+execfile('setup-data.py')


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins


SF.net SVN: matplotlib: [4743] trunk/toolkits/basemap/MANIFEST-data

2007-12-15 Thread jswhit
Revision: 4743
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4743&view=rev
Author:   jswhit
Date: 2007-12-15 11:31:32 -0800 (Sat, 15 Dec 2007)

Log Message:
---
add setupegg-data.py

Modified Paths:
--
trunk/toolkits/basemap/MANIFEST-data

Modified: trunk/toolkits/basemap/MANIFEST-data
===
--- trunk/toolkits/basemap/MANIFEST-data2007-12-15 19:10:31 UTC (rev 
4742)
+++ trunk/toolkits/basemap/MANIFEST-data2007-12-15 19:31:32 UTC (rev 
4743)
@@ -2,6 +2,7 @@
 LICENSE_data
 README
 setup-data.py
+setupegg-data.py
 lib/matplotlib/toolkits/basemap/data/__init__.py
 lib/matplotlib/toolkits/basemap/data/countries_f.dat
 lib/matplotlib/toolkits/basemap/data/countriesmeta_f.dat


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins


SF.net SVN: matplotlib: [4744] trunk/toolkits/basemap/lib/matplotlib/ toolkits/__init__.py

2007-12-15 Thread jswhit
Revision: 4744
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4744&view=rev
Author:   jswhit
Date: 2007-12-15 12:27:51 -0800 (Sat, 15 Dec 2007)

Log Message:
---
don't use setuptools

Modified Paths:
--
trunk/toolkits/basemap/lib/matplotlib/toolkits/__init__.py

Modified: trunk/toolkits/basemap/lib/matplotlib/toolkits/__init__.py
===
--- trunk/toolkits/basemap/lib/matplotlib/toolkits/__init__.py  2007-12-15 
19:31:32 UTC (rev 4743)
+++ trunk/toolkits/basemap/lib/matplotlib/toolkits/__init__.py  2007-12-15 
20:27:51 UTC (rev 4744)
@@ -1,4 +1,4 @@
-try:
-__import__('pkg_resources').declare_namespace(__name__)
-except ImportError:
-pass # must not have setuptools
+#try:
+#__import__('pkg_resources').declare_namespace(__name__)
+#except ImportError:
+#pass # must not have setuptools


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins


SF.net SVN: matplotlib: [4745] trunk/matplotlib/lib/matplotlib

2007-12-15 Thread jdh2358
Revision: 4745
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4745&view=rev
Author:   jdh2358
Date: 2007-12-15 13:33:38 -0800 (Sat, 15 Dec 2007)

Log Message:
---
changed %g to %r for rec2csv

Modified Paths:
--
trunk/matplotlib/lib/matplotlib/mlab.py
trunk/matplotlib/lib/matplotlib/mpl-data/matplotlib.conf.template

Modified: trunk/matplotlib/lib/matplotlib/mlab.py
===
--- trunk/matplotlib/lib/matplotlib/mlab.py 2007-12-15 20:27:51 UTC (rev 
4744)
+++ trunk/matplotlib/lib/matplotlib/mlab.py 2007-12-15 21:33:38 UTC (rev 
4745)
@@ -2233,12 +2233,12 @@
 return self.toval(x)
 
 def toval(self, x):
-return str(x)
+return repr(x)
 
 
 class FormatString(FormatObj):
 def tostr(self, x):
-return '"%s"'%self.toval(x)
+return '"%r"'%self.toval(x)
 
 
 class FormatFormatStr(FormatObj):
@@ -2317,7 +2317,7 @@
 format = copy.deepcopy(format)
 if isinstance(format, FormatFloat):
 format.scale = 1. # override scaling for storage
-format.fmt = '%g' # maximal precision
+format.fmt = '%r'
 return format
 
 def rec2csv(r, fname, delimiter=',', formatd=None):

Modified: trunk/matplotlib/lib/matplotlib/mpl-data/matplotlib.conf.template
===
--- trunk/matplotlib/lib/matplotlib/mpl-data/matplotlib.conf.template   
2007-12-15 20:27:51 UTC (rev 4744)
+++ trunk/matplotlib/lib/matplotlib/mpl-data/matplotlib.conf.template   
2007-12-15 21:33:38 UTC (rev 4745)
@@ -3,32 +3,32 @@
 # This is a sample matplotlib configuration file.  It should be placed
 # in HOME/.matplotlib/matplotlibrc (unix/linux like systems) and
 # C:\Documents and Settings\yourname\.matplotlib (win32 systems)
-# 
+#
 # By default, the installer will overwrite the existing file in the install
 # path, so if you want to preserve yours, please move it to your HOME dir and
 # set the environment variable if necessary.
-# 
+#
 # This file is best viewed in a editor which supports ini or conf mode syntax
 # highlighting.
-# 
+#
 # Blank lines, or lines starting with a comment symbol, are ignored,
 # as are trailing comments.  Other lines must have the format
-# 
+#
 #   key = val   optional comment
-# 
+#
 # val should be valid python syntax, just as you would use when setting
 # properties using rcParams. This should become more obvious by inspecting
 # the default values listed herein.
-# 
+#
 # Colors: for the color values below, you can either use
 #  - a matplotlib color string, such as r | k | b
 #  - an rgb tuple, such as (1.0, 0.5, 0.0)
 #  - a hex string, such as #ff00ff or ff00ff
 #  - a scalar grayscale intensity such as 0.75
 #  - a legal html color name, eg red | blue | darkslategray
-# 
+#
 # Interactivity: see http://matplotlib.sourceforge.net/interactive.html.
-# 
+#
 # ### CONFIGURATION BEGINS HERE ###
 
 # a value of type 'str'
@@ -42,7 +42,7 @@
 # 'Africa/Abidjan' or 'Africa/Accra' or 'Africa/Addis_Ababa' or
 # 'Africa/Algiers' or 'Africa/Asmara' or 'Africa/Asmera' or 'Africa/Bamako' or
 # 'Africa/Bangui' or 'Africa/Banjul' or 'Africa/Bissau' or 'Africa/Blantyre'
-#  <...snipped 156 lines...> 
+#  <...snipped 156 lines...>
 # 'US/Michigan' or 'US/Mountain' or 'US/Pacific' or 'US/Pacific-New' or
 # 'US/Samoa' or 'UTC' or 'Universal' or 'W-SU' or 'WET' or 'Zulu' or
 # 'posixrules'
@@ -108,10 +108,10 @@
 [[ps]]
 # 3 or 42
 fonttype = 3
-# 'auto' or 'letter' or 'legal' or 'ledger' or 'A0' or 'A1' or 'A2' or
-# 'A3' or 'A4' or 'A5' or 'A6' or 'A7' or 'A8' or 'A9' or 'A10' or
-# 'B0' or 'B1' or 'B2' or 'B3' or 'B4' or 'B5' or 'B6' or 'B7' or 'B8'
-# or 'B9' or 'B10'
+# auto | letter | legal | ledger | A0 | A1 | A2 |
+# A3 | A4 | A5 | A6 | A7 | A8 | A9 | A10 |
+# B0 | B1 | B2 | B3 | B4 | B5 | B6 | B7 | B8
+# | B9 | B10
 papersize = 'letter'
 # a value of type 'bool'
 useafm = False
@@ -216,7 +216,7 @@
 # 'Accent' or 'Accent_r' or 'Blues' or 'Blues_r' or 'BrBG' or 'BrBG_r' or
 # 'BuGn' or 'BuGn_r' or 'BuPu' or 'BuPu_r' or 'Dark2' or 'Dark2_r' or
 # 'GnBu' or 'GnBu_r' or 'Greens' or 'Greens_r' or 'Greys' or 'Greys_r' or
-#  <...snipped 16 lines...> 
+#  <...snipped 16 lines...>
 # 'pink_r' or 'prism' or 'prism_r' or 'spectral' or 'spectral_r' or
 # 'spring' or 'spring_r' or 'summer' or 'summer_r' or 'winter' or
 # 'winter_r'
@@ -404,4 +404,4 @@
 # a value of type 'float'
 pad = 4.0
 # a value of type 'float'
-size = 2.0
\ No newline at end of file
+size = 2.0


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-
SF.Net email is sponsored by:
Check out the new SourceForge.net Mar