Fix style (notably, RStudio indentation)

mkcor · mkcor · commit ab4ca1c0fad3 · 2015-05-05T17:39:07.000-04:00
diff --git a/R/ggplotly.R b/R/ggplotly.R
@@ -110,7 +110,7 @@ gg2list <- function(p) {
       p$layers[[layer.i]]$data <- p$data
     }
   }
-
+  
   # Test fill and color to see if they encode a quantitative
   # variable. This may be useful for several reasons: (1) it is
   # sometimes possible to plot several different colors in the same
@@ -190,7 +190,7 @@ gg2list <- function(p) {
     ggsizemin <- min(unlist(sizerange))
     ggsizemax <- max(unlist(sizerange))
   }
-
+  
   layer.legends <- list()
   for(i in seq_along(built$plot$layers)){
     # This is the layer from the original ggplot object.
@@ -225,7 +225,7 @@ gg2list <- function(p) {
     L$prestats.data <-
       merge(prestats,
             gglayout[, c("PANEL", "plotly.row", "COL")])
-
+    
     # Add global range info.
     for(xy in names(ranges.list)){
       range.vec <- ranges.list[[xy]]
@@ -356,7 +356,7 @@ gg2list <- function(p) {
     grid <- theme.pars$panel.grid
     grid.major <- theme.pars$panel.grid.major
     if ((!is.null(grid$linetype) || !is.null(grid.major$linetype)) && 
-        c(grid$linetype, grid.major$linetype) %in% c(2, 3, "dashed", "dotted")) {
+          c(grid$linetype, grid.major$linetype) %in% c(2, 3, "dashed", "dotted")) {
       ax.list$gridcolor <- ifelse(is.null(grid.major$colour),
                                   toRGB(grid$colour, 0.1),
                                   toRGB(grid.major$colour, 0.1))
@@ -392,7 +392,7 @@ gg2list <- function(p) {
       ax.list$tickangle <- -tick.text$angle
     }
     ax.list$tickfont <- theme2font(tick.text)
-
+    
     ## determine axis type first, since this information is used later
     ## (trace.order.list is only used for type=category).
     title.text <- e(s("axis.title.%s"))
@@ -453,7 +453,7 @@ gg2list <- function(p) {
     }else{
       p$labels[[xy]]
     }
-
+    
     ax.list$zeroline <- FALSE  # ggplot2 plots do not show zero lines
     # Lines drawn around the plot border.
     ax.list$showline <- !is.blank("panel.border", TRUE)
@@ -603,16 +603,16 @@ gg2list <- function(p) {
         nann <- nann + 1
       }
     }
-      # axes titles
-      annotations[[nann]] <- make.label(xaxis.title, 
-                                        0.5, 
-                                        -outer.margin,
-                                        yanchor="top")
-      nann <- nann + 1
-      annotations[[nann]] <- make.label(yaxis.title, 
-                                        -outer.margin, 
-                                        0.5,
-                                        textangle=-90)
+    # axes titles
+    annotations[[nann]] <- make.label(xaxis.title,
+                                      0.5,
+                                      -outer.margin,
+                                      yanchor="top")
+    nann <- nann + 1
+    annotations[[nann]] <- make.label(yaxis.title,
+                                      -outer.margin,
+                                      0.5,
+                                      textangle=-90)
     layout$annotations <- annotations
   }
   
@@ -631,7 +631,7 @@ gg2list <- function(p) {
   layout$legend <- list(bordercolor="transparent", 
                         x=1.05, y=1/2,
                         xanchor="center", yanchor="top")
-
+  
   ## Legend hiding when guides(fill="none").
   legends.present <- unique(unlist(layer.legends))
   is.false <- function(x){
@@ -653,7 +653,7 @@ gg2list <- function(p) {
   if(theme.pars$legend.position=="none"){
     layout$showlegend <- FALSE
   }
-
+  
   # Only show a legend title if there is at least 1 trace with
   # showlegend=TRUE.
   trace.showlegend <- sapply(trace.list, "[[", "showlegend")
@@ -908,7 +908,7 @@ gg2list <- function(p) {
   }
   
   fig <- list(data=flipped.traces, layout=flipped.layout)
-
+  
   fig
   
 }
diff --git a/R/trace_generation.R b/R/trace_generation.R
@@ -13,7 +13,7 @@ layer2traces <- function(l, d, misc) {
   g <- list(geom=l$geom$objname,
             data=not.na(d),
             prestats.data=not.na(l$prestats.data))
-
+  
   # needed for when group, etc. is an expression.
   g$aes <- sapply(l$mapping, function(k) as.character(as.expression(k)))
   # Partial conversion for geom_violin (Plotly does not offer KDE yet)
@@ -46,7 +46,7 @@ layer2traces <- function(l, d, misc) {
     g$geom <- "bar"
     bargap <- 0
   }
-
+  
   # For non-numeric data on the axes, we should take the values from
   # the original data.
   for (axis.name in c("x", "y")) {    
@@ -136,7 +136,7 @@ layer2traces <- function(l, d, misc) {
   
   # symbol=circle,square,diamond,cross,x,
   # triangle-up,triangle-down,triangle-left,triangle-right
-
+  
   # First convert to a "basic" geom, e.g. segments become lines.
   convert <- toBasic[[g$geom]]
   basic <- if(is.null(convert)){
@@ -247,7 +247,7 @@ layer2traces <- function(l, d, misc) {
     if (is.null(tr$name) || tr$name %in% names.in.legend)
       tr$showlegend <- FALSE
     names.in.legend <- c(names.in.legend, tr$name)
-
+    
     # special handling for bars
     if (g$geom == "bar") {
       tr$bargap <- if (exists("bargap")) bargap else "default"
@@ -270,7 +270,7 @@ layer2traces <- function(l, d, misc) {
       0
     }
   })
-
+  
   ord <- order(sort.val)
   no.sort <- traces[ord]
   for(tr.i in seq_along(no.sort)){
diff --git a/tests/testthat/test-cookbook-axes.R b/tests/testthat/test-cookbook-axes.R
@@ -3,7 +3,7 @@ context("cookbook axes")
 bp <- ggplot(PlantGrowth, aes(x=group, y=weight)) +
   geom_boxplot()
 
-expect_traces <- function(gg, n.traces, name){
+expect_traces <- function(gg, n.traces, name) {
   stopifnot(is.ggplot(gg))
   stopifnot(is.numeric(n.traces))
   save_outputs(gg, paste0("cookbook-axes-", name))
@@ -17,13 +17,13 @@ expect_traces <- function(gg, n.traces, name){
   list(traces=has.data, layout=L$layout)
 }
 
-get_legend <- function(L){
-  if(!isTRUE(L$kwargs$layout$showlegend)){
+get_legend <- function(L) {
+  if (!isTRUE(L$kwargs$layout$showlegend)) {
     return(data.frame())
   }
   legend.list <- list()
-  for(tr in L$traces){
-    if(is.character(tr$name)){
+  for (tr in L$traces) {
+    if (is.character(tr$name)) {
       legend.list[[tr$name]] <-
         data.frame(name=tr$name, showlegend=tr$showlegend)
     }
@@ -32,12 +32,12 @@ get_legend <- function(L){
   subset(legend.df, showlegend)
 }
 
-leg <- function(...){
+leg <- function(...) {
   name <- c(...)
   data.frame(name)
 }
 
-expect_legend <- function(L, expected){
+expect_legend <- function(L, expected) {
   stopifnot(is.data.frame(expected))
   shown <- get_legend(L)
   expect_identical(shown$name, expected$name)
@@ -59,7 +59,7 @@ test_that("factor levels determine tick order", {
                    c("trt2", "trt1", "ctrl"))
   expect_legend(info, leg())
 })
-  
+
 ## These two do the same thing; all data points outside the graphing
 ## range are dropped, resulting in a misleading box plot.
 bp.ylim.hide <- bp + ylim(5, 7.5)
@@ -74,7 +74,7 @@ test_that("scale_y(limits) hides points", {
   expect_legend(info, leg())
   expect_equal(info$layout$yaxis$range, c(5, 7.5))
 })
-  
+
 bp.coord <- bp + coord_cartesian(ylim=c(5, 7.5))
 test_that("Using coord_cartesian zooms into the area", {
   info <- expect_traces(bp.coord, 3, "coord-ylim")
@@ -93,11 +93,12 @@ sp <- ggplot(dat, aes(xval, yval)) + geom_point()
 
 test_that("A scatterplot with regular (linear) axis scaling", {
   info <- expect_traces(sp, 1, "linear-axes")
-  ## TODO: why does this test take so long?
+  # TODO: why does this test take so long?
   expect_legend(info, leg())
 })
 
-library(scales)     # Need the scales package
+library(scales)
+# TODO: Add package "scales" to the list of dependencies?
 sp.log2.scale <- sp + scale_y_continuous(trans=log2_trans())
 
 test_that("log2 scaling of the y axis (with visually-equal spacing)", {
@@ -214,12 +215,12 @@ test_that("In this particular case, x scale has no effect", {
 
 # Self-defined formatting function for times.
 timeHMS_formatter <- function(x) {
-    h <- floor(x/60)
-    m <- floor(x %% 60)
-    s <- round(60*(x %% 1))                   # Round to nearest second
-    lab <- sprintf("%02d:%02d:%02d", h, m, s) # Format the strings as HH:MM:SS
-    lab <- gsub("^00:", "", lab)              # Remove leading 00: if present
-    lab <- gsub("^0", "", lab)                # Remove leading 0 if present
+  h <- floor(x/60)
+  m <- floor(x %% 60)
+  s <- round(60*(x %% 1))                   # Round to nearest second
+  lab <- sprintf("%02d:%02d:%02d", h, m, s) # Format the strings as HH:MM:SS
+  lab <- gsub("^00:", "", lab)              # Remove leading 00: if present
+  lab <- gsub("^0", "", lab)                # Remove leading 0 if present
 }
 
 custom.formatter <- bp + scale_y_continuous(label=timeHMS_formatter)
@@ -263,4 +264,3 @@ test_that("Hide all the vertical gridlines", {
   info <- expect_traces(blank.y, 3, "blank-y")
   expect_legend(info, leg())
 })
-
diff --git a/tests/testthat/test-cookbook-lines.R b/tests/testthat/test-cookbook-lines.R
@@ -235,18 +235,18 @@ df.vlines <- data.frame(cond = levels(df$cond), xval = c(10,11.5))
 
 spf.vline <- 
   spf +
-    geom_hline(aes(yintercept = 10)) +
-    geom_vline(aes(xintercept = xval),
-               data = df.vlines,
-               colour = "#990000", linetype = "dashed")
+  geom_hline(aes(yintercept = 10)) +
+  geom_vline(aes(xintercept = xval),
+             data = df.vlines,
+             colour = "#990000", linetype = "dashed")
 test_that("geom_vline -> 2 more traces", {
   info <- expect_traces_shapes(spf.vline, 6, 0, "scatter-facet-hline-vline")
 })
 
 spf.line.stat <- 
   spf +
-    geom_hline(aes(yintercept=10)) +
-    geom_line(stat="vline", xintercept="mean")
+  geom_hline(aes(yintercept=10)) +
+  geom_line(stat="vline", xintercept="mean")
 test_that("geom_line -> 2 more traces", {
   info <-
     expect_traces_shapes(spf.line.stat, 6, 0,
