Rgb to hsv

Changed files (2)

• modified libbirdfont/Color.vala
• modified libbirdfont/ColorPicker.vala

Diff

diff --git a/libbirdfont/Color.vala b/libbirdfont/Color.valaindex 4a1f8e8..0924b59 100644--- a/libbirdfont/Color.vala+++ b/libbirdfont/Color.vala@@ -102,6 +102,69 @@ public class Color { 		} 	} +	public void to_hsva (out double h, out double s, out double v, out double a) {+		double red, green, blue;+		double min, max;+		double delta;++		a = this.a;+		+		red = r;+		green = g;+		blue = b;++		h = 0.0;++		if (red > green) {+			if (red > blue)+				max = red;+			else+				max = blue;++			if (green < blue)+				min = green;+			else+				min = blue;+		} else {+			if (green > blue)+				max = green;+			else+				max = blue;++			if (red < blue)+				min = red;+			else+				min = blue;+		}++		v = max;++		if (max != 0.0)+			s = (max - min) / max;+		else+			s = 0.0;++		if (s == 0.0)+			h = 0.0;+		else {+			delta = max - min;++			if (red == max)+				h = (green - blue) / delta;+			else if (green == max)+				h = 2 + (blue - red) / delta;+			else if (blue == max)+				h = 4 + (red - green) / delta;++			h /= 6.0;++			if (h < 0.0)+				h += 1.0;+			else if (h > 1.0)+				h -= 1.0;+		}+	}+ 	public static Color black () { 		return new Color (0, 0, 0, 1); 	}diff --git a/libbirdfont/ColorPicker.vala b/libbirdfont/ColorPicker.valaindex 84dc0b7..dade593 100644--- a/libbirdfont/ColorPicker.vala+++ b/libbirdfont/ColorPicker.vala@@ -70,8 +70,7 @@ public class ColorPicker : Tool { 	} 	 	public void set_color (Color c) {-		c.get_hsba (out hue, out s, out b, out a);-		print (@"hue $hue s $s b $b a $a\n");+		c.to_hsva (out hue, out s, out b, out a); 	} 	 	public void set_color_from_pointer (double tx) {