# HG changeset patch
# User bgruening
# Date 1390944532 18000
# Node ID 3f209640411388ce03eb2e54659a2eca67252706
# Parent  46009b7883ba2b45659734ae1874e3e383fd19bf
Uploaded

diff -r 46009b7883ba -r 3f2096404113 profiler.xml
--- a/profiler.xml	Tue Jan 28 15:20:18 2014 -0500
+++ b/profiler.xml	Tue Jan 28 16:28:52 2014 -0500
@@ -47,7 +47,7 @@
             #end if
 
             #if str($advancedOpt.colors.value) != "None":
-                --colors ' '.join( ['$color' for $color in $advancedOpt.colors.split()] )
+                --colors #echo ' '.join( ["'%s'" % $color for $color in $advancedOpt.colors.split()] )#
             #end if
 
             $advancedOpt.onePlotPerGroup
@@ -113,16 +113,10 @@
                 </param>
                 <param name="regionsLabel" type="text" value="genes" size="30" label="Labels for the regions plotted in the heatmap" help="If more than one region is being plotted a list of labels separated by comma and limited by quotes, is required. For example, &quot;label1, label2&quot;."/>
                 <param name="plotTitle" type="text" value="" size="30" label="Title of the plot" help="Title of the plot, to be printed on top of the generated image. Leave blank for no title." />
-                <param name="colors" type="text" value="" size="40" label="List of colors to use for the plotted lines" help="Color names and html hex strings (e.g. #eeff22) are accepted. The color names should be given separated by spaces. (--colors red blue green)" >
-                    <sanitizer invalid_char=",">
-                        <valid initial="string.letters,string.digits">
-                            <add value=" " /> 
-                            <add value="#" />
-                        </valid>
-                    </sanitizer>
+                <param name="colors" type="text" value="" size="40" label="List of colors to use for the plotted lines" help="Color names and html hex strings (e.g. #eeff22) are accepted. The color names should be given separated by spaces. (--colors red blue green)">
+                    <validator type="expression" message="Only numbers, digits, '#' and spaces are allowed.">all(c in ' #abcdefghijklmnopqrstuvwxyz0123456789' for c in value)</validator>
                 </param>
 
-
                 <param name="onePlotPerGroup" type="boolean" truevalue="--onePlotPerGroup" falsevalue="" label="Do one plot per group" help="When the region file contains groups separated by &quot;#&quot;, the default is to plot the averages for the distinct plots in one plot. If this option is set, each group will get its own plot, stacked on top of each other."/>
                 <param name="yMin" type="float" value="" size="3" label="Minimum value for the Y-axis of the summary plot. Leave empty for automatic values" optional="true"/>
                 <param name="yMax" type="float" value="" size="3" label="Maximum value for Y-axis of the summary plot. Leave empty for automatic values" optional="true"/>