matplotlib-checkins Mailing List for matplotlib

Revision: 8410
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8410&view=rev
Author: jswhit
Date: 2010年06月10日 18:43:34 +0000 (2010年6月10日)
Log Message:
-----------
added ploticos.py example for plotting triangular grids.
Modified Paths:
--------------
 trunk/toolkits/basemap/Changelog
 trunk/toolkits/basemap/MANIFEST.in
 trunk/toolkits/basemap/examples/README
 trunk/toolkits/basemap/examples/ploticos.py
Modified: trunk/toolkits/basemap/Changelog
===================================================================
--- trunk/toolkits/basemap/Changelog	2010年06月10日 18:25:19 UTC (rev 8409)
+++ trunk/toolkits/basemap/Changelog	2010年06月10日 18:43:34 UTC (rev 8410)
@@ -4,12 +4,12 @@
 * add support for plotting on unstructured grids using
 keyword 'tri' in pcolor,contour,contourf methods (which
 then forward to tripcolor, tricontour, tricontourf axes
- methods).
+ methods). examples/ploticos.py added.
 	 * let continents that fill the whole map be filled.
 * added option for cubic spline interpolation in interp function
 (order=3) using scipy.ndimage.
 * added "near-sided perspective" projection for a satellite
- view at an arbitrary altitude.
+ view at an arbitrary altitude.
 * patch from Stephane Raynaud to pass format string to
 drawmapscale, and allow units='m'.
 * updated proj4 source to version 4.7.0, pyproj to 1.8.6.
Modified: trunk/toolkits/basemap/MANIFEST.in
===================================================================
--- trunk/toolkits/basemap/MANIFEST.in	2010年06月10日 18:25:19 UTC (rev 8409)
+++ trunk/toolkits/basemap/MANIFEST.in	2010年06月10日 18:43:34 UTC (rev 8410)
@@ -20,6 +20,7 @@
 include examples/simpletest_oo.py
 include examples/randompoints.py
 include examples/daynight.py
+include examples/ploticos.py
 include examples/test.py
 include examples/us_25m.dem
 include examples/testgdal.py
Modified: trunk/toolkits/basemap/examples/README
===================================================================
--- trunk/toolkits/basemap/examples/README	2010年06月10日 18:25:19 UTC (rev 8409)
+++ trunk/toolkits/basemap/examples/README	2010年06月10日 18:43:34 UTC (rev 8410)
@@ -136,3 +136,5 @@
 (requires scipy).
 
 daynight.py shows how to shade the regions of a map where the sun has set.
+
+ploticos.py demonstrates plotting on unstructured grids.
Modified: trunk/toolkits/basemap/examples/ploticos.py
===================================================================
--- trunk/toolkits/basemap/examples/ploticos.py	2010年06月10日 18:25:19 UTC (rev 8409)
+++ trunk/toolkits/basemap/examples/ploticos.py	2010年06月10日 18:43:34 UTC (rev 8410)
@@ -16,4 +16,5 @@
 map.pcolor(x,y,z,tri=True,shading='faceted',vmin=0,vmax=3000)
 #map.contourf(x,y,z,np.arange(0,3000,150),tri=True)
 #map.contour(x,y,z,np.arange(0,3000,150),tri=True)
+plt.title('pcolor plot on a global icosahedral mesh')
 plt.show()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8409
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8409&view=rev
Author: jswhit
Date: 2010年06月10日 18:25:19 +0000 (2010年6月10日)
Log Message:
-----------
don't force adjustable='box' for AxesGrid compatability. Added example that uses AxesGrid.
Modified Paths:
--------------
 trunk/toolkits/basemap/Changelog
 trunk/toolkits/basemap/MANIFEST.in
 trunk/toolkits/basemap/examples/README
 trunk/toolkits/basemap/examples/run_all.py
 trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
Added Paths:
-----------
 trunk/toolkits/basemap/examples/fcstmaps_axesgrid.py
