From 70c8eccee082fd94af7a628a176c85818cd38cae Mon Sep 17 00:00:00 2001
From: Ross Lazarus <ross.lazarus@gmail.com>
Date: Tue, 5 Apr 2011 14:07:10 -0400
Subject: [PATCH] change to weblogo test jpg comparison and code cleanups to
 rgCaCo

---
 tool_conf.xml.main             |  6 ------
 tools/rgenetics/rgWebLogo3.xml | 13 +++++++++++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/tool_conf.xml.main b/tool_conf.xml.main
index b0bed4d5c80..2fdd9dfaa4a 100644
--- a/tool_conf.xml.main
+++ b/tool_conf.xml.main
@@ -169,12 +169,6 @@
     <!-- <tool file="hyphy/hyphy_dnds_wrapper.xml" />  -->
     <tool file="evolution/mutate_snp_codon.xml" />
  </section>
- <section name="Motif Tools" id="motifs">
-    <tool file="rgenetics/rgWebLogo3.xml" />
- </section>
- <section name="Multiple Alignments" id="clustal">
-    <tool file="rgenetics/rgClustalw.xml" />
- </section>
  <section name="Metagenomic analyses" id="tax_manipulation">
     <tool file="taxonomy/gi2taxonomy.xml" />
     <tool file="taxonomy/t2t_report.xml" />
diff --git a/tools/rgenetics/rgWebLogo3.xml b/tools/rgenetics/rgWebLogo3.xml
index 611812bad73..dc90a5ce553 100644
--- a/tools/rgenetics/rgWebLogo3.xml
+++ b/tools/rgenetics/rgWebLogo3.xml
@@ -5,7 +5,7 @@
 #if $range.mode == 'part'
 -l "$range.seqstart" -u "$range.seqend"
 #end if
-   </command>
+    </command>
   <inputs>
    <page>
     <param format="fasta" name="input" type="data" label="Fasta File" />
@@ -71,7 +71,7 @@
       <param name = "mode" value="complete" />
       <param name = "size" value="medium" />      
       <param name = "colours" value="auto" />
-      <output name="output" file="rgWebLogo3_test.jpg" ftype="jpg" />
+      <output name="output" file="rgWebLogo3_test.jpg" ftype="jpg" compare="sim_size" delta="10000" />
     </test>
 
   </tests>
@@ -90,6 +90,15 @@ A typical output looks like this
 
 ----
 
+**Warning about input Fasta format files**
+
+The Weblogo3 program used by this tool will fail if your fasta sequences are not all EXACTLY the same length. 
+
+Fasta alignments from the companion ClustalW Galaxy tool will work but many other fasta files may cause this tool to fail - please do not file 
+a Galaxy bug report - this is a feature of the tool and a problem with your source data - not a tool error - please make certain all your fasta 
+sequences are the same length!
+
+----
 
 **Attribution**