Merge pull request #347 from jread-usgs/axis_sides

Moving axis calls to sides

Author: aappling-usgs

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: gsplot
 Type: Package
 Title: Geological Survey Plotting
-Version: 0.6.0
-Date: 2016-04-09
+Version: 0.6.1
+Date: 2016-05-12
 Authors@R: c( person("Jordan", "Read", role = "aut",
     email = "[email protected]"),
     person("Laura", "DeCicco", role = c("aut","cre"),

R/access-gsplot.R

@@ -113,8 +113,14 @@ lim <- function(object, side=NULL, axis = NULL, set.undefined=TRUE, if.null=c(0,
 
   }
 
-  lims <- lapply(side.names, function(x) object[[x]]$lim) %>% 
-    setNames(side.names)
+  lims <- lapply(side.names, function(x) {
+    lim <- object[[x]]$lim
+    if (object[[x]]$reverse){
+      lim <- rev(lim)
+    }
+    return(lim)
+  })
+  names(lims) <- side.names
   if (!is.null(side) && length(side)==1){
     lims <- lims[[1]]
     if (set.undefined && all(is.na(lims))){

R/axis.R

@@ -71,79 +71,79 @@ axis.gsplot <- function(object, ..., n.minor=0, tcl.minor=0.15, reverse=NULL) {
 
   sides <- user_args[[fun.name]]$side
   user_args[[fun.name]]$side <- NULL
+  user_args[[fun.name]]$n.minor <- n.minor
+  user_args[[fun.name]]$tcl.minor <- tcl.minor
 
-  for(i in sides){
-    arguments1 <- list(arguments = append(list(side=i), user_args[[fun.name]]), 
-                       gs.config=list(n.minor=n.minor, tcl.minor=tcl.minor, 
-                                      reverse=reverse))
-    to.gsplot <- list(arguments1)
-    names(to.gsplot) <- fun.name
+  for(side in sides){
+    # append the side and give it defaults if it doesn't exist
+    object <- modify_side(object, args = list(), side=side) 
 
-    object <- append(object, to.gsplot)
+    object[[as.side_name(side)]][['axis']] <- append_replace(object[[as.side_name(side)]][['axis']], user_args[[fun.name]])
+    if (!is.null(reverse)){
+      object[[as.side_name(side)]][['reverse']] <- reverse
+    }
   }
   class(object) <- 'gsplot'
   return(object)
 
 }
 
-draw_axis <- function(gsplot, index.axis) {
-
-  draw_axis_execute <- function(axisParams, n.minor, index){
+draw_axis <- function(axis.args){
+  
+  # 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)
+  } else {
+    n.minor <- axis.args$n.minor + 1
 
-    if(n.minor == 0){
-      axis(axisParams)
-    } else {
-      axis(axisParams)
-      n.minor <- n.minor + 1
-      
-      # Minor axis:
-
-      #if user hasn't specified "at", calculate it
-      if(is.null(axisParams$at)){
-        at <- axTicks(axisParams$side)
-      } else {
-        at <- axisParams$at
-      }
+    tcl <- NULL
+    if (exists('tcl.minor',axis.args)){
+      tcl <- axis.args$tcl.minor
 
-      newAT <- c()
-      
-      if(axisParams$side %% 2 == 0){
-        logScale <- par()$ylog
-      } else {
-        logScale <- par()$xlog
-      }
-        
-      if(logScale){
-        spacing <- median(diff(log10(at)))
-        at <- c(10^(log10(at[1])-spacing),at,10^(log10(at[length(at)])+spacing))
-      } else {
-        spacing <- median(diff(at))
-        at <- c(at[1]-spacing,at,at[length(at)]+spacing)
-      }
-      
-      for(i in 2:length(at)){
-        newAT <- c(newAT, seq(at[i-1], length.out = n.minor, by= (at[i]-at[i-1])/n.minor))
-      }
-      
-      axisParams$at <- newAT
-      axisParams$tcl <- gsplot[[index]][['gs.config']]$tcl.minor
-      axisParams$labels <- FALSE
-      axis(axisParams)
     }
-  }
-  
-  if(length(index.axis) == 1){
-    axisParams <- gsplot[[index.axis]][['arguments']]
-    n.minor <- gsplot[[index.axis]][['gs.config']]$n.minor
-    draw_axis_execute(axisParams, n.minor, index.axis)
-  } else {
 
-    for(i in index.axis){
-      axisParams <- gsplot[[i]][['arguments']]
-      n.minor <- gsplot[[i]][['gs.config']]$n.minor
-      draw_axis_execute(axisParams, n.minor, i)
+    axis.args$n.minor <- NULL
+    axis.args$tcl.minor <- NULL
+    
+    axis(axis.args)
+    
+    
+    
+    # Minor axis:
+    
+    #if user hasn't specified "at", calculate it
+    if(is.null(axis.args$at)){
+      at <- axTicks(axis.args$side)
+    } else {
+      at <- axis.args$at
+    }
+    
+    newAT <- c()
+    
+    if(axis.args$side %% 2 == 0){
+      logScale <- par()$ylog
+    } else {
+      logScale <- par()$xlog
     }
 
+    if(logScale){
+      spacing <- median(diff(log10(at)))
+      at <- c(10^(log10(at[1])-spacing),at,10^(log10(at[length(at)])+spacing))
+    } else {
+      spacing <- median(diff(at))
+      at <- c(at[1]-spacing,at,at[length(at)]+spacing)
+    }
+    
+    for(i in 2:length(at)){
+      newAT <- c(newAT, seq(at[i-1], length.out = n.minor, by= (at[i]-at[i-1])/n.minor))
+    }
+    
+    axis.args$at <- newAT
+    axis.args$labels <- FALSE
+    axis.args$tcl <- tcl
+    axis(axis.args)
   }
-
-}
+}

R/print.R

@@ -42,8 +42,6 @@ print.gsplot <- function(x, ...){
   }
 
   par(x$global$par)
-  i.axis <- which(names(views) %in% 'axis')
-  defined.sides <- sapply(i.axis, function(x) views[[x]][['arguments']][['side']])
 
   bg.arg <- views$bgCol
   title.arg <- views$title
@@ -55,14 +53,10 @@ print.gsplot <- function(x, ...){
     side <- as.side(side.name)
     old.par <- par(x[[side.name]]$par)
     set_frame(views, side)
-    if(!side %in% defined.sides){ 
-      if(x[[side.name]][['axes']]){
-        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(x[[side.name]][['axes']]){
+      draw_axis(x[[side.name]][['axis']])
     }
+    
     if(par('ann')){
       mtext(text=label(views, side), side=side, line = 2, las=config("mtext")$las)
     }
@@ -89,8 +83,8 @@ print.gsplot <- function(x, ...){
     par(new=TRUE)
   }
 
-  i.axis.noview <- i.axis[which(!defined.sides %in% c(view.info$x, view.info$y))]
-  draw_axis(views, index.axis=i.axis.noview)
+  #i.axis.noview <- i.axis[which(!defined.sides %in% c(view.info$x, view.info$y))]
+  #draw_axis(views, index.axis=i.axis.noview)
 
   draw_legend(views)
   par(new=FALSE)

R/utils-side.R

@@ -222,7 +222,10 @@ add_new_side <- function(object, side.name){
   stopifnot(length(side.name) == 1)
   if (side.name %in% side_names(object))
     stop(side.name, ' already exists, cannot add it.', call. = FALSE)
-  side.template <- list(list(lim = c(NA, NA), log=FALSE, label="", axes = TRUE, reverse = FALSE, usr.lim=c(FALSE, FALSE)))
+  side.template <- list(list(
+    axis = set_args('axis', side=as.side(side.name), package='graphics'), 
+    lim = c(NA, NA), log=FALSE, label="", axes = TRUE, reverse = FALSE, usr.lim=c(FALSE, FALSE)))
+  
   names(side.template) <- side.name
 
   last.side.i <- max(which_sides(object), 0)

README.Rmd

@@ -260,8 +260,8 @@ gs <- gsplot() %>%
         ylab="logged y axis", xlab="logged x axis", log='xy') %>%
   callouts(x=8, y=4, lwd=2, angle=45, labels="Not sure about this one") %>%
   title("logged axes") %>%
-  axis(side=c(1,2,3,4), labels=FALSE, n.minor=4) %>%
-  axis(side=c(1,2))
+  axis(side=c(3,4), labels=FALSE, n.minor=4) %>%
+  axis(side=c(1,2), n.minor=4)
 gs
 ```
 

README.md

@@ -94,7 +94,7 @@ myplot <- myplot %>% points(4,3,col="blue")
 myplot
 ```
 
-![](README_files/figure-markdown_github/unnamed-chunk-3-1.png)<!-- -->
+![](README_files/figure-markdown_github/unnamed-chunk-3-1.png)
 
 <a name="legend"></a>
 
@@ -128,7 +128,7 @@ myplot <- gsplot() %>%
 myplot
 ```
 
-![](README_files/figure-markdown_github/unnamed-chunk-5-1.png)<!-- -->
+![](README_files/figure-markdown_github/unnamed-chunk-5-1.png)
 
 <a name="limits"></a>
 
@@ -153,7 +153,7 @@ limitsplot <- gsplot() %>%
 limitsplot
 ```
 
-![](README_files/figure-markdown_github/unnamed-chunk-7-1.png)<!-- -->
+![](README_files/figure-markdown_github/unnamed-chunk-7-1.png)
 
 <a name="error"></a>
 
@@ -179,7 +179,7 @@ errorbarplot <- gsplot() %>%
 errorbarplot
 ```
 
-![](README_files/figure-markdown_github/unnamed-chunk-9-1.png)<!-- -->
+![](README_files/figure-markdown_github/unnamed-chunk-9-1.png)
 
 <a name="callouts"></a>
 
@@ -204,7 +204,7 @@ calloutsplot <- gsplot() %>%
 calloutsplot
 ```
 
-![](README_files/figure-markdown_github/unnamed-chunk-11-1.png)<!-- -->
+![](README_files/figure-markdown_github/unnamed-chunk-11-1.png)
 
 <a name="reverse"></a>
 
@@ -226,7 +226,7 @@ reverseplot <- gsplot() %>%
 reverseplot
 ```
 
-![](README_files/figure-markdown_github/unnamed-chunk-13-1.png)<!-- -->
+![](README_files/figure-markdown_github/unnamed-chunk-13-1.png)
 
 <a name="embed"></a>
 
@@ -256,7 +256,7 @@ embedplot <- gsplot() %>%
 embedplot
 ```
 
-![](README_files/figure-markdown_github/unnamed-chunk-15-1.png)<!-- -->
+![](README_files/figure-markdown_github/unnamed-chunk-15-1.png)
 
 <a name="base"></a>
 
@@ -272,7 +272,7 @@ gs
 points(1.2,2.5)
 ```
 
-![](README_files/figure-markdown_github/unnamed-chunk-16-1.png)<!-- -->
+![](README_files/figure-markdown_github/unnamed-chunk-16-1.png)
 
 Improved workflow examples
 --------------------------
@@ -295,7 +295,7 @@ demoPlot <- gsplot() %>%
 demoPlot
 ```
 
-![](README_files/figure-markdown_github/unnamed-chunk-17-1.png)<!-- -->
+![](README_files/figure-markdown_github/unnamed-chunk-17-1.png)
 
 ``` r
 gs <- gsplot() %>%
@@ -305,12 +305,12 @@ gs <- gsplot() %>%
         ylab="logged y axis", xlab="logged x axis", log='xy') %>%
   callouts(x=8, y=4, lwd=2, angle=45, labels="Not sure about this one") %>%
   title("logged axes") %>%
-  axis(side=c(1,2,3,4), labels=FALSE, n.minor=4) %>%
-  axis(side=c(1,2))
+  axis(side=c(3,4), labels=FALSE, n.minor=4) %>%
+  axis(side=c(1,2), n.minor=4)
 gs
 ```
 
-![](README_files/figure-markdown_github/unnamed-chunk-18-1.png)<!-- -->
+![](README_files/figure-markdown_github/unnamed-chunk-18-1.png)
 
 ``` r
 usrDef <- gsplot(mar=c(4,4,4,4), xaxs='r', yaxs='r') %>% 
@@ -322,7 +322,7 @@ usrDef <- gsplot(mar=c(4,4,4,4), xaxs='r', yaxs='r') %>%
 usrDef
 ```
 
-![](README_files/figure-markdown_github/unnamed-chunk-19-1.png)<!-- -->
+![](README_files/figure-markdown_github/unnamed-chunk-19-1.png)
 
 Disclaimer
 ----------