matplotlib-checkins Mailing List for matplotlib

Revision: 3730
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3730&view=rev
Author: dsdale
Date: 2007年08月22日 13:11:18 -0700 (2007年8月22日)
Log Message:
-----------
rcdefaults working with mplconfig
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/config/mplconfig.py
Modified: trunk/matplotlib/lib/matplotlib/config/mplconfig.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/config/mplconfig.py	2007年08月22日 19:38:08 UTC (rev 3729)
+++ trunk/matplotlib/lib/matplotlib/config/mplconfig.py	2007年08月22日 20:11:18 UTC (rev 3730)
@@ -516,10 +516,14 @@
 config_file)
 
 def rcdefaults():
- global mplConfig
- mplConfig = MPLConfig()
- rcParams.update(rcParamsDefault)
+ """
+ Restore the default rc params - the ones that were created at
+ matplotlib load time
+ """
+ for key in rcParamsDefault.keys():
+ rcParams[key] = rcParamsDefault[key]
 
+
 ##############################################################################
 # Auto-generate the mpl-data/matplotlib.conf
 ##############################################################################
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3729
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3729&view=rev
Author: mdboom
Date: 2007年08月22日 12:38:08 -0700 (2007年8月22日)
Log Message:
-----------
Make rcParams.update(rcParamsDefault) when new traited config is
switched on.
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/config/mplconfig.py
 trunk/matplotlib/lib/matplotlib/config/mpltraits.py
 trunk/matplotlib/lib/matplotlib/rcsetup.py
Modified: trunk/matplotlib/lib/matplotlib/config/mplconfig.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/config/mplconfig.py	2007年08月22日 18:43:13 UTC (rev 3728)
+++ trunk/matplotlib/lib/matplotlib/config/mplconfig.py	2007年08月22日 19:38:08 UTC (rev 3729)
@@ -161,12 +161,14 @@
 dvipnghack = T.false
 
 class mathtext(TConfig):
- cal = T.Trait("['cursive']", mplT.FontPropertiesHandler())
- rm = T.Trait("['serif']", mplT.FontPropertiesHandler())
- tt = T.Trait("['monospace']", mplT.FontPropertiesHandler())
- it = T.Trait("['serif'], style='oblique'", mplT.FontPropertiesHandler())
- bf = T.Trait("['serif'], weight='bold'", mplT.FontPropertiesHandler())
- sf = T.Trait("['sans-serif']", mplT.FontPropertiesHandler())
+ handler = mplT.FontPropertiesHandler
+ proxy = handler.FontPropertiesProxy
+ cal = T.Trait(proxy(['cursive']), handler())
+ rm = T.Trait(proxy(['serif']), handler())
+ tt = T.Trait(proxy(['monospace']), handler())
+ it = T.Trait(proxy(['serif'], style='oblique'), handler())
+ bf = T.Trait(proxy(['serif'], weight='bold'), handler())
+ sf = T.Trait(proxy(['sans-serif']), handler())
 use_cm = T.true
 fallback_to_cm = T.true
 
Modified: trunk/matplotlib/lib/matplotlib/config/mpltraits.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/config/mpltraits.py	2007年08月22日 18:43:13 UTC (rev 3728)
+++ trunk/matplotlib/lib/matplotlib/config/mpltraits.py	2007年08月22日 19:38:08 UTC (rev 3729)
@@ -146,7 +146,7 @@
 'spring_r', 'summer', 'summer_r', 'winter', 'winter_r']
 
 class FontPropertiesHandler(T.TraitHandler):
- class FontPropertiesProxy:
+ class FontPropertiesProxy(object):
 # In order to build a FontProperties object, various rcParams must
 # already be known in order to set default values. That means a
 # FontProperties object can not be created from a config file,
@@ -192,8 +192,6 @@
 
 def validate(self, object, name, value):
 from matplotlib.font_manager import FontProperties
- if isinstance(value, FontProperties):
- return value
 if is_string_like(value):
 try:
 proxy = eval("FontProperties(%s)" % value,
@@ -202,7 +200,9 @@
 pass
 else:
 return proxy
+ else:
+ return value
 self.error(object, name, value)
 
 def info(self):
- return 'Represents a set of font properties. Must be a FontProperties object or a string containing the parameters to the FontProperties constructor.'
+ return 'a FontProperties object or a string containing the parameters to the FontProperties constructor.'
Modified: trunk/matplotlib/lib/matplotlib/rcsetup.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/rcsetup.py	2007年08月22日 18:43:13 UTC (rev 3728)
+++ trunk/matplotlib/lib/matplotlib/rcsetup.py	2007年08月22日 19:38:08 UTC (rev 3729)
@@ -198,7 +198,7 @@
 except ValueError:
 raise ValueError('not a valid font size')
 
-class FontPropertiesProxy:
+class FontPropertiesProxy(object):
 # In order to build a FontProperties object, various rcParams must
 # already be known in order to set default values. That means a
 # FontProperties object can not be created from a config file,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3728
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3728&view=rev
Author: dsdale
Date: 2007年08月22日 11:43:13 -0700 (2007年8月22日)
Log Message:
-----------
add an update method to rcParamsWrapper
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/config/mplconfig.py
Modified: trunk/matplotlib/lib/matplotlib/config/mplconfig.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/config/mplconfig.py	2007年08月21日 19:42:28 UTC (rev 3727)
+++ trunk/matplotlib/lib/matplotlib/config/mplconfig.py	2007年08月22日 18:43:13 UTC (rev 3728)
@@ -461,7 +461,18 @@
 def has_key(self, val):
 return self.tconfig_map.has_key(val)
 
+ def update(self, arg, **kwargs):
+ try:
+ for key in arg:
+ self[key] = arg[key]
+ except AttributeError:
+ for key, val in arg:
+ self[key] = val
+ 
+ for key in kwargs:
+ self[key] = kwargs[key]
 
+
 old_config_file = cutils.get_config_file(tconfig=False)
 old_config_path = os.path.split(old_config_file)[0]
 config_file = os.path.join(old_config_path, 'matplotlib.conf')
@@ -503,8 +514,9 @@
 config_file)
 
 def rcdefaults():
+ global mplConfig
 mplConfig = MPLConfig()
- rcParams = RcParamsWrapper(mplConfig)
+ rcParams.update(rcParamsDefault)
 
 ##############################################################################
 # Auto-generate the mpl-data/matplotlib.conf
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.