From bd72384dccfbe607e78b11203bc41ed1bbabaae9 Mon Sep 17 00:00:00 2001 From: Bob Rudis Date: Sun, 20 Mar 2016 22:11:36 -0400 Subject: [PATCH] travis --- NAMESPACE | 1 - R/geom_table.r | 14 +++++++------- R/stateface.r | 3 +++ R/zzz.r | 2 -- man/geom_table.Rd | 17 ----------------- man/ggalt-ggproto.Rd | 3 +-- 6 files changed, 11 insertions(+), 29 deletions(-) delete mode 100644 man/geom_table.Rd diff --git a/NAMESPACE b/NAMESPACE index 3ddaf8f..0930866 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -11,7 +11,6 @@ export(GeomBkde) export(GeomBkde2d) export(GeomEncircle) export(GeomStateface) -export(GeomTable) export(GeomXSpline2) export(GeomXspline) export(Kb) diff --git a/R/geom_table.r b/R/geom_table.r index 7b6f022..0c93fa2 100644 --- a/R/geom_table.r +++ b/R/geom_table.r @@ -1,7 +1,7 @@ -#' @rdname ggalt-ggproto -#' @format NULL -#' @usage NULL -#' @export +# @rdname ggalt-ggproto +# @format NULL +# @usage NULL +# @export GeomTable <- ggproto( "GeomTable", Geom, @@ -75,9 +75,9 @@ facet_id <- local({ } }) -#' Add a table to a ggplot2 plot -#' -#' @author Jan Schulz +# Add a table to a ggplot2 plot +# +# @author Jan Schulz geom_table <- function(mapping = NULL, data = NULL, stat = "identity", position = "identity", na.rm = FALSE, show.legend = NA, inherit.aes = TRUE, ...) { diff --git a/R/stateface.r b/R/stateface.r index 6713703..cf206ea 100644 --- a/R/stateface.r +++ b/R/stateface.r @@ -136,6 +136,9 @@ GeomStateface <- ggproto("GeomStateface", Geom, draw_panel = function(data, panel_scales, coord, parse = FALSE, na.rm = FALSE, check_overlap = FALSE) { + + load_stateface + lab <- data$label if (max(sapply(lab, nchar)) == 2) { diff --git a/R/zzz.r b/R/zzz.r index 7961a08..ee7eda7 100644 --- a/R/zzz.r +++ b/R/zzz.r @@ -2,8 +2,6 @@ if (!interactive()) return() - load_stateface() - packageStartupMessage(paste0("ggalt is under *active* development. ", "See https://github.com/hrbrmstr/ggalt for changes")) diff --git a/man/geom_table.Rd b/man/geom_table.Rd deleted file mode 100644 index 70ec1e5..0000000 --- a/man/geom_table.Rd +++ /dev/null @@ -1,17 +0,0 @@ -% Generated by roxygen2: do not edit by hand -% Please edit documentation in R/geom_table.r -\name{geom_table} -\alias{geom_table} -\title{Add a table to a ggplot2 plot} -\usage{ -geom_table(mapping = NULL, data = NULL, stat = "identity", - position = "identity", na.rm = FALSE, show.legend = NA, - inherit.aes = TRUE, ...) -} -\description{ -Add a table to a ggplot2 plot -} -\author{ -Jan Schulz -} - diff --git a/man/ggalt-ggproto.Rd b/man/ggalt-ggproto.Rd index cd6a3be..e209d56 100644 --- a/man/ggalt-ggproto.Rd +++ b/man/ggalt-ggproto.Rd @@ -1,5 +1,5 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in R/coord_proj.r, R/geom_ash.r, R/geom_bkde.r, R/geom_bkde2d.r, R/geom_encircle.r, R/geom_table.r, R/geom_xspline.r, R/geom_xspline2.r, R/stateface.r +% Please edit documentation in R/coord_proj.r, R/geom_ash.r, R/geom_bkde.r, R/geom_bkde2d.r, R/geom_encircle.r, R/geom_xspline.r, R/geom_xspline2.r, R/stateface.r \docType{data} \name{CoordProj} \alias{CoordProj} @@ -7,7 +7,6 @@ \alias{GeomBkde2d} \alias{GeomEncircle} \alias{GeomStateface} -\alias{GeomTable} \alias{GeomXSpline2} \alias{GeomXspline} \alias{StatAsh}