Item10044: changed to include more setting information

git-svn-id: http://svn.foswiki.org/trunk/PhyloWidgetPlugin@10127 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Dec 1, 2010 · a8b8eb5 · a8b8eb5
1 parent 5bf2a5d
commit a8b8eb5
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/data/System/PhyloNexusViewer.txt b/data/System/PhyloNexusViewer.txt
@@ -5,7 +5,7 @@
    * Set AATTACH=%URLPARAM{"qAttachment" default="%attachment%"}%
 -->
 <div id="phylowidget" style="float:left;">
-%PHYLOWIDGET{width="420" height="495"}%
+%PHYLOWIDGET{width="420" height="495" useBranchLengths="true"}%
 </div>
 
 <div id="treeList" style="float: right; width: 425px; height: 500px; border: 2px solid black; padding: 3px; overflow: scroll;">

diff --git a/data/System/VarNEXUSTREES.txt b/data/System/VarNEXUSTREES.txt
@@ -32,7 +32,7 @@ separator="$n"
    footer="<h3>***********</h3>$n"
    separator="$n"
   }%
-    * Examples 2: [[ViewTrees]]
-    See also: [[PhyloWidgetPlugin]], [[VarNEXUSTREES][PHYLOWIDGET]], [[ViewTrees]]
+    * Examples 2: [[PhyloViewTrees]]
+    See also: [[PhyloWidgetPlugin]], [[VarNEXUSTREES][PHYLOWIDGET]], [[PhyloViewTrees]]
     <!--%JQREQUIRE{"chili"}%-->
 
diff --git a/data/System/VarPHYLOWIDGET.txt b/data/System/VarPHYLOWIDGET.txt
@@ -23,6 +23,7 @@
 	%PHYLOWIDGET{"%SYSTEMWEB%.PhyloWidgetExample"
 	height="495"
 	width="420"
+	useBranchLengths="true"
 	}%
    See also: [[PhyloWidgetPlugin]], [[VarNEXUSTREES][NEXUSTREES]]
 <!--%JQREQUIRE{"chili"}%-->
diff --git a/data/System/ViewTrees.txt b/data/System/ViewTrees.txt
diff --git a/lib/Foswiki/Plugins/PhyloWidgetPlugin.pm b/lib/Foswiki/Plugins/PhyloWidgetPlugin.pm
@@ -342,9 +342,15 @@ sub _EXAMPLETAG {
 #       $url = $params->{'url'};
 	push @tree , "tree:'$params->{'url'}'" if $params->{'url'};
     }
-    push @tree ,"height:$params->{'height'}" if $params->{'height'};
-    push @tree ,"width:$params->{'width'}" if $params->{'width'};
-    push @tree ,"menu:'$params->{'menu'}'" if $params->{'menu'};
+    while ( my ( $key, $value ) = each( %{$params} ) ) {
+    push( @tree, "$key: '$value'" )
+    if ( $key ne "_RAW" )
+    and ( $key ne "_DEFAULT" )
+    and ( $key ne "url" );
+    }
+#     push @tree ,"height:$params->{'height'}" if $params->{'height'};
+#     push @tree ,"width:$params->{'width'}" if $params->{'width'};
+#     push @tree ,"menu:'$params->{'menu'}'" if $params->{'menu'};
 #     my $urls = 'url';
 
 #     foreach my $term (@terms){

diff --git a/lib/Foswiki/Plugins/PhyloWidgetPlugin/MANIFEST b/lib/Foswiki/Plugins/PhyloWidgetPlugin/MANIFEST
@@ -4,7 +4,7 @@ data/System/PhyloWidgetExample.txt 0644
 data/System/PhyloWidgetViewHelper.txt 0644
 data/System/VarNEXUSTREES.txt 0644
 data/System/VarPHYLOWIDGET.txt 0644
-data/System/ViewTrees.txt 0644
+data/System/PhyloViewTrees.txt 0644
 lib/Foswiki/Plugins/PhyloWidgetPlugin.pm 0644
 pub/System/PhyloWidgetExample/Tree.nex 0644
 pub/System/PhyloWidgetPlugin/bare.html 0644