From 4f45aa4138b02999e6ae9bf8045003be83dee9c4 Mon Sep 17 00:00:00 2001 From: hrbrmstr Date: Wed, 27 Aug 2014 09:29:02 -0400 Subject: [PATCH] CRAN submission --- .Rbuildignore | 13 +++++++------ R/statebins.R | 8 ++++---- man/statebins.Rd | 4 ++-- man/statebins_continuous.Rd | 4 ++-- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.Rbuildignore b/.Rbuildignore index b98f5b0..0f03e30 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -1,9 +1,10 @@ ^.*\.Rproj$ ^\.Rproj\.user$ -^_README.Rmd$ -^_README.md$ -^NEWS.md$ +^.*md$ ^\.travis\.yml$ -^README.md$ -^_README_files/* -^tmp/*$ \ No newline at end of file +^.*README_files$ +^.*README_files/$ +^.*README_files/.*$ +^tmp$ +^tmp/$ +^tmp/.*$ \ No newline at end of file diff --git a/R/statebins.R b/R/statebins.R index c038804..ac14b87 100644 --- a/R/statebins.R +++ b/R/statebins.R @@ -64,7 +64,7 @@ invert <- function(hexColor, darkColor="black", lightColor="white") { #' @param state_data data frame of states and values to plot #' @param state_col column name in \code{state_data} that has the states. no duplicates and can be names (e.g. "\code{Maine}") or abbreviatons (e.g. "\code{ME}") #' @param value_col column name in \code{state_data} that holds the values to be plotted -#' @param text_color default "\code{white}" +#' @param text_color default "\code{black}" #' @param font_size font size (default = \code{3}) #' @param state_border_col default "\code{white}" - this creates the "spaces" between boxes #' @param breaks a single number (greater than or equal to 2) giving the number of intervals into which data values are to be cut. @@ -84,7 +84,7 @@ invert <- function(hexColor, darkColor="black", lightColor="white") { #' legend_title = "Assault", legend_position="bottom") #' } statebins <- function(state_data, state_col="state", value_col="value", - text_color="white", font_size=3, + text_color="black", font_size=3, state_border_col="white", breaks=5, labels=1:5, legend_title="Legend", legend_position="top", brewer_pal="PuBu", plot_title="", title_position="bottom") { @@ -164,7 +164,7 @@ statebins <- function(state_data, state_col="state", value_col="value", #' @param state_data data frame of states and values to plot #' @param state_col column name in \code{state_data} that has the states. no duplicates and can be names (e.g. "\code{Maine}") or abbreviatons (e.g. "\code{ME}") #' @param value_col column name in \code{state_data} that holds the values to be plotted -#' @param text_color default "\code{white}" +#' @param text_color default "\code{black}" #' @param font_size font size (default = \code{3}) #' @param state_border_col default "\code{white}" - this creates the "spaces" between boxes #' @param legend_title title for the legend @@ -182,7 +182,7 @@ statebins <- function(state_data, state_col="state", value_col="value", #' legend_title = "Murder", legend_position="bottom") #' } statebins_continuous <- function(state_data, state_col="state", value_col="value", - text_color="white", font_size=3, + text_color="black", font_size=3, state_border_col="white", legend_title="Legend", legend_position="top", brewer_pal="PuBu", plot_title="", title_position="bottom") { diff --git a/man/statebins.Rd b/man/statebins.Rd index 2e1b484..ba12170 100644 --- a/man/statebins.Rd +++ b/man/statebins.Rd @@ -4,7 +4,7 @@ \title{Create a new ggplot-based "statebin" chart for USA states (discrete scale)} \usage{ statebins(state_data, state_col = "state", value_col = "value", - text_color = "white", font_size = 3, state_border_col = "white", + text_color = "black", font_size = 3, state_border_col = "white", breaks = 5, labels = 1:5, legend_title = "Legend", legend_position = "top", brewer_pal = "PuBu", plot_title = "", title_position = "bottom") @@ -16,7 +16,7 @@ statebins(state_data, state_col = "state", value_col = "value", \item{value_col}{column name in \code{state_data} that holds the values to be plotted} -\item{text_color}{default "\code{white}"} +\item{text_color}{default "\code{black}"} \item{font_size}{font size (default = \code{3})} diff --git a/man/statebins_continuous.Rd b/man/statebins_continuous.Rd index a17435f..c41653a 100644 --- a/man/statebins_continuous.Rd +++ b/man/statebins_continuous.Rd @@ -4,7 +4,7 @@ \title{Create a new ggplot-based "statebin" chart for USA states (continuous scale)} \usage{ statebins_continuous(state_data, state_col = "state", value_col = "value", - text_color = "white", font_size = 3, state_border_col = "white", + text_color = "black", font_size = 3, state_border_col = "white", legend_title = "Legend", legend_position = "top", brewer_pal = "PuBu", plot_title = "", title_position = "bottom") } @@ -15,7 +15,7 @@ statebins_continuous(state_data, state_col = "state", value_col = "value", \item{value_col}{column name in \code{state_data} that holds the values to be plotted} -\item{text_color}{default "\code{white}"} +\item{text_color}{default "\code{black}"} \item{font_size}{font size (default = \code{3})}