matplotlib-checkins Mailing List for matplotlib

Revision: 8315
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8315&view=rev
Author: mdboom
Date: 2010年05月12日 17:58:17 +0000 (2010年5月12日)
Log Message:
-----------
Minor improvement to font_manager -- don't cache directory-specific results.
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/font_manager.py
Modified: trunk/matplotlib/lib/matplotlib/font_manager.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/font_manager.py	2010年05月12日 15:28:12 UTC (rev 8314)
+++ trunk/matplotlib/lib/matplotlib/font_manager.py	2010年05月12日 17:58:17 UTC (rev 8315)
@@ -1193,10 +1193,7 @@
 <http://www.w3.org/TR/1998/REC-CSS2-19980512/>`_ documentation
 for a description of the font finding algorithm.
 """
- debug = False
- if prop is None:
- prop = FontProperties()
- if is_string_like(prop):
+ if not isinstance(prop, FontProperties):
 prop = FontProperties(prop)
 fname = prop.get_file()
 if fname is not None:
@@ -1210,9 +1207,10 @@
 font_cache = self.ttf_lookup_cache
 fontlist = self.ttflist
 
- cached = font_cache.get(hash(prop))
- if cached:
- return cached
+ if directory is None:
+ cached = font_cache.get(hash(prop))
+ if cached:
+ return cached
 
 best_score = 1e64
 best_font = None
@@ -1258,7 +1256,8 @@
 (prop, best_font.name, best_font.fname, best_score))
 result = best_font.fname
 
- font_cache[hash(prop)] = result
+ if directory is None:
+ font_cache[hash(prop)] = result
 return result
 
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8314
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8314&view=rev
Author: mdboom
Date: 2010年05月12日 15:28:12 +0000 (2010年5月12日)
Log Message:
-----------
Suppress compiler warning.
Modified Paths:
--------------
 trunk/matplotlib/src/_backend_agg.cpp
Modified: trunk/matplotlib/src/_backend_agg.cpp
===================================================================
--- trunk/matplotlib/src/_backend_agg.cpp	2010年05月12日 15:27:53 UTC (rev 8313)
+++ trunk/matplotlib/src/_backend_agg.cpp	2010年05月12日 15:28:12 UTC (rev 8314)
@@ -834,6 +834,8 @@
 } else {
 x = mpl_round(Py::Float(args[1]));
 y = mpl_round(Py::Float(args[2]));
+ w = h = 0; /* w and h not used in this case, but assign to prevent
+ warnings from the compiler */
 }
 
 
@@ -890,7 +892,7 @@
 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, color_span_alloc_type, image_span_gen_type> renderer_type_alpha;
- 
+
 pixfmt_amask_type pfa(pixFmt, alphaMask);
 amask_ren_type r(pfa);
 renderer_type_alpha ri(r, sa, image_span_generator);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8313
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8313&view=rev
Author: mdboom
Date: 2010年05月12日 15:27:53 +0000 (2010年5月12日)
Log Message:
-----------
[2963827] FontProperties does not seem to be working...
Add a unit test to test the FontProperties confusing cases
Added Paths:
-----------
 trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_text/
 trunk/matplotlib/lib/matplotlib/tests/test_text.py
Added: trunk/matplotlib/lib/matplotlib/tests/test_text.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/tests/test_text.py	 (rev 0)
+++ trunk/matplotlib/lib/matplotlib/tests/test_text.py	2010年05月12日 15:27:53 UTC (rev 8313)
@@ -0,0 +1,66 @@
+import numpy as np
+import matplotlib
+from matplotlib.testing.decorators import image_comparison, knownfailureif
+import matplotlib.pyplot as plt
+
+
+@image_comparison(baseline_images=['font_styles'])
+def test_font_styles():
+ from matplotlib.font_manager import FontProperties
+
+ fig = plt.figure()
+ ax = plt.subplot( 1, 1, 1 )
+
+ normalFont = FontProperties( family = "sans-serif",
+ style = "normal",
+ variant = "normal",
+ size = 14,
+ )
+ ax.annotate( "Normal Font", (0.1, 0.1), xycoords='axes fraction',
+ fontproperties = normalFont )
+
+ boldFont = FontProperties( family = "Foo",
+ style = "normal",
+ variant = "normal",
+ weight = "bold",
+ stretch = 500,
+ size = 14,
+ )
+ ax.annotate( "Bold Font", (0.1, 0.2), xycoords='axes fraction',
+ fontproperties = boldFont )
+
+ boldItemFont = FontProperties( family = "sans serif",
+ style = "italic",
+ variant = "normal",
+ weight = 750,
+ stretch = 500,
+ size = 14,
+ )
+ ax.annotate( "Bold Italic Font", (0.1, 0.3), xycoords='axes fraction',
+ fontproperties = boldItemFont )
+
+ lightFont = FontProperties( family = "sans-serif",
+ style = "normal",
+ variant = "normal",
+ weight = 200,
+ stretch = 500,
+ size = 14,
+ )
+ ax.annotate( "Light Font", (0.1, 0.4), xycoords='axes fraction',
+ fontproperties = lightFont )
+
+ condensedFont = FontProperties( family = "sans-serif",
+ style = "normal",
+ variant = "normal",
+ weight = 500,
+ stretch = 100,
+ size = 14,
+ )
+ ax.annotate( "Condensed Font", (0.1, 0.5), xycoords='axes fraction',
+ fontproperties = condensedFont )
+
+ ax.set_xticks([])
+ ax.set_yticks([])
+
+ fig.savefig('font_styles')
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8312
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8312&view=rev
Author: mdboom
Date: 2010年05月12日 15:15:19 +0000 (2010年5月12日)
Log Message:
-----------
[2963827] FontProperties does not seem to be working...
1. Warn when a font family can not be found
2. Fallback to the correct variant of Vera Sans (rather than always non-bold upright) when the font family lookup fails
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/font_manager.py
Modified: trunk/matplotlib/lib/matplotlib/font_manager.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/font_manager.py	2010年05月12日 14:55:27 UTC (rev 8311)
+++ trunk/matplotlib/lib/matplotlib/font_manager.py	2010年05月12日 15:15:19 UTC (rev 8312)
@@ -42,7 +42,7 @@
 see license/LICENSE_TTFQUERY.
 """
 
