Revision: 6559
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6559&view=rev
Author: jdh2358
Date: 2008-12-11 01:10:35 +0000 (Thu, 11 Dec 2008)
Log Message:
-----------
figure/subplot and font_manager bugfixes
Modified Paths:
--------------
trunk/matplotlib/CHANGELOG
trunk/matplotlib/lib/matplotlib/__init__.py
trunk/matplotlib/lib/matplotlib/figure.py
trunk/matplotlib/lib/matplotlib/font_manager.py
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG 2008-12-10 23:40:00 UTC (rev 6558)
+++ trunk/matplotlib/CHANGELOG 2008-12-11 01:10:35 UTC (rev 6559)
@@ -1,3 +1,6 @@
+2008-12-10 Added Michael's font_manager fix and Jae-Joon's
+ figure/subplot fix. Bumped version number to 0.98.5 - JDH
+
=================================================================
2008-12-09 Released
0.98.4 at svn r6536
2008-12-08 Added mdehoon's native macosx backend from sf patch 2179017 - JDH
Modified: trunk/matplotlib/lib/matplotlib/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/__init__.py 2008-12-10 23:40:00 UTC (rev
6558)
+++ trunk/matplotlib/lib/matplotlib/__init__.py 2008-12-11 01:10:35 UTC (rev
6559)
@@ -89,7 +89,7 @@
"""
from __future__ import generators
-__version__ = '0.98.4'
+__version__ = '0.98.5rc'
__revision__ = '$Revision$'
__date__ = '$Date$'
Modified: trunk/matplotlib/lib/matplotlib/figure.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/figure.py 2008-12-10 23:40:00 UTC (rev
6558)
+++ trunk/matplotlib/lib/matplotlib/figure.py 2008-12-11 01:10:35 UTC (rev
6559)
@@ -676,21 +676,21 @@
projection_class = get_projection_class(projection)
- key = self._make_key(*args, **kwargs)
- if key in self._seen:
- ax = self._seen[key]
- if isinstance(ax, projection_class):
- self.sca(ax)
- return ax
- else:
- self.axes.remove(ax)
- self._axstack.remove(ax)
+ key = self._make_key(*args, **kwargs)
+ if key in self._seen:
+ ax = self._seen[key]
+ if isinstance(ax, projection_class):
+ self.sca(ax)
+ return ax
+ else:
+ self.axes.remove(ax)
+ self._axstack.remove(ax)
- a = subplot_class_factory(projection_class)(self, *args, **kwargs)
+ a = subplot_class_factory(projection_class)(self, *args, **kwargs)
+ self._seen[key] = a
self.axes.append(a)
self._axstack.push(a)
self.sca(a)
- self._seen[key] = a
return a
add_subplot.__doc__ = dedent(add_subplot.__doc__) % {
'list': ", ".join(get_projection_names()),
Modified: trunk/matplotlib/lib/matplotlib/font_manager.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/font_manager.py 2008-12-10 23:40:00 UTC
(rev 6558)
+++ trunk/matplotlib/lib/matplotlib/font_manager.py 2008-12-11 01:10:35 UTC
(rev 6559)
@@ -1068,7 +1068,7 @@
options = rcParams['font.' + family1]
if family2 in options:
idx = options.index(family2)
- return 0.1
+ return 0.1 * (float(idx) / len(options))
elif family1.lower() == family2.lower():
return 0.0
return 1.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 MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
