Commit id: 295b4861a131c315f33ec09325524fc2d4e6a2e7
bump version to 1.1.3
git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/ggtree@103252 bc3139a8-67e5-0310-9ffc-ced21a209358
g.yu authored on 29/04/2015 15:24:57
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Package: ggtree |
| 2 | 2 |
Type: Package |
| 3 | 3 |
Title: a phylogenetic tree viewer for different types of tree annotations |
| 4 |
-Version: 1.1.2 |
|
| 4 |
+Version: 1.1.3 |
|
| 5 | 5 |
Author: Guangchuang Yu and Tommy Tsan-Yuk Lam |
| 6 | 6 |
Maintainer: Guangchuang Yu <guangchuangyu@gmail.com> |
| 7 | 7 |
Description: ggtree extends the ggplot2 plotting system which implemented the |
| ... | ... |
@@ -1,6 +1,9 @@ |
| 1 |
-CHANGES IN VERSION 1.1.2 |
|
| 1 |
+CHANGES IN VERSION 1.1.3 |
|
| 2 | 2 |
------------------------ |
| 3 | 3 |
o update vignette to add example of merge_tree <2015-04-29, Wed> |
| 4 |
+ |
|
| 5 |
+CHANGES IN VERSION 1.1.2 |
|
| 6 |
+------------------------ |
|
| 4 | 7 |
o in addition to parsing beast time scale tree in XXX_year[\\.\\d]*, now supports XXX/year[\\.\\d]* <2015-04-29, Wed> |
| 5 | 8 |
o add examples folder in inst that contains sample data <2015-04-29, Wed> |
| 6 | 9 |
o update gplot, now rowname of heatmap will not be displayed <2015-04-28, Tue> |
| ... | ... |
@@ -739,7 +739,8 @@ getYcoord_scale_numeric <- function(tr, df, yscale, ...) {
|
| 739 | 739 |
} |
| 740 | 740 |
idx <- which(is.na(yy[parent])) |
| 741 | 741 |
if (length(idx) > 0) {
|
| 742 |
- yy[parent[idx]] <- yy[curNode] |
|
| 742 |
+ child <- getChild(tree, parent) |
|
| 743 |
+ yy[parent[idx]] <- mean(yy[child], na.rm=TRUE) |
|
| 743 | 744 |
} |
| 744 | 745 |
} |
| 745 | 746 |
} |