Merge pull request #293 from jread-usgs/master

changes per @jiwalker-usgs comments from last PR

Author: Jordan S Read

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: gsplot
 Type: Package
 Title: Geological Survey Plotting
-Version: 0.5.0
-Date: 2015-12-05
+Version: 0.5.1
+Date: 2015-12-13
 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 <- grep('view.', names(object))
+  j <- which_views(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

@@ -24,13 +24,17 @@ calc_views <- function(gsplot){
   return(views)
 }
 
+which_views <- function(gsplot){
+  grep('view.', names(gsplot))
+}
+
 views <- function(gsplot){
-  gsplot[grep('view.', names(gsplot))]
+  gsplot[which_views(gsplot)]
 }
 
 non_views <- function(gsplot){
   non.views <- gsplot
-  non.views[grep('view.', names(non.views))] <- NULL
+  non.views[which_views(non.views)] <- NULL
   return(non.views)
 }
 
@@ -92,7 +96,7 @@ which_reals <- function(values, na.value){
 
 }
 set_view_window <- function(views, param, na.value=NA, remove=TRUE, ignore=NULL){
-  view_i <- grep('view.', names(views))
+  view_i <- which_views(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)
@@ -198,15 +202,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[grep('view.', names(views))]))
+  view.match = unname(unlist(with.side[which_views(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 = grep('view.', names(views))[view_i]
+  i = which_views(views)[view_i]
   sides <- views[[i]][['window']][['side']]
   if (param=='y')
     return(sides[which(sides %% 2 == 0)])
@@ -218,7 +222,7 @@ get_view_side <- function(views, view_i, param){
 
 summarize_args <- function(views, param, na.value, ignore='gs.config'){
 
-  view_i <- grep('view.', names(views))
+  view_i <- which_views(views)
   values <- list()
   for (i in view_i){
     x <- views[[i]][!names(views[[i]]) %in% ignore]
@@ -260,7 +264,7 @@ set_window <- function(list){
   listOut <- list
   pars <- list[['par']]
 
-  for(j in grep('view.', names(list))){
+  for(j in which_views(list)){
 
     window <- list[[j]][['window']]
     plots <- list[[j]]