From 430eff958c7c5d79f072ffcf8e6e9f53a233e8e9 Mon Sep 17 00:00:00 2001 From: Admin Date: Wed, 28 Jun 2017 16:02:45 -0500 Subject: [PATCH] Updateing color translation --- .../bwssystems/HABridge/hue/ColorDecode.java | 7 +- .../com/bwssystems/HABridge/hue/ColorMap.java | 75 +++++++++++++++++++ 2 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/bwssystems/HABridge/hue/ColorMap.java diff --git a/src/main/java/com/bwssystems/HABridge/hue/ColorDecode.java b/src/main/java/com/bwssystems/HABridge/hue/ColorDecode.java index 2832fdf..03439ae 100644 --- a/src/main/java/com/bwssystems/HABridge/hue/ColorDecode.java +++ b/src/main/java/com/bwssystems/HABridge/hue/ColorDecode.java @@ -79,13 +79,14 @@ public class ColorDecode { g = 0; if(b < 0.0) b = 0; - r = Math.round(r * 255); - g = Math.round(g * 255); - b = Math.round(b * 255); + rgb = new ArrayList(); rgb.add(0, r); rgb.add(1, g); rgb.add(2, b); + rgb.add(3, Math.round(r * 255)); + rgb.add(4, Math.round(g * 255)); + rgb.add(5, Math.round(b * 255)); return rgb; } diff --git a/src/main/java/com/bwssystems/HABridge/hue/ColorMap.java b/src/main/java/com/bwssystems/HABridge/hue/ColorMap.java new file mode 100644 index 0000000..3460bb3 --- /dev/null +++ b/src/main/java/com/bwssystems/HABridge/hue/ColorMap.java @@ -0,0 +1,75 @@ +package com.bwssystems.HABridge.hue; + +public class ColorMap { + private double red; + private double green; + private double blue; + private long R; + private long G; + private long B; + private double X; + private double Y; + private Double Z; + private double z; + public double getRed() { + return red; + } + public void setRed(double red) { + this.red = red; + } + public double getGreen() { + return green; + } + public void setGreen(double green) { + this.green = green; + } + public double getBlue() { + return blue; + } + public void setBlue(double blue) { + this.blue = blue; + } + public long getR() { + return R; + } + public void setR(long r) { + R = r; + } + public long getG() { + return G; + } + public void setG(long g) { + G = g; + } + public long getB() { + return B; + } + public void setB(long b) { + B = b; + } + public double getX() { + return X; + } + public void setX(double x) { + X = x; + } + public double getY() { + return Y; + } + public void setY(double y) { + Y = y; + } + public Double getZ() { + return Z; + } + public void setZ(Double z) { + Z = z; + } + public double getz() { + return z; + } + public void setz(double z) { + this.z = z; + } + +}