Merge pull request #345 from jread-usgs/master

updates after review

Author: Lindsay Carr

R/callouts.R

@@ -40,11 +40,13 @@ 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
+#' @param cex passed to \code{\link[graphics]{text}} for font size formatting
+#' @param lwd passed to \code{\link[graphics]{arrows}} for line weights
+#' @param lty passed to \code{\link[graphics]{arrows}} for line type
 #' 
 #' @rdname callouts
 #' @export
-callouts.default <- function(x, y=NULL, labels=NA, length=0.1, angle='auto', cex=par()$cex, ...){
+callouts.default <- function(x, y=NULL, labels=NA, length=0.1, angle='auto', cex=par()$cex, lwd=par()$lwd, lty=par()$lty, ...){
 
   if (is.null(y)) {
     warning("y=NULL not currently supported in callouts.default")

R/error_bars.R

@@ -109,7 +109,7 @@ error_bar.gsplot <- function(object, x, y, y.high=0, y.low=0, x.high=0, x.low=0,
 #' @param \dots additional arguments passed to \code{\link[graphics]{arrows}}
 #' @export
 #' @keywords internal
-error_bar.default <- function(x, y, y.high, y.low, x.high, x.low, epsilon=0.1, ...){
+error_bar.default <- function(x, y, y.high, y.low, x.high, x.low, epsilon=0.1, lwd, lty, col, ...){
   warning("this function doesn't do anything")
   return()
 }

R/print.R

@@ -40,7 +40,7 @@ print.gsplot <- function(x, ...){
     on.exit(dev.flush())
     plot.new()
   }
-  
+
   par(x$global$par)
   i.axis <- which(names(views) %in% 'axis')
   defined.sides <- sapply(i.axis, function(x) views[[x]][['arguments']][['side']])
@@ -53,19 +53,20 @@ print.gsplot <- function(x, ...){
 
   for (side.name in side.names){
     side <- as.side(side.name)
-    par(x[[side.name]]$par)
+    old.par <- par(x[[side.name]]$par)
     set_frame(views, side)
     if(!side %in% defined.sides){ 
       if(x[[side.name]][['axes']]){
-        Axis(side=side,x=lim(views, side))
+        do.call('Axis', append(list(side=side,x=lim(views, side)), config('axis')))
       }
     } else {
       axis <- i.axis[which(defined.sides == side)]
       draw_axis(views, index.axis=axis)
     }
-    if(exists('ann', x[[side.name]]$par) && x[[side.name]]$par$ann){
+    if(par('ann')){
       mtext(text=label(views, side), side=side, line = 2, las=config("mtext")$las)
     }
+    par(old.par)
   }
 
   for (view.name in view_names(views)){
@@ -106,10 +107,11 @@ print.view <- function(x, ...){
   # if(window$frame.plot){
   #   box()
   # } 
-  par(x[['par']])
+  old.par <- par(x[['par']])
 
   # -- call functions -- 
   to_gsplot(lapply(plots, function(x) x[!(names(x) %in% c('legend.name'))]))
+  par(old.par)
 }
 
 to_gsplot <- function(x){