Windows - Updated the project so it can now read colorset files in versions 1.2.

Author: macmade

ColorSetKit-Test/Test.cs

@@ -39,7 +39,7 @@ public void TestInitWithPath()
             string path  = System.IO.Path.Combine( System.IO.Path.GetDirectoryName( Assembly.GetExecutingAssembly().Location ), "Colors.colorset" );
             ColorSet set = new ColorSet( path );
 
-            Assert.IsTrue( set.Count > 0 );
+            Assert.IsTrue( set.Colors.Count > 0 );
         }
 
         [TestMethod]
@@ -49,13 +49,13 @@ public void TestInitWithData()
             Data data    = new Data( path );
             ColorSet set = new ColorSet( data );
 
-            Assert.IsTrue( set.Count > 0 );
+            Assert.IsTrue( set.Colors.Count > 0 );
         }
 
         [TestMethod]
         public void TestShared()
         {
-            Assert.AreEqual( ColorSet.Shared.Count, 2 );
+            Assert.AreEqual( ColorSet.Shared.Colors.Count, 2 );
 
             Assert.IsTrue( ColorSet.Shared[ "NoVariant" ] != null );
             Assert.IsTrue( ColorSet.Shared[ "Variant" ] != null );
@@ -169,7 +169,7 @@ public void TestCreate()
 
             set = new ColorSet( set.Data );
 
-            Assert.AreEqual( set.Count, 2 );
+            Assert.AreEqual( set.Colors.Count, 2 );
 
             Assert.IsTrue( set[ "NoVariant" ] != null );
             Assert.IsTrue( set[ "Variant" ] != null );

ColorSetKit/ColorPair.cs

@@ -44,6 +44,12 @@ public SolidColorBrush Variant
             set;
         }
 
+        public List< LightnessPair > Lightnesses
+        {
+            get;
+            set;
+        }
+
         public ColorPair(): this( null )
         {}
 
@@ -52,8 +58,9 @@ public ColorPair( SolidColorBrush color ): this( color, null )
 
         public ColorPair( SolidColorBrush color, SolidColorBrush variant )
         {
-            this.Color   = color;
-            this.Variant = variant;
+            this.Color       = color;
+            this.Variant     = variant;
+            this.Lightnesses = new List< LightnessPair >();
         }
     }
 }

ColorSetKit/ColorSet.cs

@@ -34,6 +34,8 @@ namespace ColorSetKit
     public partial class ColorSet
     {
         private static readonly ulong  Magic          = 0x434F4C4F52534554;
+        private static readonly uint   Major          = 1;
+        private static readonly uint   Minor          = 2;
         private static ColorSet        SharedInstance = null;
         private static readonly object SharedLock     = new object();
 
@@ -76,7 +78,7 @@ public static ColorSet Shared
             }
         }
 
-        private Dictionary< string, ColorPair > Colors
+        private Dictionary< string, ColorPair > ColorPairs
         {
             get;
             set;
@@ -96,13 +98,23 @@ private object Lock
         }
         = new object();
 
-        public int Count
+        public Dictionary< string, ColorPair > Colors
         {
             get
             {
                 lock( this.Lock )
                 {
-                    return this.Colors.Count;
+                    Dictionary< string, ColorPair > colors = new Dictionary< string, ColorPair >();
+
+                    foreach( KeyValuePair< string, ColorPair > p in this.ColorPairs )
+                    {
+                        if( this.ColorNamed( p.Key ) is ColorPair color )
+                        {
+                            colors[ p.Key ] = color;
+                        }
+                    }
+
+                    return colors;
                 }
             }
         }
@@ -127,13 +139,20 @@ public ColorSet( Data data )
                 return;
             }
 
-            if( stream.ReadUInt32() == 0 )
+            uint major = stream.ReadUInt32();
+
+            if( major == 0 )
             {
                 return;
             }
 
-            stream.ReadUInt32();
+            uint minor = stream.ReadUInt32();
 
+            if( major > Major || minor > Minor )
+            {
+                return;
+            }
+            
             ulong n = stream.ReadUInt64();
 
             for( ulong i = 0; i < n; i++ )
@@ -155,7 +174,26 @@ public ColorSet( Data data )
                     return;
                 }
 
-                this.Add( color, ( hasVariant ) ? variant : null, name );
+                List< LightnessPair > lightnesses = new List< LightnessPair >();
+
+                if( major > 1 || minor > 1 )
+                {
+                    ulong nn = stream.ReadUInt64();
+
+                    for( ulong j = 0; j < nn; j++ )
+                    {
+                        LightnessPair p = new LightnessPair();
+
+                        p.Lightness1.Lightness = stream.ReadDouble();
+                        p.Lightness1.Name      = stream.ReadString() ?? "";
+                        p.Lightness2.Lightness = stream.ReadDouble();
+                        p.Lightness2.Name      = stream.ReadString() ?? "";
+
+                        lightnesses.Add( p );
+                    }
+                }
+
+                this.Add( color, ( hasVariant ) ? variant : null, lightnesses, name );
             }
         }
 
