Revision: 4248
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4248&view=rev
Author: dsdale
Date: 2007-11-13 08:39:12 -0800 (Tue, 13 Nov 2007)
Log Message:
-----------
modify formatting of comments in matplotlib.conf
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/config/mplconfig.py
trunk/matplotlib/lib/matplotlib/config/mpltraits.py
trunk/matplotlib/lib/matplotlib/mpl-data/matplotlib.conf.template
trunk/matplotlib/setup.py
Modified: trunk/matplotlib/lib/matplotlib/config/mplconfig.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/config/mplconfig.py 2007-11-13 16:08:33 UTC
(rev 4247)
+++ trunk/matplotlib/lib/matplotlib/config/mplconfig.py 2007-11-13 16:39:12 UTC
(rev 4248)
@@ -43,11 +43,11 @@
the default values listed herein.
Colors: for the color values below, you can either use
- - a matplotlib color string, such as r, k, or b
+ - a matplotlib color string, such as r | k | b
- an rgb tuple, such as (1.0, 0.5, 0.0)
- a hex string, such as #ff00ff or ff00ff
- a scalar grayscale intensity such as 0.75
- - a legal html color name, eg red, blue, darkslategray
+ - a legal html color name, eg red | blue | darkslategray
Interactivity: see http://matplotlib.sourceforge.net/interactive.html.
@@ -63,8 +63,6 @@
units = T.false
class backend(TConfig):
- """Valid backends are: 'GTKAgg', 'GTKCairo', 'QtAgg', 'Qt4Agg',
- 'TkAgg', 'Agg', 'Cairo', 'PS', 'PDF', 'SVG'"""
use = T.Trait('Agg', mplT.BackendHandler())
class cairo(TConfig):
Modified: trunk/matplotlib/lib/matplotlib/config/mpltraits.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/config/mpltraits.py 2007-11-13 16:08:33 UTC
(rev 4247)
+++ trunk/matplotlib/lib/matplotlib/config/mpltraits.py 2007-11-13 16:39:12 UTC
(rev 4248)
@@ -24,18 +24,22 @@
class BackendHandler(T.TraitHandler):
"""
"""
- backends = {'tkagg': 'TkAgg',
+ backends = {'agg': 'Agg',
+ 'cairo': 'Cairo',
+ 'cocoaagg': 'CocoaAgg',
+ 'fltkagg': 'FltkAgg',
+ 'gtk': 'GTK',
'gtkagg': 'GTKAgg',
'gtkcairo': 'GTKCairo',
+ 'pdf': 'Pdf',
+ 'ps': 'PS',
'qt4agg': 'Qt4Agg',
'qtagg': 'QtAgg',
- 'wxagg': 'WXAgg',
- 'agg': 'Agg',
- 'cairo': 'Cairo',
- 'ps': 'PS',
- 'pdf': 'Pdf',
'svg': 'SVG',
- 'template': 'Template' }
+ 'template': 'Template',
+ 'tkagg': 'TkAgg',
+ 'wx': 'WX',
+ 'wxagg': 'WXAgg'}
def validate(self, object, name, value):
try:
@@ -46,7 +50,7 @@
def info(self):
be = self.backends.keys()
be.sort
- return "one of %s"% ', '.join(['%s'%i for i in be])
+ return "one of: %s"% ' | '.join(['%s'%i for i in be])
class BoolHandler(T.TraitHandler):
@@ -73,7 +77,7 @@
return self.error(object, name, value)
def info(self):
- return "one of %s"% ', '.join(['%s'%i for i in self.bools.keys()])
+ return "one of: %s"% ' | '.join(['%s'%i for i in self.bools.keys()])
flexible_true = T.Trait(True, BoolHandler())
flexible_false = T.Trait(False, BoolHandler())
Modified: trunk/matplotlib/lib/matplotlib/mpl-data/matplotlib.conf.template
===================================================================
--- trunk/matplotlib/lib/matplotlib/mpl-data/matplotlib.conf.template
2007-11-13 16:08:33 UTC (rev 4247)
+++ trunk/matplotlib/lib/matplotlib/mpl-data/matplotlib.conf.template
2007-11-13 16:39:12 UTC (rev 4248)
@@ -21,11 +21,11 @@
# the default values listed herein.
#
# Colors: for the color values below, you can either use
-# - a matplotlib color string, such as r, k, or b
+# - a matplotlib color string, such as r | k | b
# - an rgb tuple, such as (1.0, 0.5, 0.0)
# - a hex string, such as #ff00ff or ff00ff
# - a scalar grayscale intensity such as 0.75
-# - a legal html color name, eg red, blue, darkslategray
+# - a legal html color name, eg red | blue | darkslategray
#
# Interactivity: see http://matplotlib.sourceforge.net/interactive.html.
#
@@ -33,7 +33,7 @@
# a value of type 'str'
datapath = '/usr/lib64/python2.5/site-packages/matplotlib/mpl-data'
-# one of 0, on, false, 1, no, n, y, off, yes, true
+# one of: 0 | on | false | 1 | no | n | y | off | yes | true
interactive = False
# a value of type 'bool'
maskedarray = False
@@ -64,9 +64,9 @@
# name like 'orange', a hex color like '#efefef', a grayscale intensity
# like '0.5', or an RGBA tuple (1,0,0,1)
facecolor = 'white'
- # one of 0, on, false, 1, no, n, y, off, yes, true
+ # one of: 0 | on | false | 1 | no | n | y | off | yes | true
grid = False
- # one of 0, on, false, 1, no, n, y, off, yes, true
+ # one of: 0 | on | false | 1 | no | n | y | off | yes | true
hold = True
# any valid matplotlib color, eg an abbreviation like 'r' for red, a full
# name like 'orange', a hex color like '#efefef', a grayscale intensity
@@ -77,7 +77,7 @@
labelsize = 'medium'
# a value of type 'float'
linewidth = 1.0
- # one of 0, on, false, 1, no, n, y, off, yes, true
+ # one of: 0 | on | false | 1 | no | n | y | off | yes | true
polargrid = True
# a value of type 'float' or 'xx-small' or 'x-small' or 'small' or
'medium'
# or 'large' or 'x-large' or 'xx-large'
@@ -88,10 +88,8 @@
limits = [-7.0, 7.0]
[backend]
- # Valid backends are: 'GTKAgg', 'GTKCairo', 'QtAgg', 'Qt4Agg',
- # 'TkAgg', 'Agg', 'Cairo', 'PS', 'PDF', 'SVG'
- # one of ps, qt4agg, tkagg, gtkagg, agg, cairo, gtkcairo, wxagg, qtagg,
temp
- # late, svg, pdf
+ # one of: ps | qt4agg | fltkagg | gtkagg | agg | cairo | gtk | gtkcairo |
wx
+ # agg | tkagg | qtagg | template | svg | cocoaagg | pdf | wx
use = 'Agg'
[[cairo]]
Modified: trunk/matplotlib/setup.py
===================================================================
--- trunk/matplotlib/setup.py 2007-11-13 16:08:33 UTC (rev 4247)
+++ trunk/matplotlib/setup.py 2007-11-13 16:39:12 UTC (rev 4248)
@@ -169,7 +169,6 @@
if options['build_gtk']:
if hasgtk or (options['build_gtk'] is True):
build_gdk(ext_modules, packages)
- rc['backend'] = 'GTK'
if options['build_gtkagg']:
if hasgtk or (options['build_gtkagg'] is True):
options['build_agg'] = 1
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
