@@ -40,7 +40,6 @@ export(collapse)

 export(decimal2Date)

 export(download.phylopic)

 export(expand)

-export(expand_xlim)

 export(facet_plot)

 export(flip)

 export(geom_aline)

@@ -127,6 +126,7 @@ export(theme_tree)

 export(theme_tree2)

 export(viewClade)

 export(write.jplace)

+export(xlim_expand)

 export(xlim_tree)

 exportClasses(apeBootstrap)

 exportClasses(beast)

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

 CHANGES IN VERSION 1.7.2

 ------------------------

- o expand_xlim for setting x axis limits of specific panel <2016-11-01, Tue>

-   + xlim_tree is now a specific case of expand_xlim(xlim, panel='Tree')

+ o xlim_expand for setting x axis limits of specific panel <2016-11-01, Tue>

+   + xlim_tree is now a specific case of xlim_expand(xlim, panel='Tree')

  o bug fixed of parsing tree text in beast file <2016-10-31, Mon>

    + https://github.com/GuangchuangYu/ggtree/issues/84

@@ -7,21 +7,21 @@

 ##' @export

 ##' @author guangchuang yu

 xlim_tree <- function(xlim) {

-    expand_xlim(xlim, panel='Tree')

+    xlim_expand(xlim, panel='Tree')

 }

 ##' expand x axis limits for specific panel

 ##'

 ##'

-##' @title expand_xlim

+##' @title xlim_expand

 ##' @param xlim xlim

 ##' @param panel panel

 ##' @return updated tree view

 ##' @importFrom ggplot2 geom_blank

 ##' @export

 ##' @author guangchuang yu

-expand_xlim <- function(xlim, panel) {

+xlim_expand <- function(xlim, panel) {

     dummy <- data.frame(x=xlim, .panel=panel)

     geom_blank(aes_(x=~x), dummy, inherit.aes = FALSE)

 }

similarity index 75%

rename from man/expand_xlim.Rd

rename to man/xlim_expand.Rd

@@ -1,10 +1,10 @@

 % Generated by roxygen2: do not edit by hand

 % Please edit documentation in R/xlim.R

-\name{expand_xlim}

-\alias{expand_xlim}

-\title{expand_xlim}

+\name{xlim_expand}

+\alias{xlim_expand}

+\title{xlim_expand}

 \usage{

-expand_xlim(xlim, panel)

+xlim_expand(xlim, panel)

 }

 \arguments{

 \item{xlim}{xlim}

new file mode 100644

@@ -0,0 +1,30 @@

+context("xlim_expand")

+

+test_that("dummy layer to set x axis limits of Tree panel", {

+    set.seed(2016-10-31)

+    tr <- rtree(50)

+    tr$tip.label <- paste(tr$tip.label, tr$tip.label, sep="_")

+    p <- ggtree(tr) + geom_tiplab(align=TRUE) + theme_tree2()

+

+    d <- data.frame(id = tr$tip.label, v= rnorm(50))

+

+    p2 <- facet_plot(p + xlim_tree(c(NA, 6)), geom=geom_point, data=d, mapping=aes(x=v), panel='dot')

+

+    expect_true(is.ggplot(p2)) # should plot appropriately

+})

+

+

+

+test_that("dummy layer to set x axis limits of data panel", {

+    set.seed(2016-10-31)

+    tr <- rtree(50)

+    tr$tip.label <- paste(tr$tip.label, tr$tip.label, sep="_")

+    p <- ggtree(tr) + geom_tiplab(align=TRUE) + theme_tree2()

+

+    d <- data.frame(id = tr$tip.label, v= rnorm(50))

+

+    p2 <- facet_plot(p, geom=geom_point, data=d, mapping=aes(x=v), panel='dot') + xlim_expand(c(-4, 4), 'dot')

+

+    expect_true(is.ggplot(p2)) # should plot appropriately

+})

+

deleted file mode 100644

@@ -1,14 +0,0 @@

-context("xlim_tree")

-

-test_that("dummy layer to set x axis limits of Tree panel", {

-    set.seed(2016-10-31)

-    tr <- rtree(50)

-    tr$tip.label <- paste(tr$tip.label, tr$tip.label, sep="_")

-    p <- ggtree(tr) + geom_tiplab(align=TRUE) + theme_tree2()

-

-    d <- data.frame(id = tr$tip.label, v= rnorm(50))

-

-    p2 <- facet_plot(p + xlim_tree(c(NA, 6)), geom=geom_point, data=d, mapping=aes(x=v), panel='dot') + ggtitle('*set_tree_xlim* only change x axis limits of *Tree* panel')

-

-    expect_true(is.ggplot(p2)) # should plot appropriately

-})