@@ -2,7 +2,7 @@ Package: ggtree

 Type: Package

 Title: an R package for visualization and annotation of phylogenetic trees with

     their covariates and other associated data

-Version: 1.13.1.9001

+Version: 1.13.1.9002

 Authors@R: c(

 	   person("Guangchuang", "Yu",     email = "guangchuangyu@gmail.com", role = c("aut", "cre", "cph"), comment = c(ORCID = "0000-0002-6485-8781")),

 	   person("Tommy Tsan-Yuk", "Lam", email = "tylam.tommy@gmail.com",   role = c("aut", "ths")),

@@ -41,6 +41,7 @@ export(geom_label)

 export(geom_label2)

 export(geom_motif)

 export(geom_nodelab)

+export(geom_nodelab2)

 export(geom_nodepoint)

 export(geom_point)

 export(geom_point2)

@@ -1,5 +1,7 @@

-# ggtree 1.13.1.9001

+# ggtree 1.13.1.9002

++ `geom_nodelab2` for circular layout (2018-07-03, Tue)

+  - <https://groups.google.com/d/msgid/bioc-ggtree/cbe5e1e3-99c4-481d-8523-d5b50cf0460b%40googlegroups.com>

 + re-export `ggplot2::fortify`

   - <https://groups.google.com/d/msgid/bioc-ggtree/bf7a9b3c-9a8f-4d8d-a782-1b467fba38bc%40googlegroups.com>

@@ -10,7 +10,7 @@

 ##' @param ... additional parameters

 ##' @return geom layer

 ##' @export

-##' @author guangchuang yu

+##' @author Guangchuang Yu

 geom_nodelab <- function(mapping = NULL, nudge_x = 0, nudge_y = 0, geom = "text", hjust = 0.5, ...) {

     self_mapping <- aes_(subset = ~!isTip)

     if (is.null(mapping)) {

@@ -21,3 +21,32 @@ geom_nodelab <- function(mapping = NULL, nudge_x = 0, nudge_y = 0, geom = "text"

     geom_tiplab(mapping, offset = nudge_x, nudge_y = nudge_y, geom = geom, hjust = hjust, ...)

 }

+

+##' add node label for circular layout

+##'

+##'

+##' @title @geom_nodelab2

+##' @inheritParams geom_nodelab

+##' @return node label layer

+##' @export

+##' @author Guangchuang Yu

+geom_nodelab2 <- function(mapping = NULL, nudge_x = 0, nudge_y = 0, geom = "text", hjust = 0.5, ...) {

+    angle <- isTip <- node <- NULL

+    m1 <- aes(subset=(!isTip & (angle < 90 | angle > 270)), angle=angle, node = node)

+    m2 <- aes(subset=(!isTip & (angle >= 90 & angle <=270)), angle=angle+180, node = node)

+

+    if (!is.null(mapping)) {

+        if (!is.null(mapping$subset)) {

+            m1 <- aes_string(angle = "angle", node = "node",

+                             subset = paste0(as.expression(get_aes_var(mapping, "subset")), '& (!isTip & (angle < 90 | angle > 270))'))

+            m2 <- aes_string(angle = "angle+180", node = "node",

+                             subset = paste0(as.expression(get_aes_var(mapping, "subset")), '& (!isTip & (angle >= 90 & angle <= 270))'))

+        }

+        m1 <- modifyList(mapping, m1)

+        m2 <- modifyList(mapping, m2)

+    }

+

+    list(geom_nodelab(m1, hjust=hjust, nudge_x = nudge_x, nudge_y = nudge_y, geom = geom, ...),

+         geom_nodelab(m2, hjust=1-hjust, nudge_x = nudge_x, nudge_y = nudge_y, geom = geom, ...)

+         )

+}

@@ -27,5 +27,5 @@ geom layer

 add node label layer

 }

 \author{

-guangchuang yu

+Guangchuang Yu

 }

new file mode 100644

@@ -0,0 +1,31 @@

+% Generated by roxygen2: do not edit by hand

+% Please edit documentation in R/geom_nodelab.R

+\name{geom_nodelab2}

+\alias{geom_nodelab2}

+\title{@geom_nodelab2}

+\usage{

+geom_nodelab2(mapping = NULL, nudge_x = 0, nudge_y = 0, geom = "text",

+  hjust = 0.5, ...)

+}

+\arguments{

+\item{mapping}{aes mapping}

+

+\item{nudge_x}{horizontal adjustment to nudge label}

+

+\item{nudge_y}{vertical adjustment to nudge label}

+

+\item{geom}{one of 'text', 'label', 'image' and 'phylopic'}

+

+\item{hjust}{horizontal alignment, one of 0, 0.5 or 1}

+

+\item{...}{additional parameters}

+}

+\value{

+node label layer

+}

+\description{

+add node label for circular layout

+}

+\author{

+Guangchuang Yu

+}