Merge pull request #396 from lindsaycarr/master

draw_axis handling different data types

Author: Lindsay Carr

R/axis.R

@@ -88,14 +88,18 @@ axis.gsplot <- function(object, ..., n.minor=0, tcl.minor=0.15, reverse=NULL) {
 
 }
 
-draw_axis <- function(axis.args){
+draw_axis <- function(object, side.name){
+  axis.args <- object[[side.name]][['axis']]
+  side.lim <- object[[side.name]][['lim']]
+
+  axis.args$at <- get_axTicks(object, as.side(side.name))
 
   # need a cleaner way to extract the non-axis args (such as n.minor and tcl.minor)
 
   if(!exists('n.minor',axis.args) || axis.args$n.minor == 0){
     axis.args$n.minor <- NULL
     axis.args$tcl.minor <- NULL
-    axis(axis.args)
+    do.call('Axis', axis.args)
   } else {
     n.minor <- axis.args$n.minor + 1
 
@@ -108,7 +112,7 @@ draw_axis <- function(axis.args){
     axis.args$n.minor <- NULL
     axis.args$tcl.minor <- NULL
 
-    axis(axis.args)
+    do.call('Axis', axis.args)
 
 
 
@@ -144,6 +148,6 @@ draw_axis <- function(axis.args){
     axis.args$at <- newAT
     axis.args$labels <- FALSE
     axis.args$tcl <- tcl
-    axis(axis.args)
+    do.call('Axis', axis.args)
   }
 }

R/grid.R

@@ -61,21 +61,15 @@ draw_custom_grid <- function(object, view.name){
 
   if (is.null(grid.args$nx)){
     x.side <- as.x_side_name(view.name)
-    at <- axis_axTicks(object, as.side(x.side))
-    if (is.null(at)){
-      at <- grid_axTicks(object, as.side(x.side))
-    }
+    at <- get_axTicks(object, as.side(x.side))
     abline(v=at, remove_field(grid.args, c("equilogs", "nx", "ny")))
   } else {
     grid(ny=NA, remove_field(grid.args, "ny"))
   }
 
   if (is.null(grid.args$ny)){
     y.side <- as.y_side_name(view.name)
-    at <- axis_axTicks(object, as.side(y.side))
-    if (is.null(at)){
-      at <- grid_axTicks(object, as.side(y.side))
-    }
+    at <- get_axTicks(object, as.side(y.side))
     abline(h=at, remove_field(grid.args, c("equilogs", "nx", "ny")))
   } else {
     grid(nx=NA, remove_field(grid.args, "nx"))
@@ -102,8 +96,7 @@ grid_axTicks <- function(object, side){
   if(is.numeric(lim)){
     at <- axTicks(side)
   } else{
-    fun <- getFromNamespace(paste0('axis.',class(lim)[1L]),'graphics')
-    at <- fun(side, x = lim, lwd=0, lwd.ticks=0, labels = FALSE)
+    at <- Axis(side = side, x = pretty(lim), lwd=0, lwd.ticks=0, labels = FALSE)
   }
   return(at)
 }
@@ -114,8 +107,21 @@ grid_axTicks <- function(object, side){
 #' @param side a numeric side
 #' @return a series of ticks as a vector, or NULL if they weren't specified
 #' @keywords internal
-axis_axTicks <- function(object, side){
+usr_axTicks <- function(object, side){
   i <- grep(as.side_name(side), names(object))
   usr.at <- object[[i]][['axis']][['at']]
   return(usr.at)
 }
+
+#' get the axes ticks for grid or axes
+#' 
+#' @param object a gsplot object
+#' @param side a numeric side
+#' @return a series of ticks as a vector, or NULL if they weren't specified
+#' @keywords internal
+get_axTicks <- function(object, side){
+  at <- usr_axTicks(object, side)
+  if (is.null(at)){
+    at <- grid_axTicks(object, side)
+  }
+}

R/print.R

@@ -71,7 +71,7 @@ print.gsplot <- function(x, ...){
     old.par <- par(x[[side.name]]$par)
     set_frame(views, side)
     if(x[[side.name]][['axes']] | x[[side.name]][['usr.axes']]){
-      draw_axis(x[[side.name]][['axis']])
+      draw_axis(x, side.name)
     }
 
     if(par('ann')){

README.Rmd

@@ -225,11 +225,12 @@ embedplot
 If you need to use a feature that `gsplot` has yet to implement, you can always start with `gsplot` and add on using base R. The reverse is (starting with base and then using `gsplot`) is not supported.
 
 ```{r message=FALSE, warning=FALSE}
+date_vector <- seq(as.Date("2010-10-01"), as.Date("2011-09-30"), by="months")
 gs <- gsplot() %>% 
-  points(1,2)
+  points(date_vector, 1:12)
 gs
 
-points(1.2,2.5)
+points(as.Date("2010-11-15"),2.5)
 ```
 
 ##Improved workflow examples

README.md

@@ -265,11 +265,12 @@ embedplot
 If you need to use a feature that `gsplot` has yet to implement, you can always start with `gsplot` and add on using base R. The reverse is (starting with base and then using `gsplot`) is not supported.
 
 ``` r
+date_vector <- seq(as.Date("2010-10-01"), as.Date("2011-09-30"), by="months")
 gs <- gsplot() %>% 
-  points(1,2)
+  points(date_vector, 1:12)
 gs
 
-points(1.2,2.5)
+points(as.Date("2010-11-15"),2.5)
 ```
 
 ![](README_files/figure-markdown_github/unnamed-chunk-16-1.png)