Merge pull request #369 from jread-usgs/master

frame.plot

Author: Lindsay Carr

R/gather_function_info.R

@@ -28,6 +28,7 @@ gather_function_info <- function(object, fun.name, ..., legend.name, side){
 
   object <- apply_extracted_args(object, extracted.args, side=side) 
 
+  object <- modify_config(object, option.args)
   object <- modify_side(object, c(call.args, option.args), side=side)
   object <- modify_side_par(object, option.args, side=side)
   object <- modify_view_par(object, option.args, side=side)

R/gsplot-class.R

@@ -14,7 +14,7 @@ gsplot <- function(x = NULL, ...) UseMethod("gsplot")
 #' @rdname gsplot
 #' @export
 gsplot.default <- function(...) {
-  object <- gsplot(list())
+  object <- gsplot(list(global=list('config'=list(frame.plot=TRUE))))
   object <- add_new_par(object, 'global')
   if (length(list(...)) > 0){
     object <- par(object, ...)

R/modify_config.R

@@ -0,0 +1,13 @@
+
+#' modify the global config field of the gsplot object
+#' 
+#' @param object a gsplot object
+#' @param option.args a list of function calls
+#' @return a modified object with the global config field changed
+#' @keywords internal
+modify_config <- function(object, option.args, field='global'){
+  config.names <- names(object[[field]]$config)
+  arguments <- option.args[names(option.args) %in% config.names]
+  object[[field]]$config <- append_replace(object[[field]]$config, arguments)
+  return(object)
+}

R/print.R

@@ -42,11 +42,12 @@ print.gsplot <- function(x, ...){
   }
 
   par(x$global$par)
+  bgCol(x$global$bgCol)
+  if (x$global$config$frame.plot){
+    box()
+  }
+  title(x$global$title)
 
-  bg.arg <- views$global$bgCol
-  title.arg <- views$global$title
-  bgCol(bg.arg)
-  title(title.arg)
   view.info <- view_info(views)
   side.names <- side_names(views)