Modified: trunk/toolkits/basemap/Changelog
===================================================================
--- trunk/toolkits/basemap/Changelog	2010年06月10日 17:48:10 UTC (rev 8408)
+++ trunk/toolkits/basemap/Changelog	2010年06月10日 18:25:19 UTC (rev 8409)
@@ -1,4 +1,6 @@
 version 0.99.5 (not yet released)
+	 * don't force adjustable='box' so Basemap is compatible
+ with AxesGrid. Added fcstmaps_axesgrid.py example.
 * add support for plotting on unstructured grids using
 keyword 'tri' in pcolor,contour,contourf methods (which
 then forward to tripcolor, tricontour, tricontourf axes
Modified: trunk/toolkits/basemap/MANIFEST.in
===================================================================
--- trunk/toolkits/basemap/MANIFEST.in	2010年06月10日 17:48:10 UTC (rev 8408)
+++ trunk/toolkits/basemap/MANIFEST.in	2010年06月10日 18:25:19 UTC (rev 8409)
@@ -53,6 +53,7 @@
 include examples/geos_demo_3.py
 include examples/200706041200-msg-ch01-SAfrica.jpg
 include examples/fcstmaps.py
+include examples/fcstmaps_axesgrid.py
 include examples/plotsst.py
 include examples/wiki_example.py
 include examples/fillstates.py
Modified: trunk/toolkits/basemap/examples/README
===================================================================
--- trunk/toolkits/basemap/examples/README	2010年06月10日 17:48:10 UTC (rev 8408)
+++ trunk/toolkits/basemap/examples/README	2010年06月10日 18:25:19 UTC (rev 8409)
@@ -63,6 +63,9 @@
 fcstmaps.py is a sample multi-panel plot that accesses
 data over http using the dap module. An internet connection is required.
 
+fcstmaps_axesgrid.py is the same as above, but illustrates the use
+of the AxesGrid toolkit.
+
 plotsst.py also uses dap client to access the data, and also illustrates
 how the NetCDFFile function deals with missing values.
 
Added: trunk/toolkits/basemap/examples/fcstmaps_axesgrid.py
===================================================================
--- trunk/toolkits/basemap/examples/fcstmaps_axesgrid.py	 (rev 0)
+++ trunk/toolkits/basemap/examples/fcstmaps_axesgrid.py	2010年06月10日 18:25:19 UTC (rev 8409)
@@ -0,0 +1,102 @@
+# this example reads today's numerical weather forecasts 
+# from the NOAA OpenDAP servers and makes a multi-panel plot.
+# This version demonstrates the use of the AxesGrid toolkit.
+import numpy as np
+import matplotlib.pyplot as plt
+import sys
+import numpy.ma as ma
+import datetime
+from mpl_toolkits.basemap import Basemap, NetCDFFile, addcyclic, num2date
+from mpl_toolkits.axes_grid1 import AxesGrid
+
+
+# today's date is default.
+if len(sys.argv) > 1:
+ YYYYMMDD = sys.argv[1]
+else:
+ YYYYMMDD = datetime.datetime.today().strftime('%Y%m%d')
+
+# set OpenDAP server URL.
+URLbase="http://nomad1.ncep.noaa.gov:9090/dods/mrf/mrf"
+URL=URLbase+YYYYMMDD+'/mrf'+YYYYMMDD
+print URL+'\n'
+try:
+ data = NetCDFFile(URL)
+except:
+ msg = """
+opendap server not providing the requested data.
+Try another date by providing YYYYMMDD on command line."""
+ raise IOError, msg
+
+
+# read lats,lons,times.
+
+print data.variables.keys()
+latitudes = data.variables['lat']
+longitudes = data.variables['lon']
+fcsttimes = data.variables['time']
+times = fcsttimes[0:6] # first 6 forecast times.
+ntimes = len(times)
+# convert times for datetime instances.
+fdates = num2date(times,units=fcsttimes.units,calendar='standard')
+# make a list of YYYYMMDDHH strings.
+verifdates = [fdate.strftime('%Y%m%d%H') for fdate in fdates]
+# convert times to forecast hours.
+fcsthrs = []
+for fdate in fdates:
+ fdiff = fdate-fdates[0]
+ fcsthrs.append(fdiff.days*24. + fdiff.seconds/3600.)
+print fcsthrs
+print verifdates
+lats = latitudes[:]
+nlats = len(lats)
+lons1 = longitudes[:]
+nlons = len(lons1)
+
+# unpack 2-meter temp forecast data.
+
+t2mvar = data.variables['tmp2m']
+t2min = t2mvar[0:ntimes,:,:]
+t2m = np.zeros((ntimes,nlats,nlons+1),t2min.dtype)
+
+# create figure, set up AxesGrid.
+fig=plt.figure(figsize=(6,8))
+grid = AxesGrid(fig, [0.05,0.01,0.9,0.9],
+ nrows_ncols=(3, 2),
+		axes_pad=0.25,
+		cbar_mode='single',
+		cbar_pad=0.3,
+		cbar_size=0.1,
+ cbar_location='top',
+ share_all=True,
+		)
+
+# create Basemap instance for Orthographic projection.
+m = Basemap(lon_0=-90,lat_0=60,projection='ortho')
+# add wrap-around point in longitude.
+for nt in range(ntimes):
+ t2m[nt,:,:], lons = addcyclic(t2min[nt,:,:], lons1)
+# convert to celsius.
+t2m = t2m-273.15
+# contour levels
+clevs = np.arange(-30,30.1,2.)
+lons, lats = np.meshgrid(lons, lats)
+x, y = m(lons, lats)
+# make subplots.
+for nt,fcsthr in enumerate(fcsthrs):
+ ax = grid[nt]
+ m.ax = ax
+ cs = m.contourf(x,y,t2m[nt,:,:],clevs,cmap=plt.cm.jet,extend='both')
+ m.drawcoastlines(linewidth=0.5)
+ m.drawcountries()
+ m.drawparallels(np.arange(-80,81,20))
+ m.drawmeridians(np.arange(0,360,20))
+ # panel title
+ ax.set_title('%d-h forecast valid '%fcsthr+verifdates[nt],fontsize=9)
+# figure title
+plt.figtext(0.5,0.95,
+ u"2-m temp (\N{DEGREE SIGN}C) forecasts from %s"%verifdates[0],
+ horizontalalignment='center',fontsize=14)
+# a single colorbar.
+cbar = fig.colorbar(cs, cax=grid.cbar_axes[0], orientation='horizontal')
+plt.show()
Modified: trunk/toolkits/basemap/examples/run_all.py
===================================================================
--- trunk/toolkits/basemap/examples/run_all.py	2010年06月10日 17:48:10 UTC (rev 8408)
+++ trunk/toolkits/basemap/examples/run_all.py	2010年06月10日 18:25:19 UTC (rev 8409)
@@ -2,6 +2,7 @@
 test_files = glob.glob('*.py')
 test_files.remove('run_all.py')
 test_files.remove('fcstmaps.py')
+test_files.remove('fcstmaps_axesgrid.py')
 test_files.remove('testgdal.py')
 test_files.remove('pnganim.py')
 test_files.remove('geos_demo_2.py')
Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2010年06月10日 17:48:10 UTC (rev 8408)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2010年06月10日 18:25:19 UTC (rev 8409)
@@ -2628,9 +2628,9 @@
 # plot is re-centered in bounding rectangle.
 # (anchor instance var determines where plot is placed)
 if self.fix_aspect:
- ax.set_aspect('equal',adjustable='box',anchor=self.anchor)
+ ax.set_aspect('equal',anchor=self.anchor)
 else:
- ax.set_aspect('auto',adjustable='box',anchor=self.anchor)
+ ax.set_aspect('auto',anchor=self.anchor)
 # make sure axis ticks are turned off.
 if self.noticks:
 ax.set_xticks([])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8408
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8408&view=rev
Author: mdboom
Date: 2010年06月10日 17:48:10 +0000 (2010年6月10日)
Log Message:
-----------
Update to the 1.0 STIX fonts.
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/font_manager.py
 trunk/matplotlib/lib/matplotlib/mathtext.py
 trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/LICENSE_STIX
 trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXGeneral.ttf
 trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXGeneralBol.ttf
 trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXGeneralBolIta.ttf
 trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXGeneralItalic.ttf
 trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXNonUni.ttf
 trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXNonUniBol.ttf
 trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXNonUniBolIta.ttf
 trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXNonUniIta.ttf
 trunk/matplotlib/setup.py
Added Paths:
-----------
 trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSizFiveSymReg.ttf
 trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSizFourSymBol.ttf
 trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSizFourSymReg.ttf
 trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSizOneSymBol.ttf
 trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSizOneSymReg.ttf
 trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSizThreeSymBol.ttf
 trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSizThreeSymReg.ttf
 trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSizTwoSymBol.ttf
 trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSizTwoSymReg.ttf
Removed Paths:
-------------
 trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSiz1Sym.ttf
 trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSiz1SymBol.ttf
 trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSiz2Sym.ttf
 trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSiz2SymBol.ttf
 trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSiz3Sym.ttf
 trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSiz3SymBol.ttf
 trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSiz4Sym.ttf
 trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSiz4SymBol.ttf
 trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSiz5Sym.ttf
Modified: trunk/matplotlib/lib/matplotlib/font_manager.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/font_manager.py	2010年06月10日 17:04:44 UTC (rev 8407)
+++ trunk/matplotlib/lib/matplotlib/font_manager.py	2010年06月10日 17:48:10 UTC (rev 8408)
@@ -975,7 +975,7 @@
 # Increment this version number whenever the font cache data
 # format or behavior has changed and requires a existing font
 # cache files to be rebuilt.
- __version__ = 6
+ __version__ = 7
 
 def __init__(self, size=None, weight='normal'):
 self._version = self.__version__
Modified: trunk/matplotlib/lib/matplotlib/mathtext.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mathtext.py	2010年06月10日 17:04:44 UTC (rev 8407)
+++ trunk/matplotlib/lib/matplotlib/mathtext.py	2010年06月10日 17:48:10 UTC (rev 8408)
@@ -330,7 +330,7 @@
 def render_glyph(self, ox, oy, info):
 oy = self.height - oy + info.offset
 thetext = unichr_safe(info.num)
- 
+
 self.svg_glyphs.append(
 (info.font, info.fontsize, thetext, ox, oy, info.metrics))
 
@@ -850,7 +850,7 @@
 fontname, font_class, uniindex)
 
 new_fontname = fontname
