Multiplier to paramORdefault()

Author: pedrodz

R/marker_conversion.R

@@ -5,14 +5,17 @@
 ##' @export
 ##' @return named list.
 ##' @author Toby Dylan Hocking
-paramORdefault <- function(params, aesVec, defaults){
+paramORdefault <- function(params, aesVec, defaults) {
   marker <- list()
   for(ggplot.name in names(aesVec)){
     plotly.name <- aesVec[[ggplot.name]]
     ggplot.value <- params[[ggplot.name]]
     if(is.null(ggplot.value)){
       ggplot.value <- defaults[[ggplot.name]]
     }
+    if(plotly.name=="width"){
+      ggplot.value <- ggplot.value * 2
+    }
     if(is.null(ggplot.value)){
       stop("no ggplot default for ", ggplot.name)
     }

R/trace_generation.R

@@ -359,28 +359,24 @@ group2NA <- function(g, geom){
 # Convert basic geoms to traces.
 geom2trace <- list(
   path=function(data, params) {
-    L <- list(x=data$x,
-              y=data$y,
-              name=params$name,
-              text=data$text,
-              type="scatter",
-              mode="lines",
-              line=paramORdefault(params, aes2line, line.defaults))
-    L$line$width <- L$line$width * 2
-    L
+    list(x=data$x,
+         y=data$y,
+         name=params$name,
+         text=data$text,
+         type="scatter",
+         mode="lines",
+         line=paramORdefault(params, aes2line, line.defaults))
   },
   polygon=function(data, params){
-    L <- list(x=c(data$x, data$x[1]),
-              y=c(data$y, data$y[1]),
-              name=params$name,
-              text=data$text,
-              type="scatter",
-              mode="lines",
-              line=paramORdefault(params, aes2line, line.defaults),
-              fill="tonextx",
-              fillcolor=toRGB(params$fill))
-    L$line$width <- L$line$width * 2
-    L
+    list(x=c(data$x, data$x[1]),
+         y=c(data$y, data$y[1]),
+         name=params$name,
+         text=data$text,
+         type="scatter",
+         mode="lines",
+         line=paramORdefault(params, aes2line, line.defaults),
+         fill="tonextx",
+         fillcolor=toRGB(params$fill))
   },
   point=function(data, params){
     L <- list(x=data$x,
@@ -456,14 +452,12 @@ geom2trace <- list(
     L
   },
   step=function(data, params) {
-    L <- list(x=data$x,
-              y=data$y,
-              name=params$name,
-              type="scatter",
-              mode="lines",
-              line=paramORdefault(params, aes2line, line.defaults))
-    L$line$width <- L$line$width * 2
-    L
+    list(x=data$x,
+         y=data$y,
+         name=params$name,
+         type="scatter",
+         mode="lines",
+         line=paramORdefault(params, aes2line, line.defaults))
   },
   tile=function(data, params) {
     list(x=unique(data$x),
@@ -488,26 +482,24 @@ geom2trace <- list(
               name=params$name,
               type="contour",
               line=paramORdefault(params, aes2line, line.defaults))
-    L$line$width <- L$line$width * 2
     L$contours=list(coloring="lines")
     L
   },
   density=function(data, params) {
-    L <- list(x=data$x,
-              name=params$name,
-              text=data$text,
-              marker=list(color=toRGB(params$fill)),
-              type="histogram",
-              autobinx=TRUE,
-              histnorm="probability density")
+    list(x=data$x,
+         name=params$name,
+         text=data$text,
+         marker=list(color=toRGB(params$fill)),
+         type="histogram",
+         autobinx=TRUE,
+         histnorm="probability density")
   },
   density2d=function(data, params) {
     L <- list(x=data$x,
               y=data$y,
               name=params$name,
               type="histogram2dcontour",
               line=paramORdefault(params, aes2line, line.defaults))
-    L$line$width <- L$line$width * 2
     L$contours=list(coloring="lines")
     L
   },
@@ -539,34 +531,28 @@ geom2trace <- list(
          fill="tonexty")
   },
   abline=function(data, params) {
-    L <- list(x=c(params$xstart, params$xend),
-              y=c(params$intercept + params$xstart * params$slope,
-                  params$intercept + params$xend * params$slope),
-              name=params$name,
-              type="scatter",
-              mode="lines",
-              line=paramORdefault(params, aes2line, line.defaults))
-    L$line$width <- L$line$width * 2
-    L
+    list(x=c(params$xstart, params$xend),
+         y=c(params$intercept + params$xstart * params$slope,
+             params$intercept + params$xend * params$slope),
+         name=params$name,
+         type="scatter",
+         mode="lines",
+         line=paramORdefault(params, aes2line, line.defaults))
   },
   hline=function(data, params) {
-    L <- list(x=c(params$xstart, params$xend),
+    list(x=c(params$xstart, params$xend),
          y=c(data$yintercept, data$yintercept),
          name=params$name,
          type="scatter",
          mode="lines",
          line=paramORdefault(params, aes2line, line.defaults))
-    L$line$width <- L$line$width * 2
-    L
   },
   vline=function(data, params) {
-    L <- list(x=c(data$xintercept, data$xintercept),
-              y=c(params$ystart, params$yend),
-              name=params$name,
-              type="scatter",
-              mode="lines",
-              line=paramORdefault(params, aes2line, line.defaults))
-    L$line$width <- L$line$width * 2
-    L
+    list(x=c(data$xintercept, data$xintercept),
+         y=c(params$ystart, params$yend),
+         name=params$name,
+         type="scatter",
+         mode="lines",
+         line=paramORdefault(params, aes2line, line.defaults))
   }
 )