Mercurial > repos > dcorreia > newick_display

changeset 4:ceba45fbfcb8 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author dcorreia
date Tue, 15 Mar 2016 10:52:31 -0400
parents 0bc30924cb8c
children 715bbf2bbef5
files nwdisplay.xml
diffstat 1 files changed, 21 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/nwdisplay.xml	Tue Mar 15 10:52:13 2016 -0400
+++ b/nwdisplay.xml	Tue Mar 15 10:52:31 2016 -0400
@@ -26,18 +26,20 @@
                  "visibility:hidden;"
             #end if			
 			
-			-l "font-family:sans-serif;"
+			-l "font-family:$leafPolice;font-size:$leafSize;"
 			-d "stroke:grey;fill:none;stroke-width:2;stoke-linecap:round;"
-			-w  $resolution
+			-w  $width
 			$radial
 			
 		    $fileNewick > $output
 		
     </command>
 	<inputs>
-		<param name="fileNewick" format="txt,nw" type="data" label="Newick file" />
+		<param name="fileNewick" format="txt,nw,nwk,nhx" type="data" label="Newick file" />
 		<param name="scalebar" type="boolean" truevalue="" falsevalue="-S"	checked="True" label="Display scale bar" />
 		<param name="legend" type="text" value="" label="Unit name scale" />
+		<param name="leafPolice" type="text" value="sans-serif" label="Leaf police" />
+		<param name="leafSize" type="text" value="10px" label="Leaf font-size" />
 		<conditional name="condbranchsupport">
 			<param name="branchsupport" type="select" label="Branch support">
 			    <option value="true">Display branch support</option>
@@ -62,13 +64,27 @@
 			</when>
 			<when value="false" />
 		</conditional>
-		<param name="resolution" type="integer" value="400"	label="Tree resolution (px)" />
+		<param name="width" type="integer" value="800"	label="SVG Tree width (px)" />
 		<param name="radial" type="boolean" truevalue="-r" falsevalue="" checked="False" label="Draw a radial tree" />
 	</inputs>
 	<outputs>
 		<data name="output" format="svg" label="${fileNewick.name}.svg" />
 	</outputs>
-    <help> 
+	<tests>
+		<test>
+		    <param name="fileNewick" value="tree.nwk"/>
+		    <param name="width" value="400"/>
+		    <param name="leafPolice" value="courier"/>
+            <output name="output" file="tree.svg" lines_diff="2"/>
+		</test>
+		<test>
+            <param name="fileNewick" value="tree.nwk"/>
+            <param name="radial" value="-r"/>
+            <param name="branchlength" value="true"/>
+            <output name="output" file="tree2.svg" lines_diff="2"/>
+        </test>
+	</tests>
+    <help>
 <![CDATA[
 **Displays a tree as a graph, as text or SVG.**