Merge branch 'ggplotly' of https://github.com/ropensci/plotly into ggplotly

Author: tdhock

.travis.yml

@@ -7,6 +7,4 @@ before_script:
 - ./travis-tool.sh install_deps
  - ./travis-tool.sh install_r RCurl RJSONIO
 notifications:
-  hipchat:
-    rooms:
-      secure: aeV2r8L8WTt1/FcRZgl0UHyZSxiQJgXyNAPuqEkmUGKV6bhGuQ5I36d7xOnlI8v8MAPUqH9co5t0uupY+81Etp+NE3hk+1J5bTqXfY6l/Bz2l6B51HAWnS6Wo25Bz0BPJdSfGqKYmlM4k+2khR15CSXlbxNimgFrvQ4WNndXPp0=
+ slack: ropensci:wh30e1MP9Am3wXb2wJx1ZRFi

R/ggplotly.R

@@ -165,7 +165,15 @@ geom2trace <-
       L$marker$size <- data$size
     }
     L
-  })
+  },
+  bar=function(data, params) {
+    list(x=data$x,
+         y=data$y,
+         name=params$name,
+         type="bar")
+  }
+  )
+
 
 #' Convert ggplot2 aes to line parameters.
 aes2line <- c(linetype="dash",
@@ -175,7 +183,8 @@ aes2line <- c(linetype="dash",
 markLegends <-
   list(point=c("colour", "fill", "shape"),
        path=c("linetype", "size", "colour"),
-       polygon=c("colour", "fill", "linetype", "size", "group"))
+       polygon=c("colour", "fill", "linetype", "size", "group"),
+       bar=c("fill"))
 
 markUnique <- as.character(unique(unlist(markLegends)))
 
@@ -220,11 +229,11 @@ gg2list <- function(p){
   for(i in seq_along(built$plot$layers)){
     ## This is the layer from the original ggplot object.
     L <- p$layers[[i]]
-
+    
     ## for each layer, there is a correpsonding data.frame which
     ## evaluates the aesthetic mapping.
     df <- built$data[[i]]
-
+    
     ## 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
@@ -249,7 +258,7 @@ gg2list <- function(p){
         })
       }
     }
-
+    
     ## scales are needed for legend ordering.
     for(sc in p$scales$scales){
       a <- sc$aesthetics
@@ -260,10 +269,10 @@ gg2list <- function(p){
         misc$breaks[[sc$aesthetics]] <- ranks
       }
     }
-
+    
     ## This extracts essential info for this geom/layer.
     traces <- layer2traces(L, df, misc)
-
+    
     ## Do we really need to coord_transform?
     ##g$data <- ggplot2:::coord_transform(built$plot$coord, g$data,
     ##                                     built$panel$ranges[[1]])
@@ -275,7 +284,7 @@ gg2list <- function(p){
   # grid 0-1 scale). This allows transformations to be used
   # out of the box, with no additional d3 coding.
   theme.pars <- ggplot2:::plot_theme(p)
-
+  
   ## Flip labels if coords are flipped - transform does not take care
   ## of this. Do this BEFORE checking if it is blank or not, so that
   ## individual axes can be hidden appropriately, e.g. #1.
@@ -349,21 +358,21 @@ gg2list <- function(p){
     !is.blank(s("axis.ticks.%s"))
     layout[[s("%saxis")]] <- ax.list
   }
-
+  
   ## Remove legend if theme has no legend position
   if(theme.pars$legend.position=="none") layout$showlegend <- FALSE
-
+  
   ## Main plot title.
   layout$title <- built$plot$labels$title
-
+  
   ## Background color.
   layout$plot_bgcolor <- toRGB(theme.pars$panel.background$fill)
   layout$paper_bgcolor <- toRGB(theme.pars$plot.background$fill)
-
+  
   ## Legend.
   layout$margin$r <- 10
   layout$legend <- list(bordercolor="transparent", x=100, y=1/2)
-
+  
   trace.list$kwargs <- list(layout=layout)
   trace.list
 }