- 
+
 # Only characters in the "Letter" class should be italicized in 'it'
 # mode. Greek capital letters should be Roman.
 if found_symbol:
@@ -923,11 +923,11 @@
 'nonunibf' : 'STIXNonUnicode:weight=bold',
 
 0 : 'STIXGeneral',
- 1 : 'STIXSize1',
- 2 : 'STIXSize2',
- 3 : 'STIXSize3',
- 4 : 'STIXSize4',
- 5 : 'STIXSize5'
+ 1 : 'STIXSizeOneSym',
+ 2 : 'STIXSizeTwoSym',
+ 3 : 'STIXSizeThreeSym',
+ 4 : 'STIXSizeFourSym',
+ 5 : 'STIXSizeFiveSym'
 }
 use_cmex = False
 cm_fallback = False
Modified: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/LICENSE_STIX
===================================================================
--- trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/LICENSE_STIX	2010年06月10日 17:04:44 UTC (rev 8407)
+++ trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/LICENSE_STIX	2010年06月10日 17:48:10 UTC (rev 8408)
@@ -1,71 +1,124 @@
-TERMS AND CONDITIONS
+The STIX fonts distributed with matplotlib have been modified from
+their canonical form. They have been converted from OTF to TTF format
+using Fontforge and this script:
 
