# HG changeset patch
# User eric-rasche
# Date 1497118601 14400
# Node ID b72f2db6d4176e633d2dd8ad0747771366be5f6c
# Parent  169adf243c0ad03d60e58eb23232f158480cf23a
planemo upload for repository https://github.com/TAMU-CPT/galaxy-circos-tool commit 86fb40a41d9e6012ea0b02d1cd77675f4bd971fb

diff -r 169adf243c0a -r b72f2db6d417 macros.xml
--- 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>
diff -r 169adf243c0a -r b72f2db6d417 macros_conffiles.xml
--- 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