Browse code

update geom_tiplab2

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/ggtree@118763 bc3139a8-67e5-0310-9ffc-ced21a209358

g.yu authored on 20/06/2016 06:20:08
Showing 2 changed files

... ...
@@ -1,5 +1,6 @@
1 1
 CHANGES IN VERSION 1.5.5
2 2
 ------------------------
3
+ o update geom_tiplab2 according to angle change introduced by open_tree <2016-06-20, Mon>
3 4
  o bug fixed in collapse, now work with collapse a clade that contain a subclade that was already collapsed <2016-06-02-Thu>
4 5
  o bug fixed if time-scaled tree extend into the BCE. <2016-06-02, Thu>
5 6
    + as.Date won't work for BCE time.
... ...
@@ -72,9 +72,11 @@ geom_tiplab <- function(mapping=NULL, hjust = 0, align = FALSE, linetype = "dott
72 72
 geom_tiplab2 <- function(mapping=NULL, hjust=0, ...) {
73 73
 
74 74
     angle <- NULL
75
-    m1 <- aes(subset=(abs(angle) < 90), angle=angle)
76
-    m2 <- aes(subset=(abs(angle) >= 90), angle=angle+180)
77
-        
75
+    ## m1 <- aes(subset=(abs(angle) < 90), angle=angle)
76
+    ## m2 <- aes(subset=(abs(angle) >= 90), angle=angle+180)
77
+    m1 <- aes(subset=(angle < 90 | angle > 270), angle=angle)
78
+    m2 <- aes(subset=(angle >= 90 & angle <=270), angle=angle+180)
79
+    
78 80
     if (!is.null(mapping)) {
79 81
         m1 <- modifyList(mapping, m1)
80 82
         m2 <- modifyList(mapping, m2)