1. ggtree
  2. Commit 5ae491271f07b3b75dbf29b424c0f9502feb8994
Browse code

compatible with ggplot2 v2.2.1 & 2.2.2

guangchuang yu authored on 25/06/2018 07:19:15
Showing 5 changed files
DESCRIPTION
History View file @ 5ae49127
... ... 
@@ -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.006
5 
+Version: 1.13.0.007
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")),
NEWS.md
History View file @ 5ae49127
... ... 
@@ -1,5 +1,7 @@
1 
-# ggtree 1.13.0.006
1 
+# ggtree 1.13.0.007
2 2
3 
++ `geom_nodepoint` & `geom_tippoint` now compatible with `ggplot2` v 2.2.1 &
4 
+  2.2.2 (2018-06-25, Mon)
3 5 
 + `geom_rootedge` (2018-06-13, Wed)
4 6 
   - <https://github.com/GuangchuangYu/ggtree/issues/183>
5 7 
 + `clade_name` parameter added in `collapse` (2018-05-28, Mon)
R/geom_point.R
History View file @ 5ae49127
... ... 
@@ -15,7 +15,7 @@ geom_tippoint <- function(mapping = NULL, data = NULL,
15 15 
         mapping <- self_mapping
16 16 
     } else {
17 17 
         if (!is.null(mapping$subset)) {
18 
-            self_mapping <- aes_string(node = "node", subset = paste0(as.expression(mapping$subset), '&isTip'))
18 
+            self_mapping <- aes_string(node = "node", subset = paste0(as.expression(get_aes_var(mapping, "subset")), '&isTip'))
19 19 
         }
20 20 
         mapping <- modifyList(self_mapping, mapping)
21 21 
     }
... ... 
@@ -60,7 +60,7 @@ geom_nodepoint <- function(mapping = NULL, data = NULL,
60 60 
         mapping <- self_mapping
61 61 
     } else {
62 62 
         if (!is.null(mapping$subset)) {
63 
-            self_mapping <- aes_string(node = "node", subset = paste0(as.expression(mapping$subset), '&!isTip'))
63 
+            self_mapping <- aes_string(node = "node", subset = paste0(as.expression(get_aes_var(mapping, "subset")), '&!isTip'))
64 64 
         }
65 65 
         mapping %<>% modifyList(self_mapping)
66 66 
     }
R/geom_tiplab.R
History View file @ 5ae49127
... ... 
@@ -14,7 +14,7 @@
14 14 
 ##' @importFrom ggplot2 geom_text
15 15 
 ##' @importFrom utils modifyList
16 16 
 ##' @export
17 
-##' @author Yu Guangchuang
17 
+##' @author Guangchuang Yu
18 18 
 ##' @examples
19 19 
 ##' require(ape)
20 20 
 ##' tr <- rtree(10)
... ... 
@@ -92,9 +92,9 @@ geom_tiplab2 <- function(mapping=NULL, hjust=0, ...) {
92 92 
     if (!is.null(mapping)) {
93 93 
         if (!is.null(mapping$subset)) {
94 94 
             m1 <- aes_string(angle = "angle", node = "node",
95 
-                             subset = paste0(as.expression(mapping$subset), '& (isTip & (angle < 90 | angle > 270))'))
95 
+                             subset = paste0(as.expression(get_aes_var(mapping, "subset")), '& (isTip & (angle < 90 | angle > 270))'))
96 96 
             m2 <- aes_string(angle = "angle+180", node = "node",
97 
-                             subset = paste0(as.expression(mapping$subset), '& (isTip & (angle >= 90 & angle <= 270))'))
97 
+                             subset = paste0(as.expression(get_aes_var(mapping, "subset")), '& (isTip & (angle >= 90 & angle <= 270))'))
98 98 
         }
99 99 
         m1 <- modifyList(mapping, m1)
100 100 
         m2 <- modifyList(mapping, m2)
man/geom_tiplab.Rd
History View file @ 5ae49127
... ... 
@@ -36,5 +36,5 @@ tr <- rtree(10)
36 36 
 ggtree(tr) + geom_tiplab()
37 37 
 }
38 38 
 \author{
39 
-Yu Guangchuang
39 
+Guangchuang Yu
40 40 
 }