@@ -168,9 +206,9 @@ public ColorPair ColorNamed( string name )
         {
             lock( this.Lock )
             {
-                if( this.Colors.ContainsKey( name ) )
+                if( this.ColorPairs.ContainsKey( name ) )
                 {
-                    return this.Colors[ name ];
+                    return this.ColorPairs[ name ];
                 }
 
                 foreach( ColorSet child in this.Children )
@@ -210,17 +248,27 @@ public void Set( SolidColorBrush color, string name )
         }
 
         public void Add( SolidColorBrush color, SolidColorBrush variant, string name )
+        {
+            this.Add( color, variant, null, name );
+        }
+        
+        public void Set( SolidColorBrush color, SolidColorBrush variant, string name )
+        {
+            this.Set( color, variant, null, name );
+        }
+
+        public void Add( SolidColorBrush color, SolidColorBrush variant, List< LightnessPair > lightnesses, string name )
         {
             lock( this.Lock )
             {
-                if( this.Colors.ContainsKey( name ) == false )
+                if( this.ColorPairs.ContainsKey( name ) == false )
                 {
-                    this.Set( color, variant, name );
+                    this.Set( color, variant, lightnesses, name );
                 }
             }
         }
 
-        public void Set( SolidColorBrush color, SolidColorBrush variant, string name )
+        public void Set( SolidColorBrush color, SolidColorBrush variant, List< LightnessPair > lightnesses, string name )
         {
             if( name == null )
             {
@@ -229,15 +277,19 @@ public void Set( SolidColorBrush color, SolidColorBrush variant, string name )
 
             lock( this.Lock )
             {
-                this.Colors[ name ] = new ColorPair( color, variant );
+                ColorPair p = new ColorPair( color, variant )
+                {
+                    Lightnesses = lightnesses ?? new List< LightnessPair >()
+                };
+                this.ColorPairs[ name ] = p;
             }
         }
 
         public Data Data
         {
             get
             {
-                Dictionary< string, ColorPair > colors = this.Colors;
+                Dictionary< string, ColorPair > colors = this.ColorPairs;
                 ColorSetStream                  stream = new ColorSetStream();
                 System.Windows.Media.Color clear       = new System.Windows.Media.Color
                 {
@@ -247,17 +299,29 @@ public Data Data
                     A = 0
                 };
 
-                stream += Magic;                     /* COLORSET */
-                stream += ( uint )1;                 /* Major */
-                stream += ( uint )0;                 /* Minor */
-                stream += ( ulong )( colors.Count ); /* Count */
+                stream += Magic;
+                stream += Major;
+                stream += Minor;
+                stream += ( ulong )( colors.Count );
 
                 foreach( KeyValuePair< string, ColorPair > p in colors )
                 {
                     stream += p.Key;
                     stream += p.Value.Variant != null;
                     stream += p.Value.Color   ?? new SolidColorBrush( clear );
                     stream += p.Value.Variant ?? new SolidColorBrush( clear );
+                    stream += ( ulong )( p.Value.Lightnesses?.Count ?? 0 );
+
+                    foreach( LightnessPair lp in p.Value.Lightnesses )
+                    {
+                        LightnessVariant l1 = lp.Lightness1 ?? new LightnessVariant();
+                        LightnessVariant l2 = lp.Lightness2 ?? new LightnessVariant();
+
+                        stream += l1.Lightness;
+                        stream += l1.Name ?? "";
+                        stream += l2.Lightness;
+                        stream += l2.Name ?? "";
+                    }
                 }
 
                 return stream.Data;

ColorSetKit/ColorSetKit.csproj

@@ -49,6 +49,8 @@
     <Compile Include="ColorSet.cs" />
     <Compile Include="ColorSetStream.cs" />
     <Compile Include="Data.cs" />
+    <Compile Include="LightnessPair.cs" />
+    <Compile Include="LightnessVariant.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

ColorSetKit/LightnessPair.cs

@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * The MIT License (MIT)
+ * 
+ * Copyright (c) 2018 Jean-David Gadina - www.imazing.com
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ ******************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Media;
+
+namespace ColorSetKit
+{
+    public partial class LightnessPair
+    {
+        public LightnessVariant Lightness1
+        {
+            get;
+            set;
+        }
+
+        public LightnessVariant Lightness2
+        {
+            get;
+            set;
+        }
+
+        public LightnessPair()
+        {
+            this.Lightness1 = new LightnessVariant();
+            this.Lightness2 = new LightnessVariant();
+        }
+    }
+}

ColorSetKit/LightnessVariant.cs

@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * The MIT License (MIT)
+ * 
+ * Copyright (c) 2018 Jean-David Gadina - www.imazing.com
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ ******************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Media;
+
+namespace ColorSetKit
+{
+    public partial class LightnessVariant
+    {
+        public double Lightness
+        {
+            get;
+            set;
+        }
+
+        public string Name
+        {
+            get;
+            set;
+        }
+
+        public LightnessVariant()
+        {
+            this.Lightness = 0;
+            this.Name      = "";
+        }
+    }
+}