git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/ggtree@114270 bc3139a8-67e5-0310-9ffc-ced21a209358
g.yu authored on 05/03/2016 15:59:44
| ... | ... |
@@ -1,5 +1,6 @@ |
| 1 | 1 |
CHANGES IN VERSION 1.3.14 |
| 2 | 2 |
------------------------ |
| 3 |
+ o geom_tiplab works with NA values, compatible with collapse <2016-03-05, Sat> |
|
| 3 | 4 |
o update theme_tree2 due to the issue of https://github.com/hadley/ggplot2/issues/1567 <2016-03-05, Sat> |
| 4 | 5 |
o offset works in `align=FFALSE` with `annotation_image` function <2016-02-23, Tue> |
| 5 | 6 |
+ see https://github.com/GuangchuangYu/ggtree/issues/46 |
| ... | ... |
@@ -8,7 +9,7 @@ CHANGES IN VERSION 1.3.14 |
| 8 | 9 |
CHANGES IN VERSION 1.3.13 |
| 9 | 10 |
------------------------ |
| 10 | 11 |
o add example of rescale_tree function in treeAnnotation.Rmd <2016-02-07, Sun> |
| 11 |
- o geom_cladelabel work with collapse <2016-02-07, Sun> |
|
| 12 |
+ o geom_cladelabel works with collapse <2016-02-07, Sun> |
|
| 12 | 13 |
+ see https://github.com/GuangchuangYu/ggtree/issues/38 |
| 13 | 14 |
|
| 14 | 15 |
CHANGES IN VERSION 1.3.12 |
| ... | ... |
@@ -19,7 +19,7 @@ |
| 19 | 19 |
geom_tiplab <- function(mapping=NULL, hjust = 0, align = FALSE, linetype = "dotted", linesize=1, ...) {
|
| 20 | 20 |
x <- y <- label <- isTip <- NULL |
| 21 | 21 |
if (align == TRUE) {
|
| 22 |
- self_mapping <- aes(x = max(x) + diff(range(x, na.rm=TRUE))/200, y = y, label = label, subset= isTip) |
|
| 22 |
+ self_mapping <- aes(x = max(x, na.rm=TRUE) + diff(range(x, na.rm=TRUE))/200, y = y, label = label, subset= isTip) |
|
| 23 | 23 |
} |
| 24 | 24 |
else {
|
| 25 | 25 |
self_mapping <- aes(x = x + diff(range(x, na.rm=TRUE))/200, y= y, label = label, subset= isTip) |
| ... | ... |
@@ -33,7 +33,7 @@ geom_tiplab <- function(mapping=NULL, hjust = 0, align = FALSE, linetype = "dott |
| 33 | 33 |
|
| 34 | 34 |
dot_mapping <- NULL |
| 35 | 35 |
if (align && (!is.na(linetype) && !is.null(linetype))) {
|
| 36 |
- dot_mapping <- aes(xend=x+diff(range(x))/200, x=max(x), y=y, yend=y, subset=isTip) |
|
| 36 |
+ dot_mapping <- aes(xend=x+diff(range(x, na.rm=TRUE))/200, x=max(x, na.rm=TRUE), y=y, yend=y, subset=isTip) |
|
| 37 | 37 |
if (!is.null(mapping)) {
|
| 38 | 38 |
dot_mapping <- modifyList(dot_mapping, mapping) |
| 39 | 39 |
} |