fix #286

cpsievert · cpsievert · commit 53e4aee58e86 · 2015-12-12T09:48:05.000-06:00
diff --git a/R/trace_generation.R b/R/trace_generation.R
@@ -354,10 +354,10 @@ toBasic <- list(
     group2NA(g, "path")
   },
   boxplot=function(g) {
-    # Preserve default colour values usign fill:
+    # Preserve default colour values using fill:
     if (!is.null(g$data$fill)) {
-      levels(g$prestats.data$fill) <- g$data$fill
-      g$prestats.data$fill <- as.character(g$prestats.data$fill)
+      g$prestats.data$fill <- NULL
+      g$prestats.data <- plyr::join(g$prestats.data, g$data[c("x", "fill")], by = "x")
     }
     g$data <- g$prestats.data
     g

Original file line number	Diff line number	Diff line change
`@@ -354,10 +354,10 @@ toBasic <- list(`
`354`	`354`	`group2NA(g, "path")`
`355`	`355`	`},`
`356`	`356`	`boxplot=function(g) {`
`357`		`- # Preserve default colour values usign fill:`
	`357`	`+ # Preserve default colour values using fill:`
`358`	`358`	`if (!is.null(g$data$fill)) {`
`359`		`- levels(g$prestats.data$fill) <- g$data$fill`
`360`		`- g$prestats.data$fill <- as.character(g$prestats.data$fill)`
	`359`	`+ g$prestats.data$fill <- NULL`
	`360`	`+ g$prestats.data <- plyr::join(g$prestats.data, g$data[c("x", "fill")], by = "x")`
`361`	`361`	`}`
`362`	`362`	`g$data <- g$prestats.data`
`363`	`363`	`g`