# HG changeset patch
# User eric-rasche
# Date 1497116312 14400
# Node ID 169adf243c0ad03d60e58eb23232f158480cf23a
# Parent b25b3518c2ce153e12b776c25afa0dfce9a30337
planemo upload for repository https://github.com/TAMU-CPT/galaxy-circos-tool commit ee1fa2dab456c14a2538eb66033614e14a21a2ec
diff -r b25b3518c2ce -r 169adf243c0a circgraph.xml
--- a/circgraph.xml Sat Jun 10 12:55:28 2017 -0400
+++ b/circgraph.xml Sat Jun 10 13:38:32 2017 -0400
@@ -14,20 +14,23 @@
ln -s $reference_genome.genome_fasta genomeref.fa;
#end if
- ## Process the karyotype.txt file
- python $__tool_directory__/fasta-to-karyotype.py
+ #if $reference_genome.reference_genome_source != 'karyotype':
+ ## Process the karyotype.txt file
+ python $__tool_directory__/fasta-to-karyotype.py
- #if str($reference_genome.reference_genome_source) == 'cached':
- "${reference_genome.fasta_indexes.fields.path}"
- #else if str($reference_genome.reference_genome_source) == 'history':
- genomeref.fa
- #end if
+ #if str($reference_genome.reference_genome_source) == 'cached':
+ "${reference_genome.fasta_indexes.fields.path}"
+ #else if str($reference_genome.reference_genome_source) == 'history':
+ genomeref.fa
+ #end if
- #if $ideogram.bands:
- "${ideogram.bands}"
- #end if
-
- > circos/conf/karyotype.txt &&
+ #if $ideogram.bands:
+ "${ideogram.bands}"
+ #end if
+ > circos/conf/karyotype.txt &&
+ #else
+ cp $reference_genome.input_karyotype circos/conf/karyotype.txt &&
+ #end if
mv $circos_conf circos/conf/circos.conf &&
mv $ticks_conf circos/conf/ticks.conf &&
@@ -82,14 +85,24 @@
+
+
+
+
+
+
+
+
@@ -105,9 +118,6 @@
-
-
diff -r b25b3518c2ce -r 169adf243c0a macros.xml
--- a/macros.xml Sat Jun 10 12:55:28 2017 -0400
+++ b/macros.xml Sat Jun 10 13:38:32 2017 -0400
@@ -1,6 +1,6 @@
- 0.9-RC1
+ 0.9-RC2
circos
@@ -202,6 +202,7 @@
+
@@ -253,6 +254,7 @@
+
@@ -267,7 +269,20 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r b25b3518c2ce -r 169adf243c0a macros_conffiles.xml
--- a/macros_conffiles.xml Sat Jun 10 12:55:28 2017 -0400
+++ b/macros_conffiles.xml Sat Jun 10 13:38:32 2017 -0400
@@ -249,6 +249,8 @@
#set cond = $condition.application.application_select
#if $cond == 'interchr' or $cond == 'intrachr' or $cond == 'inv' or $cond == 'rev'
condition = var($cond)
+ #elif $cond == 'always'
+ condition = 1
#else
#set op = $condition.application.comparison.compare
#set val = $condition.application.comparison.compval
@@ -278,9 +280,18 @@
#set actiontype = $action.action.action_select
#set actionval = $action.action.action_value
#if $actiontype == 'color':
- #set actionval = $circosColor($actionval)
+ #if $action.action.dynamic.dynamic_select == "static":
+ #set actionval = $circosColor($actionval)
+ $actiontype = $actionval
+ #else
+ #set x_fill_color = $action.action.dynamic.action_value
+ #set x_fill_color_count = int(str($x_fill_color).split('-')[1]) + 1
+ #set x_fill_color_qw = ' '.join(["%s-%s" % ($action.action.dynamic.action_value, $i) for i in range(1, $x_fill_color_count)])
+ $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
+ $actiontype = $actionval
#end if
- $actiontype = $actionval
#end for
$rule.continue_flow