H S V properties in Color

diff --git a/src/Colors.cs b/src/Colors.cs
index 66d2613ab5d3ec08361af6c3dfcf4d68cc90e9d9..f07be894580e25c42d43dcba56422827b66dde23 100644 (file)
--- a/src/Colors.cs
+++ b/src/Colors.cs
@@ -34,21 +34,21 @@ namespace Crow
                        B = _B;
                        Name = _name;
                        ColorDic.Add(this);
-               }        
+               }
                #endregion
 
                public static List<Color> ColorDic = new List<Color>();
 
-        internal string Name;   
+               internal string Name;
 
                #region public fields
         public double A;
         public double R;
         public double G;
-        public double B;        
+               public double B;
                #endregion
 
-               #region Operators       
+               #region Operators
         public static implicit operator string(Color c)
         {
             return c.ToString();
@@ -72,7 +72,7 @@ namespace Crow
                                double.Parse(c[0]),
                                double.Parse(c[1]),
                                double.Parse(c[2]),
-                               double.Parse(c[3]));                    
+                               double.Parse(c[3]));
                }
 
 //             public static implicit operator OpenTK.Vector4(Color c)
@@ -131,6 +131,50 @@ namespace Crow
                #endregion
 
 
+               public double Hue {
+                       get {
+                               double min = Math.Min (R, Math.Min (G, B));     //Min. value of RGB
+                               double max = Math.Max (R, Math.Max (G, B));     //Max. value of RGB
+                               double diff = max - min;                                                        //Delta RGB value
+
+                               if ( diff == 0 )//This is a gray, no chroma...
+                                       return 0;
+
+                               double h = 0.0, s = diff / max;
+
+                               double diffR = (((max - R) / 6.0) + (diff / 2.0)) / diff;
+                               double diffG = (((max - G) / 6.0) + (diff / 2.0)) / diff;
+                               double diffB = (((max - B) / 6.0) + (diff / 2.0)) / diff;
+
+                               if (R == max)
+                                       h = diffB - diffG;
+                               else if (G == max)
+                                       h = (1.0 / 3.0) + diffR - diffB;
+                               else if (B == max)
+                                       h = (2.0 / 3.0) + diffG - diffR;
+
+                               if (h < 0)
+                                       h += 1;
+                               if (h > 1)
+                                       h -= 1;
+
+                               return h;
+                       }
+               }
+               public double Saturation {
+                       get {
+                               return Math.Max (R, Math.Max (G, B));   //Max. value of RGB
+                       }
+               }
+               public double Value {
+                       get {
+                               double min = Math.Min (R, Math.Min (G, B));     //Min. value of RGB
+                               double max = Math.Max (R, Math.Max (G, B));     //Max. value of RGB
+                               double diff = max - min;                                                        //Delta RGB value
+                               return diff == 0 ? 0 : diff / max;
+                       }
+               }
+
                public float[] floatArray
                {
                        get { return new float[]{ (float)R, (float)G, (float)B, (float)A }; }
@@ -142,7 +186,7 @@ namespace Crow
                public void ResetName(){
                        Name = "";
                }
-                       
+
                #region Predefined colors
         public static readonly Color Transparent = new Color(0, 0, 0, 0, "Transparent");
                public static readonly Color Clear = new Color(-1, -1, -1, -1, "Clear");
@@ -1013,14 +1057,14 @@ namespace Crow
                public static readonly Color Zaffre = new Color(0,0.0784313725490196,0.658823529411765,1.0,"Zaffre");
                public static readonly Color ZinnwalditeBrown = new Color(0.172549019607843,0.0862745098039216,0.0313725490196078,1.0,"ZinnwalditeBrown");
                #endregion
-                       
+
                #region IXmlSerializable
                public void ReadXml(System.Xml.XmlReader reader)
         {
-            string[] c = reader["Color"].Split(new char[] { ',' });            
-            R = double.Parse(c[0]);
-            G = double.Parse(c[1]);
-            B = double.Parse(c[2]);
+                       string[] c = reader["Color"].Split(new char[] { ',' });
+                       R = double.Parse(c[0]);
+                       G = double.Parse(c[1]);
+                       B = double.Parse(c[2]);
                        A = double.Parse(c[3]);
         }
         public void WriteXml(System.Xml.XmlWriter writer)
@@ -1073,9 +1117,10 @@ namespace Crow
         {
             return (Color)s;
         }
-               public static Color FromHSV(double _h, double _v = 1.0, double _s = 1.0){
+               public static Color FromHSV(double _h, double _v = 1.0, double _s = 1.0, double _alpha = 1.0){
                        Color c = Color.Black;
                        c.ResetName ();
+                       c.A = _alpha;
                        if (_s == 0) {//HSV from 0 to 1
                                c.R = _v;
                                c.G = _v;

diff --git a/src/GraphicObjects/ColorPicker.cs b/src/GraphicObjects/ColorPicker.cs
index 57f9610df7c5721f3bd6535391a7f8ae7af36ff1..aa2a25be785d9c746d7fc196fb4bfd34ac162f56 100644 (file)
--- a/src/GraphicObjects/ColorPicker.cs
+++ b/src/GraphicObjects/ColorPicker.cs
@@ -41,7 +41,7 @@ namespace Crow
                        get { return Math.Round(curColor.R * div); }
                        set {
                                if (R == value)
-                                       return;                         
+                                       return;
                                curColor.R = value * colDiv;
                                NotifyValueChanged ("R", R);
                                hsvFromRGB ();
@@ -122,10 +122,14 @@ namespace Crow
                public virtual Fill SelectedColor {
                        get { return new SolidColor(curColor); }
                        set {
-                               Color c = (value as SolidColor).color;
-                               if (curColor == c)
-                                       return;
-                               curColor = c;
+                               if (value == null)
+                                       curColor = default(Color);
+                               else if (value is SolidColor) {
+                                       Color c = (value as SolidColor).color;
+                                       if (curColor == c)
+                                               return;
+                                       curColor = c;
+                               }
                                notifyCurColorHasChanged ();
                                notifyRGBAHasChanged ();
                                hsvFromRGB ();
@@ -134,7 +138,7 @@ namespace Crow
                [XmlAttributeAttribute]
                public virtual Color SelectedRawColor {
                        get { return curColor; }
-                       set {                           
+                       set {
                                if (curColor == value)
                                        return;
                                curColor = value;
@@ -177,7 +181,7 @@ namespace Crow
                        {
                                h = 0;
                                s = 0;
-                       }else{//Chromatic data...                               
+                       }else{//Chromatic data...
                                s = diff / max;
 
                                double diffR = (((max - c.R) / 6.0) + (diff / 2.0)) / diff;
@@ -200,34 +204,7 @@ namespace Crow
                        notifyHSVHasChanged ();
                }
                void rgbFromHSV(){
-                       Color c = Color.Black;
-                       c.ResetName ();
-                       if (s == 0) {//HSV from 0 to 1
-                               c.R = v;
-                               c.G = v;
-                               c.B = v;
-                       }else{
-                               double var_h = h * 6.0;
-
-                               if (var_h == 6.0)
-                                       var_h = 0;      //H must be < 1
-                               double var_i = Math.Floor( var_h );     //Or ... var_i = floor( var_h )
-                               double var_1 = v * ( 1.0 - s );
-                               double var_2 = v * (1.0 - s * (var_h - var_i));
-                               double var_3 = v * (1.0 - s * (1.0 - (var_h - var_i)));
-
-                               if (var_i == 0.0) {
-                                       c.R = v;
-                                       c.G = var_3;
-                                       c.B = var_1;
-                               }else if ( var_i == 1.0 ) { c.R = var_2 ; c.G = v     ; c.B = var_1; }
-                               else if ( var_i == 2 ) { c.R = var_1 ; c.G = v     ; c.B = var_3; }
-                               else if ( var_i == 3 ) { c.R = var_1 ; c.G = var_2 ; c.B = v;     }
-                               else if ( var_i == 4 ) { c.R = var_3 ; c.G = var_1 ; c.B = v;    }
-                               else                   { c.R = v     ; c.G = var_1 ; c.B = var_2; }
-                       }
-                               
-                       curColor = c;
+                       curColor = Color.FromHSV (h, v, s, curColor.A);
                        notifyCurColorHasChanged ();
                        notifyRGBAHasChanged ();
                }