From 860bfa4252e6e8ec72d28a6c4116c24d47b0529c Mon Sep 17 00:00:00 2001 From: Carson Sievert Date: Thu, 1 Nov 2018 16:58:19 -0500 Subject: [PATCH 1/2] use equally spaced grid of values when generating colorscale, closes #1308 --- R/plotly_build.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/plotly_build.R b/R/plotly_build.R index f4a1c443b6..7e4e8be296 100644 --- a/R/plotly_build.R +++ b/R/plotly_build.R @@ -775,7 +775,7 @@ map_color <- function(traces, stroke = FALSE, title = "", colorway, na.color = " colScale <- scales::col_numeric(pal, rng, na.color = na.color) # generate the colorscale to be shared across traces vals <- if (diff(rng) > 0) { - as.numeric(stats::quantile(allColor, probs = seq(0, 1, length.out = 25), na.rm = TRUE)) + seq(rng[1], rng[2], length.out = 25) } else { c(0, 1) } From 0c77f4615f30e2c1c6d45fdf6bc3a49203cdbf4f Mon Sep 17 00:00:00 2001 From: Carson Sievert Date: Mon, 5 Nov 2018 12:00:09 -0600 Subject: [PATCH 2/2] validate visual changes --- tests/figs/colorbar/plotly-colorbar-expand.svg | 2 +- tests/figs/colorbar/plotly-colorbar-restrict.svg | 2 +- tests/figs/colorbar/plotly-colorbar-z-expand.svg | 2 +- tests/figs/colorbar/plotly-colorbar-z-restrict.svg | 2 +- tests/figs/colorbar/plotly-colorbar.svg | 2 +- .../plotly-color-scatterplot-color-numeric-custom.svg | 2 +- .../plotly-color/plotly-color-scatterplot-color-numeric.svg | 2 +- tests/figs/plotly/plotly-alpha-blending.svg | 2 +- tests/figs/subplot/plotly-subplot-geo-cartesian.svg | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/figs/colorbar/plotly-colorbar-expand.svg b/tests/figs/colorbar/plotly-colorbar-expand.svg index 85325efef5..87cea07b89 100644 --- a/tests/figs/colorbar/plotly-colorbar-expand.svg +++ b/tests/figs/colorbar/plotly-colorbar-expand.svg @@ -1 +1 @@ -234544.555.566.577.5805101520cylwtcyl +234544.555.566.577.5805101520cylwtcyl diff --git a/tests/figs/colorbar/plotly-colorbar-restrict.svg b/tests/figs/colorbar/plotly-colorbar-restrict.svg index 8b0485f0ff..646ae9e118 100644 --- a/tests/figs/colorbar/plotly-colorbar-restrict.svg +++ b/tests/figs/colorbar/plotly-colorbar-restrict.svg @@ -1 +1 @@ -234544.555.566.577.5855.566.57cylwtcyl +234544.555.566.577.5855.566.57cylwtcyl diff --git a/tests/figs/colorbar/plotly-colorbar-z-expand.svg b/tests/figs/colorbar/plotly-colorbar-z-expand.svg index 92f01818e6..0ba47728f7 100644 --- a/tests/figs/colorbar/plotly-colorbar-z-expand.svg +++ b/tests/figs/colorbar/plotly-colorbar-z-expand.svg @@ -1 +1 @@ -0102030405060010203040506070800100200300volcano +0102030405060010203040506070800100200300volcano diff --git a/tests/figs/colorbar/plotly-colorbar-z-restrict.svg b/tests/figs/colorbar/plotly-colorbar-z-restrict.svg index e3e3a450b6..79caec7d37 100644 --- a/tests/figs/colorbar/plotly-colorbar-z-restrict.svg +++ b/tests/figs/colorbar/plotly-colorbar-z-restrict.svg @@ -1 +1 @@ -010203040506001020304050607080140145150155160volcano +010203040506001020304050607080140145150155160volcano diff --git a/tests/figs/colorbar/plotly-colorbar.svg b/tests/figs/colorbar/plotly-colorbar.svg index bb9477ebfa..e41406332f 100644 --- a/tests/figs/colorbar/plotly-colorbar.svg +++ b/tests/figs/colorbar/plotly-colorbar.svg @@ -1 +1 @@ -234544.555.566.577.5845678cylwtcyl +234544.555.566.577.5845678cylwtcyl diff --git a/tests/figs/plotly-color/plotly-color-scatterplot-color-numeric-custom.svg b/tests/figs/plotly-color/plotly-color-scatterplot-color-numeric-custom.svg index f97f69fdc8..8151baabb9 100644 --- a/tests/figs/plotly-color/plotly-color-scatterplot-color-numeric-custom.svg +++ b/tests/figs/plotly-color/plotly-color-scatterplot-color-numeric-custom.svg @@ -1 +1 @@ -567812345670.511.522.5Petal.WidthSepal.LengthPetal.Length +567812345670.511.522.5Petal.WidthSepal.LengthPetal.Length diff --git a/tests/figs/plotly-color/plotly-color-scatterplot-color-numeric.svg b/tests/figs/plotly-color/plotly-color-scatterplot-color-numeric.svg index 4e9af43eda..5f0328c945 100644 --- a/tests/figs/plotly-color/plotly-color-scatterplot-color-numeric.svg +++ b/tests/figs/plotly-color/plotly-color-scatterplot-color-numeric.svg @@ -1 +1 @@ -567812345670.511.522.5Petal.WidthSepal.LengthPetal.Length +567812345670.511.522.5Petal.WidthSepal.LengthPetal.Length diff --git a/tests/figs/plotly/plotly-alpha-blending.svg b/tests/figs/plotly/plotly-alpha-blending.svg index 2510a576d5..cda735635b 100644 --- a/tests/figs/plotly/plotly-alpha-blending.svg +++ b/tests/figs/plotly/plotly-alpha-blending.svg @@ -1 +1 @@ -−3−2−1012−2−10123trace 0trace 1−202rnorm(100) +−3−2−1012−2−10123trace 0trace 1−202rnorm(100) diff --git a/tests/figs/subplot/plotly-subplot-geo-cartesian.svg b/tests/figs/subplot/plotly-subplot-geo-cartesian.svg index 0b514c6383..4207056c79 100644 --- a/tests/figs/subplot/plotly-subplot-geo-cartesian.svg +++ b/tests/figs/subplot/plotly-subplot-geo-cartesian.svg @@ -1 +1 @@ -05k10k15k20k0200040006000012020406005101502040600501001500200k400kPopulationIncomeIlliteracyLife ExpMurderHS GradFrostArea0.20.40.60.8density +05k10k15k20k0200040006000012020406005101502040600501001500200k400kPopulationIncomeIlliteracyLife ExpMurderHS GradFrostArea0.20.40.60.8density