Merge pull request #466 from lindsaycarr/master

function camel case changes

Author: Jordan S Read

R/legend.R

@@ -90,8 +90,8 @@ draw_legend <- function(gsplot) {
       if (legend$draw) {
         par(xpd=TRUE)
 
-        legend <- appendLegendColumnInfo(legend)
-        legend <- appendLegendPositionConfiguration(legend)
+        legend <- append_legend_column_info(legend)
+        legend <- append_legend_position_config(legend)
         # set required legend argument to NA if not exists
         if (!"legend" %in% names(legend)) {
          legend$legend <- NA
@@ -115,7 +115,7 @@ draw_legend <- function(gsplot) {
   }
 }
 
-appendLegendPositionConfiguration <- function(legend) {
+append_legend_position_config <- function(legend) {
   #TODO support explicit x/y coords
   legend_offset <- legend$legend_offset
   location <- legend$location
@@ -139,7 +139,7 @@ appendLegendPositionConfiguration <- function(legend) {
 #' Based on location set legend columns
 #' 
 #' @param legend to set columns on
-appendLegendColumnInfo <- function(legend) {
+append_legend_column_info <- function(legend) {
   location <- legend[['location']]
   if (location == "below" || location == "above") {
     itemsPerCol <- 3 # TODO load this from config

R/utils-list.R

@@ -37,7 +37,7 @@ strip_pts <- function(list, param){
       if(is.list(v.vals)){
         v.vals <- strip_pts(v.vals, param)
       }
-      out <- append_keepTZ(out, v.vals, tz=attr(v.vals, 'tzone'))
+      out <- append_keep_tz(out, v.vals, tz=attr(v.vals, 'tzone'))
       all.na <- all(is.na(v.vals))
       out.class <- ifelse(!all.na, class(v.vals), out.class)
       if(all.na){ 
@@ -48,25 +48,25 @@ strip_pts <- function(list, param){
         u.list <- unname_c(list[sapply(list, is.list)])
         if(v %in% names(u.list) && !inherits(u.list[[v]], c('function','formula'))) {
           v.vals <- u.list[[v]]
-          out <- append_keepTZ(out, v.vals, tz=attr(v.vals, 'tzone'))
+          out <- append_keep_tz(out, v.vals, tz=attr(v.vals, 'tzone'))
           all.na <- all(is.na(v.vals))
           out.class <- ifelse(!all.na, class(v.vals), out.class)
           if(all.na){ 
             class(out) <- out.class 
           }
         } else if (any(sapply(u.list, function(x) any(names(x) %in% v)))) {
           v.vals <- u.list[[which(sapply(u.list, function(x) any(names(x) %in% v)))]][[v]]
-          out <- append_keepTZ(out, v.vals, tz=attr(v.vals, 'tzone'))
+          out <- append_keep_tz(out, v.vals, tz=attr(v.vals, 'tzone'))
           all.na <- all(is.na(v.vals))
           out.class <- ifelse(!all.na, class(v.vals), out.class)
           if(all.na){ 
             class(out) <- out.class 
           }
         } else {
-          out <- append_keepTZ(out, NA, tz=attr(out, "tzone"))
+          out <- append_keep_tz(out, NA, tz=attr(out, "tzone"))
         }
       } else
-        out <- append_keepTZ(out, NA, tz=attr(out, "tzone"))
+        out <- append_keep_tz(out, NA, tz=attr(out, "tzone"))
     }
 
   }
@@ -94,7 +94,7 @@ strip_pts2 <- function(data, param) {
 # append without losing timezones for the case where 
 # append.vals is POSIX and base.vals is NULL
 # also handles adding NA to POSIXct vals
-append_keepTZ <- function(base.vals, append.vals, tz=NULL){
+append_keep_tz <- function(base.vals, append.vals, tz=NULL){
   vals <- append(base.vals, append.vals)
   attr(vals,"tzone") <- tz
   return(vals)

R/utils-side.R

@@ -208,7 +208,7 @@ set_side_lim <- function(args, side, side.num){
   if(any(free.lim)){
     side.vals <- strip_pts(args, include)
     if (any(!is.na(side.vals))){
-      data.range <- range(append_keepTZ(base.vals=side.vals[is.finite(side.vals)], 
+      data.range <- range(append_keep_tz(base.vals=side.vals[is.finite(side.vals)], 
                                         append.vals=side$lim, 
                                         tz=attr(side.vals, 'tzone')), 
                           na.rm = TRUE)