Browse code

fixed #167

guangchuang yu authored on 24/02/2018 10:18:39
Showing 4 changed files

1 1
deleted file mode 100644
... ...
@@ -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.11.5
5
+Version: 1.11.6
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")),
... ...
@@ -1,5 +1,10 @@
1 1
 # ggtree 1.11.5
2 2
 
3
++ fixed overlapping branch after `flip`
4
+    - <https://github.com/GuangchuangYu/ggtree/issues/167>
5
+
6
+# ggtree 1.11.5
7
+
3 8
 + support passing `aes(subset)` in geom_tippoint (2018-01-30, Tue)
4 9
 + support passing `aes(subset)` in geom_nodepoint (2018-01-26, Fri)
5 10
 + fine tune y position after flip; flip compatible with collapse
... ...
@@ -234,11 +234,12 @@ flip <- function(tree_view=NULL, node1, node2) {
234 234
     sp1.df$y <- sp1.df$y - abs(min_y1 - min_y2)
235 235
     sp2.df$y <- sp2.df$y + max(sp1.df$y, na.rm=TRUE) + space - min(sp2.df$y, na.rm=TRUE)
236 236
 
237
+
237 238
     df[sp1, "y"] <- sp1.df$y
238 239
     df[sp2, "y"] <- sp2.df$y
239 240
 
240
-    yy <- df$y[-c(sp1, sp2)]
241
-    df$y[-c(sp1, sp2)] <- yy + ((min(sp2.df$y, na.rm=TRUE) - max(yy)) - (min(yy) - max(sp1.df$y, na.rm=TRUE)))/2
241
+    ## yy <- df$y[-c(sp1, sp2)]
242
+    ## df$y[-c(sp1, sp2)] <- yy + ((min(sp2.df$y, na.rm=TRUE) - max(yy)) - (min(yy) - max(sp1.df$y, na.rm=TRUE)))/2
242 243
 
243 244
     anc <- getAncestor.df(df, node1)
244 245
     ii <- match(anc, df$node)