-import os, sys, glob, subprocess
+import os, sys, glob, subprocess, warnings
 try:
 set
 except NameError:
@@ -974,7 +974,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__ = 5
+ __version__ = 6
 
 def __init__(self, size=None, weight='normal'):
 self._version = self.__version__
@@ -1001,6 +1001,9 @@
 # Load TrueType fonts and create font dictionary.
 
 self.ttffiles = findSystemFonts(paths) + findSystemFonts()
+ self.defaultFamily = {
+ 'ttf': 'Bitstream Vera Sans',
+ 'afm': 'Helvetica'}
 self.defaultFont = {}
 
 for fname in self.ttffiles:
@@ -1164,7 +1167,8 @@
 return 1.0
 return abs(sizeval1 - sizeval2) / 72.0
 
- def findfont(self, prop, fontext='ttf', directory=None):
+ def findfont(self, prop, fontext='ttf', directory=None,
+ fallback_to_default=True):
 """
 Search the font list for the font that most closely matches
 the :class:`FontProperties` *prop*.
@@ -1181,6 +1185,10 @@
 The result is cached, so subsequent lookups don't have to
 perform the O(n) nearest neighbor search.
 
+ If `fallback_to_default` is True, will fallback to the default
+ font family (usually "Bitstream Vera Sans" or "Helvetica") if
+ the first lookup hard-fails.
+
 See the `W3C Cascading Style Sheet, Level 1
 <http://www.w3.org/TR/1998/REC-CSS2-19980512/>`_ documentation
 for a description of the font finding algorithm.
@@ -1229,12 +1237,25 @@
 break
 
 if best_font is None or best_score >= 10.0:
- verbose.report('findfont: Could not match %s. Returning %s' %
- (prop, self.defaultFont[fontext]))
- result = self.defaultFont[fontext]
+ if fallback_to_default:
+ warnings.warn(
+ 'findfont: Font family %s not found. Falling back to %s' %
+ (prop.get_family(), self.defaultFamily[fontext]))
+ default_prop = prop.copy()
+ default_prop.set_family(self.defaultFamily[fontext])
+ return self.findfont(default_prop, fontext, directory, False)
+ else:
+ # This is a hard fail -- we can't find anything reasonable,
+ # so just return the vera.ttf
+ warnings.warn(
+ 'findfont: Could not match %s. Returning %s' %
+ (prop, self.defaultFont[fontext]),
+ UserWarning)
+ result = self.defaultFont[fontext]
 else:
- verbose.report('findfont: Matching %s to %s (%s) with score of %f' %
- (prop, best_font.name, best_font.fname, best_score))
+ verbose.report(
+ 'findfont: Matching %s to %s (%s) with score of %f' %
+ (prop, best_font.name, best_font.fname, best_score))
 result = best_font.fname
 
 font_cache[hash(prop)] = result
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8311
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8311&view=rev
Author: mdboom
Date: 2010年05月12日 14:55:27 +0000 (2010年5月12日)
Log Message:
-----------
Support "sans serif" as an alias for "sans-serif" in font family names.
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/font_manager.py
Modified: trunk/matplotlib/lib/matplotlib/font_manager.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/font_manager.py	2010年05月12日 14:50:24 UTC (rev 8310)
+++ trunk/matplotlib/lib/matplotlib/font_manager.py	2010年05月12日 14:55:27 UTC (rev 8311)
@@ -401,8 +401,8 @@
 return "<Font '%s' (%s) %s %s %s %s>" % (
 self.name, os.path.basename(self.fname), self.style, self.variant,
 self.weight, self.stretch)
- 
 
+
 def ttfFontProperty(font):
 """
 A function for populating the :class:`FontKey` by extracting
