Mercurial > repos > eric-rasche > circos
changeset 7:b72f2db6d417 draft
planemo upload for repository https://github.com/TAMU-CPT/galaxy-circos-tool commit 86fb40a41d9e6012ea0b02d1cd77675f4bd971fb
| author | eric-rasche |
|---|---|
| date | Sat, 10 Jun 2017 14:16:41 -0400 |
| parents | 169adf243c0a |
| children | eb3af6e9f633 |
| files | macros.xml macros_conffiles.xml |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/macros.xml Sat Jun 10 13:38:32 2017 -0400 +++ b/macros.xml Sat Jun 10 14:16:41 2017 -0400 @@ -278,7 +278,7 @@ <expand macro="circos_color" label="Link Color" name="action_value"/> </when> <when value="dynamic"> - <expand macro="brewer_scale" name="action_value" label="Fill Color"/> + <expand macro="brewer_scale" label="Fill Color" name="action_value"/> <param name="min_value" type="float" value="-1" label="Expected minimum value of dataset"/> <param name="max_value" type="float" value="1" label="Expected maximum value of dataset"/> </when>
--- a/macros_conffiles.xml Sat Jun 10 13:38:32 2017 -0400 +++ b/macros_conffiles.xml Sat Jun 10 14:16:41 2017 -0400 @@ -278,10 +278,9 @@ #for $action in $rule.actions: #set actiontype = $action.action.action_select - #set actionval = $action.action.action_value #if $actiontype == 'color': #if $action.action.dynamic.dynamic_select == "static": - #set actionval = $circosColor($actionval) + #set actionval = $circosColor($action.action.dynamic.action_value) $actiontype = $actionval #else #set x_fill_color = $action.action.dynamic.action_value @@ -290,6 +289,7 @@ $actiontype = eval(qw(${x_fill_color_qw})[remap_int(var(value), ${action.action.dynamic.min_value}, ${action.action.dynamic.max_value}, 0, ${x_fill_color_count - 1})]) #end if #else + #set actionval = $action.action.action_value $actiontype = $actionval #end if #end for