Mercurial > repos > greg > ks_distribution

changeset 24:4cbeb43dc936 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author greg
date Mon, 26 Jun 2017 09:56:34 -0400
parents 492ef68d73f7
children bf528b77e0c9
files ks_distribution.xml
diffstat 1 files changed, 11 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ks_distribution.xml	Mon Jun 26 09:56:24 2017 -0400
+++ b/ks_distribution.xml	Mon Jun 26 09:56:34 2017 -0400
@@ -9,14 +9,14 @@
 Rscript $__tool_directory__/ks_distribution.R
 -k '$input'
 -c '$components'
--n $components.metadata.num_comp
+-n $components.metadata.number_comp
 -o '$output'
 #if str($choose_colors_cond.choose_colors) == 'yes':
-    #set ccs = list()
-    #for $i in $choose_colors_cond.colors:
-        $ccs.append(str($i.color))
+    #set specified_colors = list()
+    #for $selection in $choose_colors_cond.colors:
+        $specified_colors.append(str($selection.color))
     #end for
-    -r '#echo json.dumps(ccs)#'
+    -r '#echo json.dumps(specified_colors)#'
 #end if
     ]]></command>
     <inputs>
@@ -31,7 +31,12 @@
             <when value="yes">
                 <repeat name="colors" title="Component colors" min="1">
                     <param name="color" type="select" label="Color">
-                        <expand macro="color_selector" />
+                        <option value="255,0,0" selected="True">red</option>
+                        <option value="0,255,0">green</option>
+                        <option value="0,0,255">blue</option>
+                        <option value="255,255,0">yellow</option>
+                        <option value="255,140,0">dark orange</option>
+                        <option value="0,0,0">black</option>
                     </param>
                 </repeat>
             </when>