Browse code

update vignettes

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/ggtree@117287 bc3139a8-67e5-0310-9ffc-ced21a209358

g.yu authored on 11/05/2016 01:55:42
Showing 3 changed files

... ...
@@ -1,5 +1,6 @@
1 1
 CHANGES IN VERSION 1.5.2
2 2
 ------------------------
3
+ o add example of integrate user's data using phylo4d in treeAnnotation vignette <2016-05-11, Wed>
3 4
  o add extend, extendto parameter in geom_hilight <2016-05-10, Tue>
4 5
  o geom_hilight now supports hilight tips <2016-05-10, Tue>
5 6
    + https://github.com/GuangchuangYu/ggtree/issues/53
... ...
@@ -17,6 +17,7 @@ vignette: >
17 17
   %\VignetteIndexEntry{04 Tree Annotation}
18 18
   %\VignetteEngine{knitr::rmarkdown}
19 19
   %\VignetteDepends{phangorn}
20
+  %\VignetteDepends{phylobase}
20 21
   %\usepackage[utf8]{inputenc}
21 22
 ---
22 23
 
... ...
@@ -283,9 +284,23 @@ p+theme(legend.position="right")
283 284
 Once the data was attached, it is always attached. So that we can add other layers to display these information easily. 
284 285
 ```{r fig.width=6, fig.height=5, warning=FALSE, fig.align="center"}
285 286
 p + geom_text(aes(color=place, label=place), hjust=1, vjust=-0.4, size=3) +
286
-  geom_text(aes(color=place, label=value), hjust=1, vjust=1.4, size=3)
287
+    geom_text(aes(color=place, label=value), hjust=1, vjust=1.4, size=3)
287 288
 ```
288 289
 
290
+## phylo4d
291
+ 
292
+`phylo4d` was defined in the `phylobase` package, which can be employed to integrate user's data with phylogenetic tree. `phylo4d` was supported in `ggtree` and the data stored in the object can be used directly to annotate the tree.
293
+	  
294
+```{r fig.width=6, fig.height=5, warning=FALSE, fig.align="center"}
295
+dd2 <- dd[, -1]
296
+rownames(dd2) <- dd[,1]
297
+require(phylobase)
298
+tr2 <- phylo4d(tree, dd2)
299
+ggtree(tr2) + geom_tiplab(aes(color=place)) + 
300
+    geom_tippoint(aes(size=value, shape=place, color=place), alpha=0.25)
301
+```
302
+
303
+	
289 304
 ## jplace file format
290 305
 
291 306
 `ggtree` provides `write.jplace()` function to store user's own data and associated newick tree to a single `jplace` file, which can be parsed directly in `ggtree` and user's data can be used to annotate the tree directly. For more detail, please refer to the [Tree Data Import](treeImport.html#jplace-file-format) vignette.
... ...
@@ -96,7 +96,7 @@ Here is an overview of these `S4` classes:
96 96
 
97 97
 ![](figures/ggtree_objects_v2.png)
98 98
 
99
-In addition, `ggtree` also supports _`phylo`_, _`multiPhylo`_ (defined by `ape`[@paradis_ape_2004]), _`phylo4`_ (defined by `phylobase`) _`obkData`_ (defined in `OutbreakTools`) and _`phyloseq`_ (defined in `phyloseq`).
99
+In addition, `ggtree` also supports _`phylo`_, _`multiPhylo`_ (defined by `ape`[@paradis_ape_2004]), _`phylo4`_, _`phylo4d`_ (defined by `phylobase`) _`obkData`_ (defined in `OutbreakTools`) and _`phyloseq`_ (defined in `phyloseq`).
100 100
 
101 101
 
102 102
 In `ggtree`, tree objects can be merged and evidences inferred from different phylogenetic analyses can be combined or compared and visualized.