updates to def.funs

Author: Jordan S Read

R/abline.R

@@ -28,5 +28,5 @@ abline <- function(object, ...) {
 
 
 abline.gsplot <- function(object, ..., legend.name=NULL, side=c(1,2)){
-  set_window_args(object, fun.name='abline', ..., legend.name=legend.name, side=side, def.funs=graphics::abline)
+  set_window_args(object, fun.name='abline', ..., legend.name=legend.name, side=side, def.funs=c(graphics::abline, graphics::plot.xy))
 }

R/par_arguments.R

@@ -7,12 +7,12 @@ par_arguments <- function(arguments, def.funs){
     NULL
 }
 
-formal_arguments <- function(arguments, def.funs){
+formal_arguments <- function(arguments, def.funs, keep.names=NULL){
   if (length(def.funs) > 1)
-    formal_names <- unique(unlist(lapply(def.funs, function(x)names(formals(x)))))
+    formal.names <- unique(unlist(lapply(def.funs, function(x)names(formals(x)))))
   else 
-    formal_names <- names(formals(def.funs))
-  args = arguments[names(arguments) %in% formal_names]
+    formal.names <- names(formals(def.funs))
+  args = arguments[names(arguments) %in% formal.names | names(arguments) %in% keep.names]
   if (length(args) > 0)
     return(args)
   else 

R/set_args.R

@@ -26,7 +26,7 @@ set_window_args <- function(object, fun.name, ..., legend.name=NULL, side=c(1,2)
   else
     arguments = set_args(fun.name, package=package)
   e.fun = dots$e.fun
-  to.gsplot <- list(list(arguments = append(formal_arguments(arguments, def.funs), window_arguments(arguments, def.funs)),
+  to.gsplot <- list(list(arguments = append(formal_arguments(arguments, def.funs, names(config(fun.name))), window_arguments(arguments, def.funs)),
                          gs.config=list(legend.name = legend.name, side = side, par=par_arguments(arguments, def.funs)))) %>% 
     setNames(fun.name)
 

README.Rmd

@@ -38,7 +38,7 @@ demoPlot <- gsplot() %>%
   abline(b=1, a=0, legend.name="1:1") %>%
   axis(side=c(3,4), labels=FALSE) %>%
   legend(location="topleft",title="Awesome!") %>%
-  # grid() %>%
+  grid() %>%
   error_bar(x=1:3, y=c(3,1,2), y.high=c(0.5,0.25,1), y.low=0.1) %>%
   error_bar(x=1:3, y=c(3,1,2), x.low=.2, x.high=.2, col="red",lwd=3) %>%
   callouts(x=1, y=2.8, lwd=2, angle=250, labels="Weird data") %>%

README.md

@@ -33,7 +33,7 @@ demoPlot <- gsplot() %>%
   abline(b=1, a=0, legend.name="1:1") %>%
   axis(side=c(3,4), labels=FALSE) %>%
   legend(location="topleft",title="Awesome!") %>%
-  # grid() %>%
+  grid() %>%
   error_bar(x=1:3, y=c(3,1,2), y.high=c(0.5,0.25,1), y.low=0.1) %>%
   error_bar(x=1:3, y=c(3,1,2), x.low=.2, x.high=.2, col="red",lwd=3) %>%
   callouts(x=1, y=2.8, lwd=2, angle=250, labels="Weird data") %>%