- 1. Permission is hereby granted, free of charge, to any person 
-obtaining a copy of the STIX Fonts-TM set accompanying this license 
-(collectively, the "Fonts") and the associated documentation files 
-(collectively with the Fonts, the "Font Software"), to reproduce and 
-distribute the Font Software, including the rights to use, copy, merge 
-and publish copies of the Font Software, and to permit persons to whom 
-the Font Software is furnished to do so same, subject to the following 
-terms and conditions (the "License").
+ #!/usr/bin/env fontforge
+ i=1
+ while ( i<$argc )
+ Open($argv[i])
+ Generate($argv[i]:r + ".ttf")
+ i = i+1
+ endloop
 
- 2. The following copyright and trademark notice and these Terms and 
-Conditions shall be included in all copies of one or more of the Font 
-typefaces and any derivative work created as permitted under this 
-License:
+The original STIX Font License begins below.
 
-	Copyright (c) 2001-2005 by the STI Pub Companies, consisting of 
-the American Institute of Physics, the American Chemical Society, the 
-American Mathematical Society, the American Physical Society, Elsevier, 
-Inc., and The Institute of Electrical and Electronic Engineers, Inc. 
-Portions copyright (c) 1998-2003 by MicroPress, Inc. Portions copyright 
-(c) 1990 by Elsevier, Inc. All rights reserved. STIX Fonts-TM is a 
-trademark of The Institute of Electrical and Electronics Engineers, Inc.
+-----------------------------------------------------------
 
