From: <ds...@us...> - 2007-07-30 18:45:42
|
Revision: 3634 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3634&view=rev Author: dsdale Date: 2007-07-30 11:44:36 -0700 (Mon, 30 Jul 2007) Log Message: ----------- minor changes to traited configs Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/__init__.py trunk/matplotlib/lib/matplotlib/config/__init__.py trunk/matplotlib/lib/matplotlib/config/mplconfig.py trunk/matplotlib/lib/matplotlib/config/mpltraits.py trunk/matplotlib/lib/matplotlib/mpl-data/matplotlibrc Modified: trunk/matplotlib/lib/matplotlib/__init__.py =================================================================== --- trunk/matplotlib/lib/matplotlib/__init__.py 2007-07-30 18:05:14 UTC (rev 3633) +++ trunk/matplotlib/lib/matplotlib/__init__.py 2007-07-30 18:44:36 UTC (rev 3634) @@ -708,7 +708,7 @@ rcParams.update(rcParamsDefault) if NEWCONFIG: - print "importing from reorganized config system!" + #print "importing from reorganized config system!" from config import rcParams, rcdefaults try: from config import mplConfig, save_config Modified: trunk/matplotlib/lib/matplotlib/config/__init__.py =================================================================== --- trunk/matplotlib/lib/matplotlib/config/__init__.py 2007-07-30 18:05:14 UTC (rev 3633) +++ trunk/matplotlib/lib/matplotlib/config/__init__.py 2007-07-30 18:44:36 UTC (rev 3634) @@ -1,12 +1,12 @@ # Please keep this file empty -USE_TRAITED_CONFIG = False +USE_TRAITED_CONFIG = True from rcparams import rc from cutils import get_config_file if USE_TRAITED_CONFIG: - print 'Using new config system!' + #print 'Using new config system!' from mplconfig import rcParams, mplConfig, save_config, rcdefaults else: from rcparams import rcParams, rcdefaults Modified: trunk/matplotlib/lib/matplotlib/config/mplconfig.py =================================================================== --- trunk/matplotlib/lib/matplotlib/config/mplconfig.py 2007-07-30 18:05:14 UTC (rev 3633) +++ trunk/matplotlib/lib/matplotlib/config/mplconfig.py 2007-07-30 18:44:36 UTC (rev 3634) @@ -88,7 +88,7 @@ fonttype = T.Trait(3, 42) class distiller(TConfig): - use = T.Trait(None, None, 'ghostscript', 'xpdf') + use = T.Trait(None, None, 'ghostscript', 'xpdf', False) resolution = T.Float(6000) class pdf(TConfig): @@ -267,7 +267,7 @@ dpi = T.Float(100) facecolor = T.Trait('white', mplT.ColorHandler()) edgecolor = T.Trait('white', mplT.ColorHandler()) - orientation = T.Trait('portrait', 'portrait', 'landscape') + orientation = T.Trait('portrait', 'portrait', 'landscape') class verbose(TConfig): level = T.Trait('silent', 'silent', 'helpful', 'debug', 'debug-annoying') @@ -457,13 +457,19 @@ return self.tconfig_map.has_key(val) -config_file = cutils.get_config_file(tconfig=True) 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') + if os.path.exists(old_config_file) and not os.path.exists(config_file): + print 'convert!' CONVERT = True -else: CONVERT = False +else: + config_file = cutils.get_config_file(tconfig=True) + CONVERT = False + configManager = TConfigManager(MPLConfig, - cutils.get_config_file(tconfig=True), + config_file, filePriority=True) mplConfig = configManager.tconf mplConfigDefault = MPLConfig() Modified: trunk/matplotlib/lib/matplotlib/config/mpltraits.py =================================================================== --- trunk/matplotlib/lib/matplotlib/config/mpltraits.py 2007-07-30 18:05:14 UTC (rev 3633) +++ trunk/matplotlib/lib/matplotlib/config/mpltraits.py 2007-07-30 18:44:36 UTC (rev 3634) @@ -32,7 +32,7 @@ 'ps': 'PS', 'pdf': 'PDF', 'svg': 'SVG', - 'template': 'Templates' } + 'template': 'Template' } def validate(self, object, name, value): try: @@ -143,4 +143,4 @@ 'gist_yarg', 'gist_yarg_r', 'gray', 'gray_r', 'hot', 'hot_r', 'hsv', 'hsv_r', 'jet', 'jet_r', 'pink', 'pink_r', 'prism', 'prism_r', 'spectral', 'spectral_r', 'spring', - 'spring_r', 'summer', 'summer_r', 'winter', 'winter_r'] \ No newline at end of file + 'spring_r', 'summer', 'summer_r', 'winter', 'winter_r'] Modified: trunk/matplotlib/lib/matplotlib/mpl-data/matplotlibrc =================================================================== --- trunk/matplotlib/lib/matplotlib/mpl-data/matplotlibrc 2007-07-30 18:05:14 UTC (rev 3633) +++ trunk/matplotlib/lib/matplotlib/mpl-data/matplotlibrc 2007-07-30 18:44:36 UTC (rev 3634) @@ -243,6 +243,7 @@ #savefig.dpi : 100 # figure dots per inch #savefig.facecolor : white # figure facecolor when saving #savefig.edgecolor : white # figure edgecolor when saving +#savefig.orientation : portrait # portrait or landscape #cairo.format : png # png, ps, pdf, svg This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |