Browse code

update geom_tippoint

guangchuang yu authored on 02/02/2018 07:58:26
Showing3 changed files

... ...
@@ -86,7 +86,6 @@ update:
86 86
 
87 87
 push:
88 88
 	git push upstream master;\
89
-	git push;\
90 89
 	git push origin master
91 90
 
92 91
 
... ...
@@ -1,5 +1,6 @@
1 1
 # ggtree 1.11.5
2 2
 
3
++ support passing `aes(subset)` in geom_tippoint (2018-01-30, Tue)
3 4
 + support passing `aes(subset)` in geom_nodepoint (2018-01-26, Fri)
4 5
 + fine tune y position after flip; flip compatible with collapse
5 6
     - <https://groups.google.com/d/msgid/bioc-ggtree/1d06342c-9645-4f71-9e66-7d7a7099bf0b%40googlegroups.com?utm_medium=email&utm_source=footer>
... ...
@@ -14,6 +14,9 @@ geom_tippoint <- function(mapping = NULL, data = NULL,
14 14
     if (is.null(mapping)) {
15 15
         mapping <- self_mapping
16 16
     } else {
17
+        if (!is.null(mapping$subset)) {
18
+            self_mapping <- aes_string(node = "node", subset = paste0(as.expression(mapping$subset), '&isTip'))
19
+        }
17 20
         mapping <- modifyList(self_mapping, mapping)
18 21
     }
19 22
     geom_point2(mapping, data, position, na.rm, show.legend, inherit.aes, stat = StatTreeData, ...)