@@ -1065,7 +1065,7 @@
 for i, family1 in enumerate(families):
 family1 = family1.lower()
 if family1 in font_family_aliases:
- if family1 == 'sans':
+ if family1 in ('sans', 'sans serif'):
 family1 == 'sans-serif'
 options = rcParams['font.' + family1]
 options = [x.lower() for x in options]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8310
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8310&view=rev
Author: jswhit
Date: 2010年05月12日 14:50:24 +0000 (2010年5月12日)
Log Message:
-----------
update
Modified Paths:
--------------
 trunk/toolkits/basemap/Changelog
Modified: trunk/toolkits/basemap/Changelog
===================================================================
--- trunk/toolkits/basemap/Changelog	2010年05月12日 14:41:58 UTC (rev 8309)
+++ trunk/toolkits/basemap/Changelog	2010年05月12日 14:50:24 UTC (rev 8310)
@@ -1,4 +1,5 @@
 version 0.99.5 (not yet released)
+	 * 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
@@ -8,7 +9,7 @@
 * updated proj4 source to version 4.7.0, pyproj to 1.8.6.
 	 * add "is_land" method to check whether a point is over land or
 water.
-	 * geos-3.1.1 now required. 3.1.1 source included (instead of 2.2.3).
+	 * geos-3.1.1 now required. 3.2.0 source included (instead of 2.2.3).
 * shiftgrid no longer requires a cyclic point to be present
 (patch from Eric Bruning).
 * fix date2index bugs.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8309
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8309&view=rev
Author: jswhit
Date: 2010年05月12日 14:41:58 +0000 (2010年5月12日)
Log Message:
-----------
let continents that fill whole map be filled.
Modified Paths:
--------------
 trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2010年05月11日 20:23:04 UTC (rev 8308)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2010年05月12日 14:41:58 UTC (rev 8309)
@@ -1411,19 +1411,22 @@
 ya = np.array(y,np.float32)
 # check to see if all four corners of domain in polygon (if so,
 # don't draw since it will just fill in the whole map).
- delx = 10; dely = 10
- if self.projection in ['cyl']:
- delx = 0.1
- dely = 0.1
- test1 = np.fabs(xa-self.urcrnrx) < delx
- test2 = np.fabs(xa-self.llcrnrx) < delx
- test3 = np.fabs(ya-self.urcrnry) < dely
- test4 = np.fabs(ya-self.llcrnry) < dely
- hasp1 = np.sum(test1*test3)
- hasp2 = np.sum(test2*test3)
- hasp4 = np.sum(test2*test4)
- hasp3 = np.sum(test1*test4)
- if not hasp1 or not hasp2 or not hasp3 or not hasp4:
+ # ** turn this off for now since it prevents continents that
+ # fill the whole map from being filled **
+ #delx = 10; dely = 10
+ #if self.projection in ['cyl']:
+ # delx = 0.1
+ # dely = 0.1
+ #test1 = np.fabs(xa-self.urcrnrx) < delx
+ #test2 = np.fabs(xa-self.llcrnrx) < delx
+ #test3 = np.fabs(ya-self.urcrnry) < dely
+ #test4 = np.fabs(ya-self.llcrnry) < dely
+ #hasp1 = np.sum(test1*test3)
+ #hasp2 = np.sum(test2*test3)
+ #hasp4 = np.sum(test2*test4)
+ #hasp3 = np.sum(test1*test4)
+ #if not hasp1 or not hasp2 or not hasp3 or not hasp4:
+ if 1:
 xy = zip(xa.tolist(),ya.tolist())
 if self.coastpolygontypes[npoly] not in [2,4]:
 poly = Polygon(xy,facecolor=color,edgecolor=color,linewidth=0)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.