From 4d78a9f19eb038715a8e3907780b895f5b24fe88 Mon Sep 17 00:00:00 2001
From: Alexander Rose <alexander.rose@weirdbyte.de>
Date: Tue, 27 Nov 2018 00:46:38 -0800
Subject: [PATCH] added Color.toRgbString
---
src/mol-plugin/ui/controls/parameters.tsx | 2 +-
src/mol-util/color/color.ts | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/mol-plugin/ui/controls/parameters.tsx b/src/mol-plugin/ui/controls/parameters.tsx
index b1a8775dd..11a06d873 100644
--- a/src/mol-plugin/ui/controls/parameters.tsx
+++ b/src/mol-plugin/ui/controls/parameters.tsx
@@ -174,7 +174,7 @@ function ColorOptions() {
function ColorValueOption(color: Color) {
return !ColorNamesValueMap.has(color) ? <option key={Color.toHexString(color)} value={color} style={{ background: `${Color.toStyle(color)}` }} >
- {Color.toHexString(color)}
+ {Color.toRgbString(color)}
</option> : null
}
diff --git a/src/mol-util/color/color.ts b/src/mol-util/color/color.ts
index 9fd800b4b..3a1d24347 100644
--- a/src/mol-util/color/color.ts
+++ b/src/mol-util/color/color.ts
@@ -18,6 +18,10 @@ export namespace Color {
return '0x' + ('000000' + hexColor.toString(16)).slice(-6)
}
+ export function toRgbString(hexColor: Color) {
+ return `RGB: ${Color.toRgb(hexColor).join(', ')}`
+ }
+
export function toRgb(hexColor: Color) {
return [ hexColor >> 16 & 255, hexColor >> 8 & 255, hexColor & 255 ]
}
--
GitLab