diff macros_conffiles.xml @ 9:e6440d0201f7 draft default tip

planemo upload for repository https://github.com/TAMU-CPT/galaxy-circos-tool commit 7e335df423e3e06da3d33a5378a336a149e6cc6c

--- a/macros_conffiles.xml	Sat Jun 10 16:21:01 2017 -0400
+++ b/macros_conffiles.xml	Fri Jun 30 06:48:38 2017 -0400
@@ -110,7 +110,7 @@
     extend_bin = ${data.plot_format.format_specific.extend_bins}
     fill_color = ${data.plot_format.format_specific.fill_color}
 #else if str($plot_type) == 'heatmap':
-    fill_color = $circosColor($data.plot_format.format_specific.fill_color)
+    color = $circosColor($data.plot_format.format_specific.fill_color)
     scale_log_base = ${data.plot_format.format_specific.scale_log_base}
 #else if str($plot_type) == 'line':
     color     = $circosColor($data.plot_format.format_specific.color)
@@ -145,19 +145,19 @@
                     #set on_str = ' '.join([ "on(%s)" % $chr.strip() for $chr in $condition.application.on_genomes.split(',') ])
                     condition = $on_str
                 #elif str($condition.application.application_select) == "pos":
-                    #if $condition.application.pos_gt != 0:
+                    #if float($condition.application.pos_gt) != 0:
                     condition = var(start) > $condition.application.pos_gt
                     #end if
 
-                    #if $condition.application.pos_lt != 0:
+                    #if float($condition.application.pos_lt) != 0:
                     condition = var(start) < $condition.application.pos_lt
                     #end if
                 #elif str($condition.application.application_select) == "value":
-                    #if $condition.application.pos_gt != 0:
+                    #if float($condition.application.pos_gt) != 0:
                     condition = var(value) > $condition.application.pos_gt
                     #end if
 
-                    #if $condition.application.pos_lt != 0:
+                    #if float($condition.application.pos_lt) != 0:
                     condition = var(value) < $condition.application.pos_lt
                     #end if
                 #elif str($condition.application.application_select) == "var":
@@ -171,8 +171,9 @@
                     #set x_fill_color_count = int(str($x_fill_color).split('-')[1])
                     #set x_min = $x_fill_color_count if $action.action.invert else 1
                     #set x_max = 1 if $action.action.invert else $x_fill_color_count
+                    #set color_action = "fill_color" if str($plot_type) == 'histogram' else "color"
 
-                    fill_color = eval(sprintf("${action.action.action_value}-%d", remap_int(var(value), ${action.action.min_value}, ${action.action.max_value}, ${x_min}, ${x_max})))
+                    $color_action = eval(sprintf("${action.action.action_value}-%d", remap_int(var(value), ${action.action.min_value}, ${action.action.max_value}, ${x_min}, ${x_max})))
                 #else
                     $action.action.action_select = ${action.action.action_value}
                 #end if
@@ -291,6 +292,15 @@
 
                         $actiontype = eval(sprintf("${action.action.dynamic.action_value}-%d", remap_int(var(value), ${action.action.dynamic.min_value}, ${action.action.dynamic.max_value}, ${x_min}, ${x_max})))
                     #end if
+                #elif $actiontype == 'z':
+                    #if $action.action.dynamic.dynamic_select == "static":
+                        #set actionval = $action.action.dynamic.action_value
+                        $actiontype = $actionval
+                    #else
+                        #set x_min = 1000 if $action.action.dynamic.invert else 1
+                        #set x_max = 1 if $action.action.dynamic.invert else 1000
+                        $actiontype = eval(remap_int(var(value), ${action.action.dynamic.min_value}, ${action.action.dynamic.max_value}, ${x_min}, ${x_max}))
+                    #end if
                 #else
                     #set actionval = $action.action.action_value
                     $actiontype = $actionval