- 3. You may (a) convert the Fonts from one format to another (e.g., 
-from TrueType to PostScript), in which case the normal and reasonable 
-distortion that occurs during such conversion shall be permitted and (b) 
-embed or include a subset of the Fonts in a document for the purposes of 
-allowing users to read text in the document that utilizes the Fonts. In 
-each case, you may use the STIX Fonts-TM mark to designate the resulting 
-Fonts or subset of the Fonts.
+STIX Font License
 
- 4. You may also (a) add glyphs or characters to the Fonts, or modify 
-the shape of existing glyphs, so long as the base set of glyphs is not 
-removed and (b) delete glyphs or characters from the Fonts, provided 
-that the resulting font set is distributed with the following 
-disclaimer: "This [name] font does not include all the Unicode points 
-covered in the STIX Fonts-TM set but may include others." In each case, 
-the name used to denote the resulting font set shall not include the 
-term "STIX" or any similar term.
+24 May 2010
 
- 5. You may charge a fee in connection with the distribution of the 
-Font Software, provided that no copy of one or more of the individual 
-Font typefaces that form the STIX Fonts-TM set may be sold by itself.
+Copyright (c) 2001-2010 by the STI Pub Companies, consisting of the American
+Institute of Physics, the American Chemical Society, the American Mathematical
+Society, the American Physical Society, Elsevier, Inc., and The Institute of
+Electrical and Electronic Engineers, Inc. (www.stixfonts.org), with Reserved
+Font Name STIX Fonts, STIX Fonts (TM) is a trademark of The Institute of
+Electrical and Electronics Engineers, Inc.
 
- 6. THE FONT SOFTWARE IS PROVIDED "AS IS," WITHOUT WARRANTY OF ANY 
-KIND, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES 
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT 
-OF COPYRIGHT, PATENT, TRADEMARK OR OTHER RIGHT. IN NO EVENT SHALL 
-MICROPRESS OR ANY OF THE STI PUB COMPANIES BE LIABLE FOR ANY CLAIM, 
-DAMAGES OR OTHER LIABILITY, INCLUDING, BUT NOT LIMITED TO, ANY GENERAL, 
-SPECIAL, INDIRECT, INCIDENTAL OR CONSEQUENTIAL DAMAGES, WHETHER IN AN 
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM OR OUT OF THE USE OR 
-INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT 
-SOFTWARE.
+Portions copyright (c) 1998-2003 by MicroPress, Inc. (www.micropress-inc.com),
+with Reserved Font Name TM Math. To obtain additional mathematical fonts, please
+contact MicroPress, Inc., 68-30 Harrow Street, Forest Hills, NY 11375, USA,
+Phone: (718) 575-1816.
 
- 7. Except as contained in the notice set forth in Section 2, the 
-names MicroPress Inc. and STI Pub Companies, as well as the names of the 
-companies/organizations that compose the STI Pub Companies, shall not be 
-used in advertising or otherwise to promote the sale, use or other 
-dealings in the Font Software without the prior written consent of the 
-respective company or organization.
+Portions copyright (c) 1990 by Elsevier, Inc.
 
