@@ -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.15.5

+Version: 1.15.6

 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")),

@@ -36,6 +36,7 @@ Imports:

 Suggests:

     emojifont,

     ggimage,

+    ggplotify,

     knitr,

     prettydoc,

     rmarkdown,

@@ -30,6 +30,7 @@ export(decimal2Date)

 export(expand)

 export(facet_labeller)

 export(facet_plot)

+export(facet_widths)

 export(flip)

 export(fortify)

 export(geom_aline)

@@ -166,6 +167,7 @@ importFrom(ggplot2,geom_tile)

 importFrom(ggplot2,ggplot)

 importFrom(ggplot2,ggplotGrob)

 importFrom(ggplot2,ggplot_build)

+importFrom(ggplot2,ggplot_gtable)

 importFrom(ggplot2,ggproto)

 importFrom(ggplot2,ggsave)

 importFrom(ggplot2,guide_legend)

@@ -1,3 +1,8 @@

+# ggtree 1.15.6

+

++ `facet_widths` function to set relative widths of facet panels (2019-01-28, Mon)

+  - the output is `ggplotify::as.ggplot(grid_object)`, so it is not the original `ggtree` object.

+

 # ggtree 1.15.5

 + bug fixed of `theme_tree2` (2019-01-14, Mon)

@@ -25,6 +25,19 @@ facet_plot <- function(p, panel, data, geom, mapping=NULL, ...) {

     p + geom(data=df, mapping=mapping, ...)

 }

+

+##' @importFrom ggplot2 facet_grid

+add_panel <- function(p, panel) {

+    df <- p$data

+    if (is.null(df[[".panel"]])) {

+        df[[".panel"]] <- factor("Tree")

+    }

+    levels(df$.panel) %<>% c(., panel)

+    p$data <- df

+    p + facet_grid(.~.panel, scales="free_x")

+}

+

+

 ##' label facet_plot output

 ##'

 ##' 

@@ -36,23 +49,52 @@ facet_plot <- function(p, panel, data, geom, mapping=NULL, ...) {

 ##' @export

 ##' @author Guangchuang Yu

 facet_labeller <- function(p, label) {

+    ## .panel <- panel_col_var(p)

+    ## lbs <- panel_col_levels(p)

     lbs  <-  levels(p$data$.panel)

     names(lbs)  <-  lbs

     label <- label[names(label) %in% lbs]

     lbs[names(label)]  <-  label

-    p + facet_grid( . ~ .panel, scales="free_x",

-               labeller = labeller(.panel = lbs))

+    ## ff <- as.formula(paste(" . ~ ", .panel))

+    p + facet_grid(. ~ .panel, scales="free_x",

+                   labeller = labeller(.panel = lbs))

 }

-##' @importFrom ggplot2 facet_grid

-add_panel <- function(p, panel) {

-    df <- p$data

-    if (is.null(df[[".panel"]])) {

-        df[[".panel"]] <- factor("Tree")

+

+##' set relative widths (for column only) of facet plots

+##'

+##' 

+##' @title facet_widths

+##' @param p ggplot or ggtree object

+##' @param widths relative widths of facet panels

+##' @return ggplot object by redrawing the figure (not a modified version of input object)

+##' @author Guangchuang Yu

+##' @export

+##' @importFrom ggplot2 ggplot_gtable

+facet_widths <- function(p, widths) {

+    if (!is.null(names(widths))) {

+        ## if (is.ggtree(p) && !is.null(names(widths))) {

+        ## .panel <- levels(p$data$.panel)

+        .panel <- panel_col_levels(p)

+        w <- rep(1, length=length(.panel))

+        names(w) <- .panel

+        w[names(widths)] <- widths

+        widths <- w

     }

-    levels(df$.panel) %<>% c(., panel)

-    p$data <- df

-    p + facet_grid(.~.panel, scales="free_x")

+    gt  <- ggplot_gtable(ggplot_build(p))

+    for(i in seq_along(widths)) {

+        j <- gt$layout$l[grep(paste0('panel-', i), gt$layout$name)]

+        gt$widths[j] = widths[i] * gt$widths[j]

+    }

+    return(ggplotify::as.ggplot(gt))

 }

+panel_col_var <- function(p) {

+    m <- p$facet$params$cols[[1]]

+    rlang::quo_text(m)

+}

+

+panel_col_levels <- function(p) {

+    levels(p$data[[panel_col_var(p)]])

+}

new file mode 100644

@@ -0,0 +1,22 @@

+% Generated by roxygen2: do not edit by hand

+% Please edit documentation in R/facet_plot.R

+\name{facet_widths}

+\alias{facet_widths}

+\title{facet_widths}

+\usage{

+facet_widths(p, widths)

+}

+\arguments{

+\item{p}{ggplot or ggtree object}

+

+\item{widths}{relative widths of facet panels}

+}

+\value{

+ggplot object by redrawing the figure (not a modified version of input object)

+}

+\description{

+set relative widths (for column only) of facet plots

+}

+\author{

+Guangchuang Yu

+}