Revert "ggplot: line styles and width"

.gitignore

@@ -4,4 +4,4 @@ Rapp.history
 *~
 .Rhistory
 .RData
-Makefile
+Makefile

NEWS

@@ -1,7 +1,3 @@
-0.5.6 -- 25 October 2014.
-
-Lines: fix styles and enhanced conversion.
-
 0.5.5 -- 24 October 2014.
 
 Support category histograms (with factors).

R/ggplotly.R

@@ -11,29 +11,30 @@ marker.defaults <- list(alpha=1,
                         sizeref=default.marker.sizeref,
                         sizemode="area",
                         colour="black")
-
-line.defaults <- list(linetype="solid",
-                      colour="black",
-                      size=1,
-                      direction="linear")
+line.defaults <-
+  list(linetype="solid",
+       colour="black",
+       size=2,
+       direction="linear")
 
 # Convert R lty line type codes to plotly "dash" codes.
 lty2dash <- c(numeric.lty, named.lty, coded.lty)
 
-aesConverters <- list(linetype=function(lty) {
-                        lty2dash[as.character(lty)]
-                      },
-                      colour=function(col) {
-                        toRGB(col)
-                      },
-                      size=identity,
-                      sizeref=identity,
-                      sizemode=identity,
-                      alpha=identity,
-                      shape=function(pch) {
-                        pch2symbol[as.character(pch)]
-                      },
-                      direction=identity)
+aesConverters <-
+  list(linetype=function(lty){
+         lty2dash[as.character(lty)]
+       },
+       colour=function(col){
+         toRGB(col)
+       },
+       size=identity,
+       sizeref=identity,
+       sizemode=identity,
+       alpha=identity,
+       shape=function(pch){
+         pch2symbol[as.character(pch)]
+       },
+       direction=identity)
 
 markLegends <-
   ## NOTE: Do we also want to split on size?

R/marker_conversion.R

@@ -5,17 +5,14 @@
 ##' @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/one_to_one_corr.R

@@ -50,22 +50,21 @@ aes2marker <- c(alpha="opacity",
                 shape="symbol")
 
 # Convert numeric line type.
-numeric.lty <- c("0"="none",
-                 "1"="solid",
+numeric.lty <- c("1"="solid",
                  "2"="dash",
                  "3"="dot",
                  "4"="dashdot",
                  "5"="longdash",
                  "6"="longdashdot")
 
 # Convert named line type.
-named.lty <- c("blank"="none",
-               "solid"="solid",
+named.lty <- c("solid"="solid",
+               "blank"="none",
                "dashed"="dash",
-               "dotted"="dot",
+               "dotted"="dotted",
                "dotdash"="dashdot",
                "longdash"="longdash",
-               "twodash"="longdashdot")
+               "twodash"="dash")
 
 # Convert coded line type.
 coded.lty <- c("22"="dash",

R/trace_generation.R

@@ -359,7 +359,7 @@ group2NA <- function(g, geom){
 
 # Convert basic geoms to traces.
 geom2trace <- list(
-  path=function(data, params) {
+  path=function(data, params){
     list(x=data$x,
          y=data$y,
          name=params$name,
@@ -487,13 +487,13 @@ geom2trace <- list(
     L
   },
   density=function(data, params) {
-    list(x=data$x,
-         name=params$name,
-         text=data$text,
-         marker=list(color=toRGB(params$fill)),
-         type="histogram",
-         autobinx=TRUE,
-         histnorm="probability density")
+    L <- 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,