Merge pull request #420 from lindsaycarr/indexLost

indexing allowed for points and lines

Author: Lindsay Carr

R/function_args.R

@@ -45,6 +45,13 @@ function_args <- function(package, name, object, ..., use.default=paste0(name,'.
     names(params)[which(names(params) == "")] <- arg.names[seq_len(sum(names(params) == ""))]
   }
 
+  if(name %in% c('points', 'lines')){
+    if(!is.null(params[['x']]) & is.null(params[['y']])){
+      xy_args <- list(x = seq_along(params[['x']]),
+                      y = params[['x']])
+      params <- append_replace(params, xy_args)
+    }
+  }
 
   # // re-order
   sort.i <- seq_len(length(params))

tests/testthat/test-arguments.R

@@ -1,7 +1,7 @@
 context("lining up default arguments")
 test_that("setting params with other default works as expected",{
-  expect_equal(gsplot:::function_args("grDevices","points", 1:5, y = NULL, 'label', use.default='xy.coords'), 
-               list(x=1:5, y=NULL,xlab='label'))
+  expect_equal(gsplot:::function_args("grDevices","points", 5:10, y = NULL, 'label', use.default='xy.coords'), 
+               list(x=1:6, y=5:10,xlab='label'))
 })
 
 test_that("setting params with class match works as expected",{

tests/testthat/tests-points.R

@@ -15,7 +15,7 @@ test_that("graphics examples work", {
 
 context("points arguments")
 test_that("setting params works as expected",{
-  expect_equal(gsplot:::function_args("graphics","points", 5, y = NULL), list(x=5, y=NULL))
+  expect_equal(gsplot:::function_args("graphics","points", 5, y = NULL), list(x=1, y=5))
   expect_equal(gsplot:::function_args("graphics","points", y=5, x=0), list(x=0, y=5))
 })
 
@@ -58,3 +58,18 @@ test_that("points.gsplot accepts formulas",{
 
 })
 
+test_that("points works with indexing", {
+  
+  x <- 7:10
+  gs <- gsplot() %>%
+    points(x)
+  expect_equal(class(gs$view.1.2$points$y), "integer")
+  expect_equal(gs$view.1.2$points$x, seq_along(x))
+  
+
+  oct_dates <- seq(as.Date("2015-10-11"), as.Date("2015-10-15"), by="days")
+  gs_dates <- gsplot() %>%
+    points(oct_dates)
+  expect_equal(class(gs_dates$view.1.2$points$y), "Date")
+  expect_equal(gs_dates$view.1.2$points$x, seq_along(oct_dates))
+})