Merge pull request #171 from ropensci/toby-ylim

Toby ylim

Author: Toby Dylan Hocking

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: plotly
 Type: Package
 Title: Interactive, publication-quality graphs online.
-Version: 0.5.21
+Version: 0.5.22
 Authors@R: c(person("Chris", "Parmer", role = c("aut", "cre"),
     email = "[email protected]"),
     person("Scott", "Chamberlain", role = "aut",

NEWS

@@ -1,3 +1,7 @@
+0.5.22 -- 2 March 2015.
+
+Fixes for ylim() #171.
+
 0.5.21 -- 23 February 2015.
 
 Fixes for error bars and tick marks.

R/ggplotly.R

@@ -305,12 +305,28 @@ 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"))
+    ax.list$titlefont <- theme2font(title.text)
+    ax.list$type <- if (misc$is.continuous[[xy]]){
+      "linear"
+    } else if (misc$is.discrete[[xy]]){
+      "category"
+    } else if (misc$is.date[[xy]] || misc$is.datetime[[xy]]){
+      "date"
+    } else {
+      stop("unrecognized data type for ", xy, " axis")
+    }
 
     # Translate axes labels.
     scale.i <- which(p$scales$find(xy))
     ax.list$title <- if(length(scale.i)){
       sc <- p$scales$scales[[scale.i]]
-      trace.order.list[[xy]] <- sc$limits
+      if(ax.list$type == "category"){
+        trace.order.list[[xy]] <- sc$limits
+      }
       trace.name.map[sc$breaks] <- sc$labels
       if (is.null(sc$breaks)) {
         ax.list$showticklabels <- FALSE
@@ -346,18 +362,6 @@ gg2list <- function(p){
       p$labels[[xy]]
     }
 
-    title.text <- e(s("axis.title.%s"))
-    ax.list$titlefont <- theme2font(title.text)
-    ax.list$type <- if(misc$is.continuous[[xy]]){
-      "linear"
-    }else if(misc$is.discrete[[xy]]){
-      "category"
-    }else if(misc$is.date[[xy]] || misc$is.datetime[[xy]]){
-      "date"
-    }else{
-      stop("unrecognized data type for ", xy, " axis")
-    }
-    
     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)

tests/testthat/test-ggplot-ylim.R

@@ -0,0 +1,35 @@
+context("ggplot ylim")
+
+## http://www.cookbook-r.com/Graphs/Bar_and_line_graphs_%28ggplot2%29/
+
+df <- data.frame(time = factor(c("Lunch","Dinner"), levels=c("Lunch","Dinner")),
+                 total_bill = c(14.89, 17.23))
+
+gg.ylim <- 
+  ggplot(data=df, aes(x=time, y=total_bill, group=1)) +
+  geom_line() +
+  geom_point() +
+  ylim(0, max(df$total_bill)) +
+  xlab("Time of day") + ylab("Total bill") +
+  ggtitle("Average bill for 2 people")
+
+expect_traces <- function(gg, n.traces, name){
+  stopifnot(is.ggplot(gg))
+  stopifnot(is.numeric(n.traces))
+  save_outputs(gg, paste0("ylim-", name))
+  L <- gg2list(gg)
+  is.trace <- names(L) == ""
+  all.traces <- L[is.trace]
+  no.data <- sapply(all.traces, function(tr) {
+    is.null(tr[["x"]]) && is.null(tr[["y"]])
+  })
+  has.data <- all.traces[!no.data]
+  expect_equal(length(has.data), n.traces)
+  list(traces=has.data, kwargs=L$kwargs)
+}
+
+test_that("ylim is respected for 1 trace", {
+  info <- expect_traces(gg.ylim, 1, "one-trace")
+  expected.ylim <- c(0, max(df$total_bill))
+  expect_equal(info$kwargs$layout$yaxis$range, expected.ylim)
+})