Merge pull request #468 from ldecicco-USGS/axis_stuff

Axis stuff

Author: ldecicco-USGS

.travis.yml

@@ -6,13 +6,13 @@
 
 language: r
 cache: packages
-sudo: false
 dist: trusty
 
 matrix:
   include:
     - os: linux
       r: release
+      env: R_CODECOV=true
     - os: linux
       r: devel
 
@@ -28,7 +28,7 @@ r_github_packages:
   - jimhester/covr
 
 after_success:
-  - Rscript -e 'covr::coveralls()'
+  - if [[ "${R_CODECOV}" ]]; then R -e 'covr::coveralls()'; fi
 
 notifications:
   email:

R/axis.R

@@ -94,28 +94,52 @@ axis.gsplot <- function(object, ..., n.minor=0, tcl.minor=NA, reverse=NULL, appe
   user.args[[fun.name]]$tcl.minor <- tcl.minor
 
   user.args[[fun.name]] <- append_replace(user.args[[fun.name]], args$option.args)
+  view.info <- view_info(object)
 
   for(side in sides){
     # append the side and give it defaults if it doesn't exist
+
+    side.name <- as.side_name(side)
+    object <- modify_side(object, args = list(), side=side)
+    
     if(!append){
-      object <- modify_side(object, args = list(), side=side) 
+
+      which.axis <- which(names(object[[side.name]])== 'axis')
+      if(length(which.axis) > 1){
+        object[[side.name]] <- object[[side.name]][-which.axis[2:length(which.axis)]]
+      }
+      
+      object[[side.name]][[fun.name]] <- append_replace(object[[as.side_name(side)]][[fun.name]], user.args[[fun.name]])
+    } else {
+
+      user.args$axis <- c(side = side, user.args$axis)
+      object[[side.name]] <- c(object[[side.name]],user.args)
     }
+
+    object[[side.name]][['usr.axes']] <- TRUE
 
-    object[[as.side_name(side)]][['usr.axes']] <- TRUE
-    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
+      object[[side.name]][['reverse']] <- reverse
+    }
+    
+    class(object) <- 'gsplot'
+    
+    if(!is.null(view.info) && length(views_with_side(object, side)) == 0){
+      if(side %% 2 == 1){ #odd
+        object <- view(object, side=c(side, view.info$y[1]), log=view.info$log[1])
+      } else { #even
+        object <- view(object, side=c(view.info$x[1], side), log=view.info$log[1])
+      }
     }
+    
   }
 
-  class(object) <- 'gsplot'
+  # class(object) <- 'gsplot'
   return(object)
 
 }
 
 draw_axis <- function(object, side.name){
-  
-  
   # method isn't made for multiple axis calls
   which.axis <- which(names(object[[side.name]]) == 'axis')
   if (length(which.axis) > 1){
@@ -124,8 +148,8 @@ draw_axis <- function(object, side.name){
       tmp[[side.name]] <- tmp[[side.name]][-which.axis[which.axis %in% axis.i]]
       draw_axis(tmp, side.name)
     }
+    
   }
-  
   axis.args <- object[[side.name]][['axis']]
   side.lim <- object[[side.name]][['lim']]
 
@@ -142,15 +166,14 @@ draw_axis <- function(object, side.name){
 
     tcl <- NULL
     if (exists('tcl.minor',axis.args)){
-      tcl <- ifelse(is.na(axis.args$tcl.minor), par('tcl')*0.5, axis.args$tcl.minor)
+      tcl <- axis.args$tcl.minor
+      
     }
 
     axis.args$n.minor <- NULL
     axis.args$tcl.minor <- NULL
 
-    do.call('Axis', axis.args)
-    
-    
+    do.call('Axis', axis.args)    
 
     # Minor axis:
 
@@ -186,4 +209,4 @@ draw_axis <- function(object, side.name){
     axis.args$tcl <- tcl
     do.call('Axis', axis.args)
   }
-}
+}

R/modify_side.R

@@ -27,22 +27,11 @@ modify_side <- function(object, args, side) {
   for (sideName in sideNames) {
     sideNum <- as.side(sideName)
     thisSide <- sides[[sideName]]
-    
-    if("side.3" == sideName & length(views_with_side(object, 3)) == 0 & "side.1" %in% names(object)){
-      thisSide$log <- object$side.1$log
-    } else if ("side.4" == sideName & length(views_with_side(object, 4)) == 0 & "side.2" %in% names(object)){
-      thisSide$log <- object$side.2$log
-    } else if ("side.1" == sideName & length(views_with_side(object, 1)) == 0 & "side.3" %in% names(object)){
-      thisSide$log <- object$side.3$log
-    } else if ("side.2" == sideName & length(views_with_side(object, 2)) == 0 & "side.4" %in% names(object)){
-      thisSide$log <- object$side.4$log
-    }
-    
+
     thisSide <- set_side_lim(args, thisSide, sideNum)
     thisSide <- set_side_log(args, thisSide, sideNum)
     thisSide <- set_side_lab(args, thisSide, sideNum)
     thisSide <- set_side_axes(args, thisSide, sideNum)
-    
 
     object[[sideName]] <- thisSide
   }