Merge pull request #289 from jread-usgs/rename_view

Rename view

Author: ldecicco-USGS

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: gsplot
 Type: Package
 Title: Geological Survey Plotting
-Version: 0.4.4
-Date: 2015-09-16
+Version: 0.5.0
+Date: 2015-12-05
 Authors@R: c( person("Jordan", "Read", role = "aut",
     email = "[email protected]"),
     person("Laura", "DeCicco", role = c("aut","cre"),

R/access-gsplot.R

@@ -82,7 +82,7 @@ logged.gsplot <- function(object, side=NULL){
 #' @return data frame with one row per view. Each view has an x side, y side, the log command, and the view index.
 #' @export
 view_info <- function(object){
-  j <- which(names(object) %in% 'view')
+  j <- grep('view.', names(object))
   viewSides <- sapply(j, function(x) object[[x]][['window']][['side']])
   viewLogs <- sapply(j, function(x) object[[x]][['window']][['log']])
   viewInfo <- data.frame(t(rbind(viewSides, viewLogs, j)), stringsAsFactors = FALSE)

R/calc_views.R

@@ -25,11 +25,13 @@ calc_views <- function(gsplot){
 }
 
 views <- function(gsplot){
-  gsplot[names(gsplot) %in% 'view']
+  gsplot[grep('view.', names(gsplot))]
 }
 
 non_views <- function(gsplot){
-  gsplot[!names(gsplot) %in% 'view']
+  non.views <- gsplot
+  non.views[grep('view.', names(non.views))] <- NULL
+  return(non.views)
 }
 
 group_views <- function(gsplot){
@@ -50,7 +52,9 @@ group_views <- function(gsplot){
       views[[v.i]] <- append(views[[v.i]], to_draw)
       views[[v.i]][['window']][['par']] <- append_replace(views[[v.i]][['window']][['par']], tail.gs[['gs.config']][['par']])
     } else{
-      views <- append(views, list(view = append(to_draw, list(window=list(side=add_sides,par=tail.gs[['gs.config']][['par']])))))
+      new.view <- list(append(to_draw, list(window=list(side=add_sides,par=tail.gs[['gs.config']][['par']])))) %>% 
+        setNames(sprintf('view.%s.%s',add_sides[1],add_sides[2]))
+      views <- append(views, new.view)
     }
   } else {
     # // if field isn't associated with a side(s), it is moved up to top level (e.g., legend)
@@ -88,7 +92,7 @@ which_reals <- function(values, na.value){
 
 }
 set_view_window <- function(views, param, na.value=NA, remove=TRUE, ignore=NULL){
-  view_i <- which(names(views) %in% "view")
+  view_i <- grep('view.', names(views))
   for (i in view_i){
     values <- lapply(views[[i]][!names(views[[i]]) %in% ignore], function(x) strip_pts(x, param))
     val.i <- which_reals(values, na.value)
@@ -194,15 +198,15 @@ views_with_side <- function(views, side){
   if(length(side) > 1)
     stop('side can only be length of 1')
   with.side = lapply(views, function(x) any(x[['window']][['side']] %in% side))
-  view.match = unname(unlist(with.side[names(with.side) == 'view']))
+  view.match = unname(unlist(with.side[grep('view.', names(views))]))
   if (is.null(view.match) || !any(view.match))
     return(NULL)
   else
     return(which(view.match))
 }
 
 get_view_side <- function(views, view_i, param){
-  i = which(names(views) %in% 'view')[view_i]
+  i = grep('view.', names(views))[view_i]
   sides <- views[[i]][['window']][['side']]
   if (param=='y')
     return(sides[which(sides %% 2 == 0)])
@@ -212,9 +216,9 @@ get_view_side <- function(views, view_i, param){
     stop('view side undefined for ',param)
 }
 
-summarize_args <- function(views, param, na.value,ignore='gs.config'){
+summarize_args <- function(views, param, na.value, ignore='gs.config'){
 
-  view_i <- which(names(views) %in% "view")
+  view_i <- grep('view.', names(views))
   values <- list()
   for (i in view_i){
     x <- views[[i]][!names(views[[i]]) %in% ignore]
@@ -256,7 +260,7 @@ set_window <- function(list){
   listOut <- list
   pars <- list[['par']]
 
-  for(j in which(names(list) == "view")){
+  for(j in grep('view.', names(list))){
 
     window <- list[[j]][['window']]
     plots <- list[[j]]

R/callouts.R

@@ -38,10 +38,11 @@ callouts.gsplot <- function(object, ..., side=c(1,2)){
 #' @param labels text to be added to callout
 #' @param length relative (percentage of window width and height) distance for callout
 #' @param angle callout line angle
+#' @param cex passed to text for font size formatting
 #' 
 #' @rdname callouts
 #' @export
-callouts.default <- function(x, y=NULL, labels=NA, length=0.1, angle='auto', cex=1, ...){
+callouts.default <- function(x, y=NULL, labels=NA, length=0.1, angle='auto', cex=par()$cex, ...){
 
   if (is.null(y)) {
     warning("y=NULL not currently supported in callouts.default")

R/points.R

@@ -27,8 +27,8 @@
 #' 
 #' gs <- gsplot() %>% 
 #'          points(x=1:5, y=1:5, xlim=c(0,10), ylim=c(0,10), 
-#'                callouts=list(labels=c(rep(NA, 4), "oh")), 
-#'                error_bar=list(y.high=1))
+#'                callouts(labels=c(rep(NA, 4), "oh")), 
+#'                error_bar(y.high=1))
 #' gs
 #' 
 #' gs2 <- gsplot() %>%