From ca18ef726002bd64d831bc90c26ebe1b42a70069 Mon Sep 17 00:00:00 2001 From: Pepper Date: Wed, 4 Mar 2015 04:28:00 -0500 Subject: added is color --- imgrid.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'imgrid.py') diff --git a/imgrid.py b/imgrid.py index 86597bb..2dfe5bb 100755 --- a/imgrid.py +++ b/imgrid.py @@ -31,6 +31,11 @@ DEFAULT_LINE_COLOR = "silver" DEFAULT_FINALFORMAT = "png" #{{{Utility functions +def is_color(s): + if re.match('(rgba?\([0-9]+,[0-9]+,[0-9]+\))|([a-zA-Z]+)|(\#[A-Ha-h0-9]+)', s): + return s + else: + raise ValueError def bool_correct(s): if re.match(r'^false$', s, re.IGNORECASE): return False @@ -169,8 +174,8 @@ class Imgrid(): except Exception as e: sys.stderr.write(str(e)) raise; - elif k in [ 'bgcolor', 'planebgcolor' ]: - self.params[k] = params[k] + elif k in [ 'bgcolor', 'planebgcolor','linecolor' ]: + self.params[k] = is_color(params[k]) elif k == 'opacity': self.params[k] = str(float(params[k])) elif k == 'zoom': -- cgit v1.2.3-70-g09d2