convert color strings to hex code

jokergoo · Mar 16, 2022 · 7c42358 · 7c42358
1 parent 533ba37
commit 7c42358
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -129,6 +129,7 @@ importFrom("colorspace", hex2RGB)
 importFrom("colorspace", sRGB)
 importFrom("grDevices", "dev.cur", "dev.prev", "dev.set")
 importFrom("grDevices", "dev.off", "pdf")
+importFrom("grDevices", "hcl.colors")
 importFrom("grDevices", as.raster)
 importFrom("grDevices", col2rgb)
 importFrom("grDevices", rgb)

diff --git a/R/utils.R b/R/utils.R
@@ -270,7 +270,8 @@ as.degree = function(radian) {
 # == example
 # col_fun = colorRamp2(c(-1, 0, 1), c("green", "white", "red"))
 # col_fun(c(-2, -1, -0.5, 0, 0.5, 1, 2))
-colorRamp2 = function(breaks, colors, transparency = 0, space = "LAB", hcl_palette = NULL, reverse = FALSE) {
+colorRamp2 = function(breaks, colors, transparency = 0, space = "LAB", 
+    hcl_palette = NULL, reverse = FALSE) {
 
     breaks_o = breaks
     if(!is.null(hcl_palette)) {
@@ -599,6 +600,10 @@ col2value = function(r, g, b, col_fun) {
 
     n = length(r)
 
+    if(inherits(colors, "character")) {
+        colors = col2rgb(colors)
+    }
+
     ## convert all colors to the specified space
     m = coords(as(sRGB(r, g, b), space))
     breaks_m = coords(as(sRGB(colors), space))

diff --git a/man/colorRamp2.Rd b/man/colorRamp2.Rd
@@ -7,7 +7,8 @@ Color interpolation
 Color interpolation
 }
 \usage{
-colorRamp2(breaks, colors, transparency = 0, space = "LAB", hcl_palette = NULL, reverse = FALSE)
+colorRamp2(breaks, colors, transparency = 0, space = "LAB",
+    hcl_palette = NULL, reverse = FALSE)
 }
 \arguments{