more updates for set_window_args()

Author: Jordan S Read

R/polygon.R

@@ -35,11 +35,5 @@ polygon <- function(object, ...) {
 }
 
 polygon.gsplot <- function(object, ..., legend.name=NULL, side=c(1,2)){
-  
-  fun.name <- "polygon"
-  to.gsplot <- list(list(arguments = set_args(fun.name, ...), 
-                         gs.config=list(legend.name = legend.name, side = side))) %>% 
-    setNames(fun.name)
-  
-  return(gsplot(append(object, to.gsplot)))
+  set_window_args(object, fun.name="polygon", ..., legend.name=legend.name, side=side)
 }

R/rect.R

@@ -45,12 +45,6 @@ rect <- function(object, ...) {
 }
 
 rect.gsplot <- function(object, ..., legend.name=NULL, side=c(1,2)){
-  
-  fun.name <- "rect"
-  to.gsplot <- list(list(arguments = set_args(fun.name, ...), 
-                         gs.config=list(legend.name = legend.name, side = side))) %>% 
-    setNames(fun.name)
-  
-  return(gsplot(append(object, to.gsplot)))
+  set_window_args(object, fun.name="rect", ..., legend.name=legend.name, side=side)
 }
 

R/segments.R

@@ -28,15 +28,6 @@ segments <- function(object, ...) {
 }
 
 
-segments.gsplot <- function(object, x0, y0, x1=x0, y1=y0, ..., legend.name=NULL, side=c(1,2)){
-  current_list <- config("segments")
-  arguments <- append(list(x0=x0, y0=y0, x1=x1, y1=y1), c(...))
-  
-  indicesToAdd <- !(names(current_list) %in% names(arguments))
-  arguments <- append(arguments, current_list[indicesToAdd])
-  
-  object <- append(object,  list(segments = list(arguments = arguments, 
-                                             gs.config=list(legend.name = legend.name, 
-                                                            side = side))))
-  return(gsplot(object))
+segments.gsplot <- function(object, ..., legend.name=NULL, side=c(1,2)){
+  set_window_args(object, fun.name="segments", ..., legend.name=legend.name, side=side)
 }

R/set_args.R

@@ -21,8 +21,11 @@ set_args <- function(fun.name, ..., package='graphics'){
 set_window_args <- function(object, fun.name, ..., legend.name=NULL, side=c(1,2), package='graphics'){
   dots = separate_args(...)
   args = dots$args
+  if (!is.null(args))
+    arguments = set_args(fun.name, lazy_eval(args), package=package)
+  else
+    arguments = set_args(fun.name, package=package)
   e.fun = dots$e.fun
-  arguments = set_args(fun.name, lazy_eval(args), package=package)
   to.gsplot <- list(list(arguments = arguments, gs.config=list(legend.name = legend.name, side = side))) %>% 
     setNames(fun.name)
 

R/symbols.R

@@ -41,12 +41,6 @@ symbols <- function(object, ...) {
 }
 
 symbols.gsplot <- function(object, ..., legend.name=NULL, side=c(1,2)){
-  
-  fun.name <- "symbols"
-  to.gsplot <- list(list(arguments = set_args(fun.name, ...), 
-                         gs.config=list(legend.name = legend.name, side = side))) %>% 
-    setNames(fun.name)
-  
-  return(gsplot(append(object, to.gsplot)))
+  set_window_args(object, fun.name="symbols", ..., legend.name=legend.name, side=side)
 }
 

R/text.R

@@ -43,9 +43,5 @@ text <- function(object, ...) {
 
 
 text.gsplot <- function(object, ..., legend.name=NULL, side=c(1,2)){
-  fun.name <- "text"
-  to.gsplot <- list(list(arguments = set_args(fun.name, ...), 
-                         gs.config=list(legend.name = legend.name, side = side))) %>% 
-    setNames(fun.name)
-  return(gsplot(append(object, to.gsplot)))
+  set_window_args(object, fun.name='text', ..., legend.name=legend.name, side=side)
 }

R/title.R

@@ -29,9 +29,5 @@ title <- function(object, ...) {
 
 
 title.gsplot <- function(object, ..., legend.name=NULL, side=c(1,2)){
-  fun.name <- "title"
-  to.gsplot <- list(list(arguments = set_args(fun.name, ...), 
-                         gs.config=list(legend.name = legend.name, side = side))) %>% 
-    setNames(fun.name)
-  return(gsplot(append(object, to.gsplot)))
+  set_window_args(object, fun.name='title', ..., legend.name=legend.name, side=side)
 }