... | ... |
@@ -2,7 +2,7 @@ Package: ggtree |
2 | 2 |
Type: Package |
3 | 3 |
Title: an R package for visualization and annotation of phylogenetic trees with |
4 | 4 |
their covariates and other associated data |
5 |
-Version: 1.13.0.004 |
|
5 |
+Version: 1.13.0.005 |
|
6 | 6 |
Authors@R: c( |
7 | 7 |
person("Guangchuang", "Yu", email = "guangchuangyu@gmail.com", role = c("aut", "cre", "cph"), comment = c(ORCID = "0000-0002-6485-8781")), |
8 | 8 |
person("Tommy Tsan-Yuk", "Lam", email = "tylam.tommy@gmail.com", role = c("aut", "ths")), |
... | ... |
@@ -1,5 +1,7 @@ |
1 |
-# ggtree 1.13.0.004 |
|
1 |
+# ggtree 1.13.0.005 |
|
2 | 2 |
|
3 |
++ `clade_name` parameter added in `collapse` (2018-05-28, Mon) |
|
4 |
+ - <https://groups.google.com/forum/?utm_medium=email&utm_source=footer#!msg/bioc-ggtree/0H1PCJPlI1Q/DeZf9EVhBQAJ> |
|
3 | 5 |
+ bug fixed of `gheatmpa` for rowname subsetting is partial match in R |
4 | 6 |
(2018-05-23, Wed) |
5 | 7 |
- <https://github.com/GuangchuangYu/ggtree/issues/182> |
... | ... |
@@ -63,13 +63,14 @@ is.viewClade <- function(tree_view) { |
63 | 63 |
##' @rdname collapse |
64 | 64 |
##' @param x tree view |
65 | 65 |
##' @param node clade node |
66 |
+##' @param clade_name set clade name. If clade_name = NULL, do nothing |
|
66 | 67 |
##' @param ... additional parameters |
67 | 68 |
##' @return tree view |
68 | 69 |
##' @method collapse ggtree |
69 | 70 |
##' @export |
70 | 71 |
##' @seealso expand |
71 | 72 |
##' @author Guangchuang Yu |
72 |
-collapse.ggtree <- function(x=NULL, node, ...) { |
|
73 |
+collapse.ggtree <- function(x=NULL, node, clade_name = NULL, ...) { |
|
73 | 74 |
tree_view <- get_tree_view(x) |
74 | 75 |
|
75 | 76 |
df <- tree_view$data |
... | ... |
@@ -100,6 +101,10 @@ collapse.ggtree <- function(x=NULL, node, ...) { |
100 | 101 |
ii <- which(!is.na(df$x)) |
101 | 102 |
df$angle[ii] <- calculate_angle(df[ii,])$angle |
102 | 103 |
|
104 |
+ ## set clade name |
|
105 |
+ if (!is.null(clade_name)) |
|
106 |
+ df$label[node] <- clade_name |
|
107 |
+ |
|
103 | 108 |
tree_view$data <- df |
104 | 109 |
clade <- paste0("clade_", node) |
105 | 110 |
attr(tree_view, clade) <- sp.df |
... | ... |
@@ -4,13 +4,15 @@ |
4 | 4 |
\alias{collapse.ggtree} |
5 | 5 |
\title{collapse-ggtree} |
6 | 6 |
\usage{ |
7 |
-\method{collapse}{ggtree}(x = NULL, node, ...) |
|
7 |
+\method{collapse}{ggtree}(x = NULL, node, clade_name = NULL, ...) |
|
8 | 8 |
} |
9 | 9 |
\arguments{ |
10 | 10 |
\item{x}{tree view} |
11 | 11 |
|
12 | 12 |
\item{node}{clade node} |
13 | 13 |
|
14 |
+\item{clade_name}{set clade name. If clade_name = NULL, do nothing} |
|
15 |
+ |
|
14 | 16 |
\item{...}{additional parameters} |
15 | 17 |
} |
16 | 18 |
\value{ |