- 8. This License shall become null and void in the event of any 
-material breach of the Terms and Conditions herein by licensee.
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
 
- 9. A substantial portion of the STIX Fonts set was developed by 
-MicroPress Inc. for the STI Pub Companies. To obtain additional 
-mathematical fonts, please contact MicroPress, Inc., 68-30 Harrow 
-Street, Forest Hills, NY 11375, USA - Phone: (718) 575-1816.
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
 
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
Modified: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXGeneral.ttf
===================================================================
(Binary files differ)
Modified: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXGeneralBol.ttf
===================================================================
(Binary files differ)
Modified: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXGeneralBolIta.ttf
===================================================================
(Binary files differ)
Modified: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXGeneralItalic.ttf
===================================================================
(Binary files differ)
Modified: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXNonUni.ttf
===================================================================
(Binary files differ)
Modified: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXNonUniBol.ttf
===================================================================
(Binary files differ)
Modified: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXNonUniBolIta.ttf
===================================================================
(Binary files differ)
Modified: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXNonUniIta.ttf
===================================================================
(Binary files differ)
Deleted: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSiz1Sym.ttf
===================================================================
(Binary files differ)
Deleted: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSiz1SymBol.ttf
===================================================================
(Binary files differ)
Deleted: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSiz2Sym.ttf
===================================================================
(Binary files differ)
Deleted: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSiz2SymBol.ttf
===================================================================
(Binary files differ)
Deleted: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSiz3Sym.ttf
===================================================================
(Binary files differ)
Deleted: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSiz3SymBol.ttf
===================================================================
(Binary files differ)
Deleted: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSiz4Sym.ttf
===================================================================
(Binary files differ)
Deleted: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSiz4SymBol.ttf
===================================================================
(Binary files differ)
Deleted: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSiz5Sym.ttf
===================================================================
(Binary files differ)
Added: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSizFiveSymReg.ttf
===================================================================
(Binary files differ)
Property changes on: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSizFiveSymReg.ttf
___________________________________________________________________
Added: svn:mime-type
 + application/octet-stream
Added: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSizFourSymBol.ttf
===================================================================
(Binary files differ)
Property changes on: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSizFourSymBol.ttf
___________________________________________________________________
Added: svn:mime-type
 + application/octet-stream
Added: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSizFourSymReg.ttf
===================================================================
(Binary files differ)
Property changes on: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSizFourSymReg.ttf
___________________________________________________________________
Added: svn:mime-type
 + application/octet-stream
Added: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSizOneSymBol.ttf
===================================================================
(Binary files differ)
Property changes on: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSizOneSymBol.ttf
___________________________________________________________________
Added: svn:mime-type
 + application/octet-stream
Added: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSizOneSymReg.ttf
===================================================================
(Binary files differ)
Property changes on: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSizOneSymReg.ttf
___________________________________________________________________
Added: svn:mime-type
 + application/octet-stream
Added: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSizThreeSymBol.ttf
===================================================================
(Binary files differ)
Property changes on: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSizThreeSymBol.ttf
___________________________________________________________________
Added: svn:mime-type
 + application/octet-stream
Added: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSizThreeSymReg.ttf
===================================================================
(Binary files differ)
Property changes on: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSizThreeSymReg.ttf
___________________________________________________________________
Added: svn:mime-type
 + application/octet-stream
Added: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSizTwoSymBol.ttf
===================================================================
(Binary files differ)
Property changes on: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSizTwoSymBol.ttf
___________________________________________________________________
Added: svn:mime-type
 + application/octet-stream
Added: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSizTwoSymReg.ttf
===================================================================
(Binary files differ)
Property changes on: trunk/matplotlib/lib/matplotlib/mpl-data/fonts/ttf/STIXSizTwoSymReg.ttf
___________________________________________________________________
Added: svn:mime-type
 + application/octet-stream
