Merge pull request #296 from lindsaycarr/master

addressing draw_axis

Author: ldecicco-USGS

R/axis.R

@@ -87,11 +87,9 @@ axis.gsplot <- function(object, ..., n.minor=0, tcl.minor=0.15, reverse=NULL) {
 
 }
 
-draw_axis <- function(gsplot) {
+draw_axis <- function(gsplot, index.axis) {
 
-  draw_axis_execute <- function(axisParams,n.minor){
-    axisParams <- gsplot[[index]][['arguments']]
-    n.minor <- gsplot[[index]][['gs.config']]$n.minor
+  draw_axis_execute <- function(axisParams, n.minor, index){
 
     if(n.minor == 0){
       axis(axisParams)
@@ -127,10 +125,18 @@ draw_axis <- function(gsplot) {
     }
   }
 
-  for(index in which(names(gsplot) %in% "axis")){
-    axisParams <- gsplot[[index]][['arguments']]
-    n.minor <- gsplot[[index]][['gs.config']]$n.minor
-    draw_axis_execute(axisParams, n.minor)
+  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)
+    }
+    
   }
 
 }

R/print.R

@@ -40,8 +40,8 @@ print.gsplot <- function(x, ...){
     plot.new()
   }
 
-  i <- which(names(views) %in% 'axis')
-  definded.sides <- sapply(i, function(x) views[[x]][['arguments']][['side']])
+  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
@@ -68,24 +68,34 @@ print.gsplot <- function(x, ...){
 
     # -- call functions -- 
 
-    if((sum(view.info$x.side.defined.by.user[i], view.info$y.side.defined.by.user[i])== 0 ) &
-       (class(window$xlim) == "numeric" & class(window$ylim) == "numeric") | 
-       !(any(names(plots) %in% 'grid'))){
+#     if((sum(view.info$x.side.defined.by.user[i], view.info$y.side.defined.by.user[i])== 0 ) &
+#        (class(window$xlim) == "numeric" & class(window$ylim) == "numeric") | 
+      if(!(any(names(plots) %in% 'grid'))){
       to_gsplot(lapply(plots, function(x) x[!names(x) %in% 'legend.name']))
     } else {
       draw_custom_grid(views,i)
       plots <- plots[!(names(plots) %in% 'grid')]
       to_gsplot(lapply(plots, function(x) x[!(names(x) %in% c('legend.name'))]))
     }
 
-    if(window$axes){
-      if(!view.info$x.side.defined.by.user[i]){
+    
+    if(!view.info$x.side.defined.by.user[i]){
+      if(window$axes){
         Axis(side=view.info$x[i],x=window$xlim)
       }
-      if(!view.info$y.side.defined.by.user[i]){
+    } else {
+      x.axis <- i.axis[which(defined.sides == view.info$x[i])]
+      draw_axis(views, index.axis=x.axis)
+    }
+    
+    if(!view.info$y.side.defined.by.user[i]){
+      if(window$axes){
         Axis(side=view.info$y[i],x=window$ylim)
-      }
-    } 
+      } 
+    } else {
+      y.axis <- i.axis[which(defined.sides == view.info$y[i])]
+      draw_axis(views, index.axis=y.axis)
+    }
 
     if(window$ann){
       mtext(text=window$xlab, side=window$side[1], line = 2, las=config("mtext")$las)
@@ -95,7 +105,8 @@ print.gsplot <- function(x, ...){
     par(new=TRUE)
   }
 
-  draw_axis(views)
+  i.axis.noview <- i.axis[which(!defined.sides %in% c(view.info$x, view.info$y))]
+  draw_axis(views, index.axis=i.axis.noview)
 
   if(window$frame.plot){
     box()

inst/extdata/default.yaml

@@ -22,6 +22,7 @@ axis:
   line: NULL 
   pos: NULL
   outer: FALSE
+  las: 1
 title: NULL
 text: NULL
 mtext: