Adding in logs on object creation

Author: ldecicco-USGS

R/axis.R

@@ -94,10 +94,11 @@ 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)
 
@@ -120,9 +121,20 @@ axis.gsplot <- function(object, ..., n.minor=0, tcl.minor=NA, reverse=NULL, appe
     if (!is.null(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)
 
 }

R/print.R

@@ -87,17 +87,6 @@ print.gsplot <- function(x, ...){
   for (side.name in side.names){
 
     old.par <- par(x[[side.name]]$par)
-    side.num <- as.side(side.name)
-    
-    if(length(views_with_side(x, side.num)) == 0){
-
-      if(side.num %% 2 == 1){ #odd
-        views <- view(views, side=c(side.num, view.info$y[1]), log=view.info$log[1])
-      } else { #even
-        views <- view(views, side=c(view.info$x[1], side.num), log=view.info$log[1])
-      }
-    }
-    
     par(views[[side.name]]$par)
 
     if("x" == as.axis(side.name)){

tests/testthat/tests-axis.R

@@ -15,14 +15,15 @@ test_that("axis gsplot",{
   gs = points(gsplot(mar=c(1,1,1,1)), c(-2,3), c(-1,5)) %>% 
     axis(3)
   expect_true(all(names(gs) %in% c("side.1", "side.2", "side.3", 
-                                   "view.1.2", "global", "metadata")))
+                                   "view.1.2","view.3.2",
+                                   "global", "metadata")))
 
   gs <- gsplot() %>%
     lines(1:5, c(1,10,100,1000,10000), log="y", axes=FALSE) %>%
     axis(side=c(2,4), labels=FALSE, n.minor=4)
 
   expect_false(gs$side.1$axes)
-  # expect_false(gs$side.2$axes) #is this right?
+  expect_false(gs$side.2$axes) 
 
 })
 
@@ -107,8 +108,7 @@ test_that("style params given to points calls are in side par, style on axis sta
   gs <- points(gsplot(), 1, 0, tcl=0.5) %>% 
     axis(side=1, tcl = -0.136)
   expect_equal(gs$side.1$axis[["tcl"]], -0.136)
-  # Is this what we want? The behavior seems right if we change this to side.2?
-  # expect_equal(gs$side.1$par[["tcl"]], 0.5)
+  expect_equal(gs$side.1$par[["tcl"]], 0.5)
 })
 
 
@@ -148,12 +148,20 @@ test_that("log stuff",{
   gs <- gsplot() %>%
         points(1:100, 1:100, log="xy", side=c(3,4))  %>%
         axis(1)
-
+  # Right now, only converting the log arg on print
+  # If 
   expect_true(gs$side.1$log)
+
+  gs <- gsplot() %>%
+    points(1:100, 1:100, log="xy")  %>%
+    axis(3) 
+  
+  expect_true(gs$side.3$log)
 
   gs <- gsplot() %>%
     points(1:100, 1:100, log="xy")  %>%
-    axis(3)
+    axis(3) %>%
+    points(1:100, 1:100, log="y", side=c(3,4))
 
   expect_true(gs$side.3$log)