Modified: trunk/matplotlib/setup.py
===================================================================
--- trunk/matplotlib/setup.py	2010年06月10日 17:04:44 UTC (rev 8407)
+++ trunk/matplotlib/setup.py	2010年06月10日 17:48:10 UTC (rev 8408)
@@ -95,6 +95,10 @@
 'mpl-data/fonts/pdfcorefonts/*.afm',
 'mpl-data/fonts/pdfcorefonts/*.txt',
 'mpl-data/fonts/ttf/*.ttf',
+ 'mpl-data/fonts/ttf/LICENSE_STIX',
+ 'mpl-data/fonts/ttf/COPYRIGHT.TXT',
+ 'mpl-data/fonts/ttf/README.TXT',
+ 'mpl-data/fonts/ttf/RELEASENOTES.TXT',
 'mpl-data/images/*.xpm',
 'mpl-data/images/*.svg',
 'mpl-data/images/*.png',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8407
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8407&view=rev
Author: mdboom
Date: 2010年06月10日 17:04:44 +0000 (2010年6月10日)
Log Message:
-----------
[2908399] Support clip paths in QuadMesh with gouraud shading
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/backends/backend_svg.py
 trunk/matplotlib/src/_backend_agg.cpp
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_svg.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_svg.py	2010年06月10日 14:06:50 UTC (rev 8406)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_svg.py	2010年06月10日 17:04:44 UTC (rev 8407)
@@ -370,6 +370,24 @@
 
 self._n_gradients += 1
 
+ def draw_gouraud_triangles(self, gc, triangles_array, colors_array,
+ transform):
+ write = self._svgwriter.write
+
+ clipid = self._get_gc_clip_svg(gc)
+ if clipid is None:
+ clippath = ''
+ else:
+ clippath = 'clip-path="url(#%s)"' % clipid
+
+ write('<g %s>\n' % clippath)
+
+ transform = transform.frozen()
+ for tri, col in zip(triangles_array, colors_array):
+ self.draw_gouraud_triangle(gc, tri, col, transform)
+
+ write('</g>\n')
+
 def draw_image(self, gc, x, y, im):
 # MGDTODO: Support clippath here
 trans = [1,0,0,1,0,0]
Modified: trunk/matplotlib/src/_backend_agg.cpp
===================================================================
--- trunk/matplotlib/src/_backend_agg.cpp	2010年06月10日 14:06:50 UTC (rev 8406)
+++ trunk/matplotlib/src/_backend_agg.cpp	2010年06月10日 17:04:44 UTC (rev 8407)
@@ -1532,7 +1532,7 @@
 theRasterizer.reset_clipping();
 rendererBase.reset_clipping(true);
 set_clipbox(gc.cliprect, theRasterizer);
- /* TODO: Support clip paths */
+ bool has_clippath = render_clippath(gc.clippath, gc.clippath_trans);
 
 trans *= agg::trans_affine_scaling(1.0, -1.0);
 trans *= agg::trans_affine_translation(0.0, (double)height);
@@ -1560,7 +1560,19 @@
 
 theRasterizer.add_path(span_gen);
 
- agg::render_scanlines_aa(theRasterizer, slineP8, rendererBase, span_alloc, span_gen);
+ if (has_clippath) {
+ typedef agg::pixfmt_amask_adaptor<pixfmt, alpha_mask_type> pixfmt_amask_type;
+ typedef agg::renderer_base<pixfmt_amask_type> amask_ren_type;
+ typedef agg::renderer_scanline_aa<amask_ren_type, span_alloc_t, span_gen_t>
+ amask_aa_renderer_type;
+
+ pixfmt_amask_type pfa(pixFmt, alphaMask);
+ amask_ren_type r(pfa);
+ amask_aa_renderer_type ren(r, span_alloc, span_gen);
+ agg::render_scanlines(theRasterizer, slineP8, ren);
+ } else {
+ agg::render_scanlines_aa(theRasterizer, slineP8, rendererBase, span_alloc, span_gen);
+ }
 }
 
 Py::Object
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8406
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8406&view=rev
Author: mdboom
Date: 2010年06月10日 14:06:50 +0000 (2010年6月10日)
Log Message:
-----------
[3010563] misaligned title text when using GTK backend
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/backends/backend_gdk.py
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_gdk.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_gdk.py	2010年06月10日 13:48:31 UTC (rev 8405)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_gdk.py	2010年06月10日 14:06:50 UTC (rev 8406)
@@ -308,8 +308,10 @@
 
 layout, inkRect, logicalRect = self._get_pango_layout(s, prop)
 l, b, w, h = inkRect