@@ -409,41 +418,41 @@ layer2traces <- function(l, d, misc){
     ## {"bar":"foo"}
     names(g$params[[p.name]]) <- NULL
   }
-
+  
   ## Convert complex ggplot2 geoms so that they are treated as special
   ## cases of basic geoms. In ggplot2, this processing is done in the
   ## draw method of the geoms.
-
+  
   ## Every plotly trace has one of these types
   ## type=scatter,bar,box,histogramx,histogram2d,heatmap
-
+  
   ## for type=scatter, you can define
   ## mode=none,markers,lines,lines+markers where "lines" is the
   ## default for 20 or more points, "lines+markers" is the default for
   ## <20 points. "none" is useful mainly if fill is used to make area
   ## plots with no lines.
-
+  
   ## marker=list(size,line,color="rgb(54,144,192)",opacity,symbol)
-
+  
   ## 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)){
     g
   }else{
     convert(g)
   }
-
+  
   ## Then split on visual characteristics that will get different
   ## legend entries.
   data.list <- if(basic$geom %in% names(markLegends)){
     mark.names <- markLegends[[basic$geom]]
     ## However, continuously colored points are an exception: they do
     ## not need a legend entry, and they can be efficiently rendered
     ## using just 1 trace.
-
+    
     ## Maybe it is nice to show a legend for continuous points?
     ## if(basic$geom == "point"){
     ##   to.erase <- names(misc$is.continuous)[misc$is.continuous]
@@ -472,7 +481,7 @@ layer2traces <- function(l, d, misc){
     data.list <- structure(list(list(data=basic$data, params=basic$params)),
                            names=basic$params$name)
   }
-
+  
   getTrace <- geom2trace[[basic$geom]]
   if(is.null(getTrace)){
     stop("conversion not implemented for geom_",

R/plotly.R

@@ -94,7 +94,7 @@ plotly <- function(username=NULL, key=NULL){
       w <- if(is.null(options[["width"]])) "600" else options[["width"]]
       h <- if(is.null(options[["height"]])) "600" else options[["height"]]
       paste("<iframe height=\"", h, "\" id=\"igraph\" scrolling=\"no\" seamless=\"seamless\"\n\t\t\t\tsrc=\"", 
-            options[["url"]], "\" width=\"", w, "\"></iframe>", sep = "")
+            options[["url"]], "\" width=\"", w, "\" frameBorder=\"0\"></iframe>", sep = "")
     }
   }
   pub$plotly <- function(..., kwargs = list(filename = NULL, fileopt = NULL)) {

inst/tests/test-ggplot-bar.R

@@ -9,7 +9,7 @@ researchers <-
 gg <- ggplot(researchers, aes(country, papers, fill=field))
 
 test_that("position_dodge is translated to barmode=group", {
-  gg.dodge <- gg+geom_bar(stat="identity", position="dodge")
+  gg.dodge <- gg + geom_bar(stat="identity", position="dodge")
   L <- gg2list(gg.dodge)
   expect_equal(length(L), 3)
   trace.names <- sapply(L[1:2], "[[", "name")
@@ -18,17 +18,17 @@ test_that("position_dodge is translated to barmode=group", {
 })
 
 test_that("position_stack is translated to barmode=stack", {
-  gg.stack <- gg+geom_bar(stat="identity", position="stack")
-  gg2list(gg.stack)
+  gg.stack <- gg + geom_bar(stat="identity", position="stack")
+  L <- gg2list(gg.stack)
   expect_equal(length(L), 3)
   trace.names <- sapply(L[1:2], "[[", "name")
   expect_true(all(c("Math", "Bio") %in% trace.names))
   expect_identical(L$kwargs$layout$barmode, "stack")
 })
 
 test_that("position_identity is translated to barmode=overlay", {
-  gg.identity <- gg+geom_bar(stat="identity", position="identity")
-  gg2list(gg.identity)
+  gg.identity <- gg + geom_bar(stat="identity", position="identity")
+  L <- gg2list(gg.identity)
   expect_equal(length(L), 3)
   trace.names <- sapply(L[1:2], "[[", "name")
   expect_true(all(c("Math", "Bio") %in% trace.names))