- return w, h+1, h + 1
+ ll, lb, lw, lh = logicalRect
 
+ return w, h + 1, h - lh
+
 def new_gc(self):
 return GraphicsContextGDK(renderer=self)
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8405
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8405&view=rev
Author: mdboom
Date: 2010年06月10日 13:48:31 +0000 (2010年6月10日)
Log Message:
-----------
[3011582] stix_fonts_demo.py assert error
When matplotlib is compiled without -DNDEBUG, we get this error on one of the example:
$ python stix_fonts_demo.py
python2.6: CXX/cxx_extensions.cxx:1320: virtual Py::PythonExtensionBase::~PythonExtensionBase(): Assertion `ob_refcnt == 0' failed.
Aborted
Modified Paths:
--------------
 trunk/matplotlib/src/ft2font.cpp
Modified: trunk/matplotlib/src/ft2font.cpp
===================================================================
--- trunk/matplotlib/src/ft2font.cpp	2010年06月10日 01:59:13 UTC (rev 8404)
+++ trunk/matplotlib/src/ft2font.cpp	2010年06月10日 13:48:31 UTC (rev 8405)
@@ -686,25 +686,28 @@
 
 int error = FT_New_Face( _ft2Library, facefile.c_str(), 0, &face );
 
-
 if (error == FT_Err_Unknown_File_Format ) {
 std::ostringstream s;
 s << "Could not load facefile " << facefile << "; Unknown_File_Format" << std::endl;
+ ob_refcnt--;
 throw Py::RuntimeError(s.str());
 }
 else if (error == FT_Err_Cannot_Open_Resource) {
 std::ostringstream s;
 s << "Could not open facefile " << facefile << "; Cannot_Open_Resource" << std::endl;
+ ob_refcnt--;
 throw Py::RuntimeError(s.str());
 }
 else if (error == FT_Err_Invalid_File_Format) {
 std::ostringstream s;
 s << "Could not open facefile " << facefile << "; Invalid_File_Format" << std::endl;
+ ob_refcnt--;
 throw Py::RuntimeError(s.str());
 }
 else if (error) {
 std::ostringstream s;
 s << "Could not open facefile " << facefile << "; freetype error code " << error<< std::endl;
+ ob_refcnt--;
 throw Py::RuntimeError(s.str());
 }
 
@@ -720,6 +723,7 @@
 if (error) {
 std::ostringstream s;
 s << "Could not set the fontsize for facefile " << facefile << std::endl;
+ ob_refcnt--;
 throw Py::RuntimeError(s.str());
 }
 
@@ -739,7 +743,6 @@
 if ( style_name == NULL )
 style_name = "UNAVAILABLE";
 
-
 setattr("postscript_name", Py::String(ps_name));
 setattr("num_faces", Py::Int(face->num_faces));
 setattr("family_name", Py::String(family_name));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8404
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8404&view=rev
Author: jdh2358
Date: 2010年06月10日 01:59:13 +0000 (2010年6月10日)
Log Message:
-----------
added bbox_inches and pad_inches to savefig signature
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/figure.py
Modified: trunk/matplotlib/lib/matplotlib/figure.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/figure.py	2010年06月09日 22:05:09 UTC (rev 8403)
+++ trunk/matplotlib/lib/matplotlib/figure.py	2010年06月10日 01:59:13 UTC (rev 8404)
@@ -992,7 +992,7 @@
 
 savefig(fname, dpi=None, facecolor='w', edgecolor='w',
 orientation='portrait', papertype=None, format=None,
- transparent=False):
+ transparent=False, bbox_inches=None, pad_inches=0.1):
 
 Save the current figure.
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.