Inks Extension Support.

3 files changed, 540 insertions, 17 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/ColorMeasurement.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/ColorMeasurement.cs
new file mode 100644
index 000000000..f11849c1f
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/ColorMeasurement.cs
@@ -0,0 +1,357 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: ColorMeasurement.proto
+#pragma warning disable 1591, 0612, 3021
+#region Designer generated code
+
+using pb = global::Google.Protobuf;
+using pbc = global::Google.Protobuf.Collections;
+using pbr = global::Google.Protobuf.Reflection;
+using scg = global::System.Collections.Generic;
+namespace Tango.PMR.ColorLab {
+
+  /// <summary>Holder for reflection information generated from ColorMeasurement.proto</summary>
+  public static partial class ColorMeasurementReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for ColorMeasurement.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static ColorMeasurementReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "ChZDb2xvck1lYXN1cmVtZW50LnByb3RvEhJUYW5nby5QTVIuQ29sb3JMYWIi",
+            "agoQQ29sb3JNZWFzdXJlbWVudBIJCgFDGAEgASgBEgkKAU0YAiABKAESCQoB",
+            "WRgDIAEoARIJCgFLGAQgASgBEgkKAVYYBSABKAESCQoBTBgKIAEoARIJCgFB",
+            "GAsgASgBEgkKAUIYDCABKAFCHgocY29tLnR3aW5lLnRhbmdvLnBtci5jb2xv",
+            "cmxhYmIGcHJvdG8z"));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { },
+          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.ColorMeasurement), global::Tango.PMR.ColorLab.ColorMeasurement.Parser, new[]{ "C", "M", "Y", "K", "V", "L", "A", "B" }, null, null, null)
+          }));
+    }
+    #endregion
+
+  }
+  #region Messages
+  public sealed partial class ColorMeasurement : pb::IMessage<ColorMeasurement> {
+    private static readonly pb::MessageParser<ColorMeasurement> _parser = new pb::MessageParser<ColorMeasurement>(() => new ColorMeasurement());
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pb::MessageParser<ColorMeasurement> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Tango.PMR.ColorLab.ColorMeasurementReflection.Descriptor.MessageTypes[0]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public ColorMeasurement() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public ColorMeasurement(ColorMeasurement other) : this() {
+      c_ = other.c_;
+      m_ = other.m_;
+      y_ = other.y_;
+      k_ = other.k_;
+      v_ = other.v_;
+      l_ = other.l_;
+      a_ = other.a_;
+      b_ = other.b_;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public ColorMeasurement Clone() {
+      return new ColorMeasurement(this);
+    }
+
+    /// <summary>Field number for the "C" field.</summary>
+    public const int CFieldNumber = 1;
+    private double c_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double C {
+      get { return c_; }
+      set {
+        c_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "M" field.</summary>
+    public const int MFieldNumber = 2;
+    private double m_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double M {
+      get { return m_; }
+      set {
+        m_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "Y" field.</summary>
+    public const int YFieldNumber = 3;
+    private double y_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double Y {
+      get { return y_; }
+      set {
+        y_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "K" field.</summary>
+    public const int KFieldNumber = 4;
+    private double k_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double K {
+      get { return k_; }
+      set {
+        k_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "V" field.</summary>
+    public const int VFieldNumber = 5;
+    private double v_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double V {
+      get { return v_; }
+      set {
+        v_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "L" field.</summary>
+    public const int LFieldNumber = 10;
+    private double l_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double L {
+      get { return l_; }
+      set {
+        l_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "A" field.</summary>
+    public const int AFieldNumber = 11;
+    private double a_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double A {
+      get { return a_; }
+      set {
+        a_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "B" field.</summary>
+    public const int BFieldNumber = 12;
+    private double b_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double B {
+      get { return b_; }
+      set {
+        b_ = value;
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override bool Equals(object other) {
+      return Equals(other as ColorMeasurement);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool Equals(ColorMeasurement other) {
+      if (ReferenceEquals(other, null)) {
+        return false;
+      }
+      if (ReferenceEquals(other, this)) {
+        return true;
+      }
+      if (C != other.C) return false;
+      if (M != other.M) return false;
+      if (Y != other.Y) return false;
+      if (K != other.K) return false;
+      if (V != other.V) return false;
+      if (L != other.L) return false;
+      if (A != other.A) return false;
+      if (B != other.B) return false;
+      return true;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override int GetHashCode() {
+      int hash = 1;
+      if (C != 0D) hash ^= C.GetHashCode();
+      if (M != 0D) hash ^= M.GetHashCode();
+      if (Y != 0D) hash ^= Y.GetHashCode();
+      if (K != 0D) hash ^= K.GetHashCode();
+      if (V != 0D) hash ^= V.GetHashCode();
+      if (L != 0D) hash ^= L.GetHashCode();
+      if (A != 0D) hash ^= A.GetHashCode();
+      if (B != 0D) hash ^= B.GetHashCode();
+      return hash;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override string ToString() {
+      return pb::JsonFormatter.ToDiagnosticString(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void WriteTo(pb::CodedOutputStream output) {
+      if (C != 0D) {
+        output.WriteRawTag(9);
+        output.WriteDouble(C);
+      }
+      if (M != 0D) {
+        output.WriteRawTag(17);
+        output.WriteDouble(M);
+      }
+      if (Y != 0D) {
+        output.WriteRawTag(25);
+        output.WriteDouble(Y);
+      }
+      if (K != 0D) {
+        output.WriteRawTag(33);
+        output.WriteDouble(K);
+      }
+      if (V != 0D) {
+        output.WriteRawTag(41);
+        output.WriteDouble(V);
+      }
+      if (L != 0D) {
+        output.WriteRawTag(81);
+        output.WriteDouble(L);
+      }
+      if (A != 0D) {
+        output.WriteRawTag(89);
+        output.WriteDouble(A);
+      }
+      if (B != 0D) {
+        output.WriteRawTag(97);
+        output.WriteDouble(B);
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int CalculateSize() {
+      int size = 0;
+      if (C != 0D) {
+        size += 1 + 8;
+      }
+      if (M != 0D) {
+        size += 1 + 8;
+      }
+      if (Y != 0D) {
+        size += 1 + 8;
+      }
+      if (K != 0D) {
+        size += 1 + 8;
+      }
+      if (V != 0D) {
+        size += 1 + 8;
+      }
+      if (L != 0D) {
+        size += 1 + 8;
+      }
+      if (A != 0D) {
+        size += 1 + 8;
+      }
+      if (B != 0D) {
+        size += 1 + 8;
+      }
+      return size;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(ColorMeasurement other) {
+      if (other == null) {
+        return;
+      }
+      if (other.C != 0D) {
+        C = other.C;
+      }
+      if (other.M != 0D) {
+        M = other.M;
+      }
+      if (other.Y != 0D) {
+        Y = other.Y;
+      }
+      if (other.K != 0D) {
+        K = other.K;
+      }
+      if (other.V != 0D) {
+        V = other.V;
+      }
+      if (other.L != 0D) {
+        L = other.L;
+      }
+      if (other.A != 0D) {
+        A = other.A;
+      }
+      if (other.B != 0D) {
+        B = other.B;
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(pb::CodedInputStream input) {
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            input.SkipLastField();
+            break;
+          case 9: {
+            C = input.ReadDouble();
+            break;
+          }
+          case 17: {
+            M = input.ReadDouble();
+            break;
+          }
+          case 25: {
+            Y = input.ReadDouble();
+            break;
+          }
+          case 33: {
+            K = input.ReadDouble();
+            break;
+          }
+          case 41: {
+            V = input.ReadDouble();
+            break;
+          }
+          case 81: {
+            L = input.ReadDouble();
+            break;
+          }
+          case 89: {
+            A = input.ReadDouble();
+            break;
+          }
+          case 97: {
+            B = input.ReadDouble();
+            break;
+          }
+        }
+      }
+    }
+
+  }
+
+  #endregion
+
+}
+
+#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs
index 1b6c796c5..1d85f4c7c 100644
--- a/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs
@@ -24,24 +24,29 @@ namespace Tango.PMR.ColorLab {
           string.Concat(
             "ChVDb252ZXJzaW9uSW5wdXQucHJvdG8SElRhbmdvLlBNUi5Db2xvckxhYhoW",
             "SW5wdXRDb29yZGluYXRlcy5wcm90bxoQQ29sb3JTcGFjZS5wcm90bxoSUHJv",
-            "Y2Vzc1JhbmdlLnByb3RvGhRDb252ZXJzaW9uVHlwZS5wcm90byKOBAoPQ29u",
-            "dmVyc2lvbklucHV0Eg8KB1RocmVhZEwYASABKAESDwoHVGhyZWFkQRgCIAEo",
-            "ARIPCgdUaHJlYWRCGAMgASgBEjIKCkNvbG9yU3BhY2UYBCABKA4yHi5UYW5n",
-            "by5QTVIuQ29sb3JMYWIuQ29sb3JTcGFjZRI+ChBJbnB1dENvb3JkaW5hdGVz",
-            "GAUgASgLMiQuVGFuZ28uUE1SLkNvbG9yTGFiLklucHV0Q29vcmRpbmF0ZXMS",
-            "EwoLRm9yd2FyZERhdGEYBiABKAwSEwoLSW52ZXJzZURhdGEYByABKAwSFQoN",
-            "U2VnbWVudExlbmd0aBgIIAEoARITCgtEZWx0YUNocm9tYRgJIAEoARIOCgZE",
-            "ZWx0YUwYCiABKAESNwoNUHJvY2Vzc1JhbmdlcxgLIAMoCzIgLlRhbmdvLlBN",
-            "Ui5Db2xvckxhYi5Qcm9jZXNzUmFuZ2USFAoMR2VuZXJhdGVIaXZlGAwgASgI",
-            "EhQKDFVzZUxpZ2h0SW5rcxgNIAEoCBIMCgRWTWF4GA4gASgBEg8KB0diZERh",
-            "dGEYDyABKAwSDwoHTHViRGF0YRgQIAEoDBIdChVVc2VMdWJyaWNhbnRUcmFu",
-            "c2Zvcm0YESABKAgSOgoOQ29udmVyc2lvblR5cGUYEiABKA4yIi5UYW5nby5Q",
-            "TVIuQ29sb3JMYWIuQ29udmVyc2lvblR5cGVCHgocY29tLnR3aW5lLnRhbmdv",
-            "LnBtci5jb2xvcmxhYmIGcHJvdG8z"));
+            "Y2Vzc1JhbmdlLnByb3RvGhRDb252ZXJzaW9uVHlwZS5wcm90bxoWQ29sb3JN",
+            "ZWFzdXJlbWVudC5wcm90byLYBQoPQ29udmVyc2lvbklucHV0Eg8KB1RocmVh",
+            "ZEwYASABKAESDwoHVGhyZWFkQRgCIAEoARIPCgdUaHJlYWRCGAMgASgBEjIK",
+            "CkNvbG9yU3BhY2UYBCABKA4yHi5UYW5nby5QTVIuQ29sb3JMYWIuQ29sb3JT",
+            "cGFjZRI+ChBJbnB1dENvb3JkaW5hdGVzGAUgASgLMiQuVGFuZ28uUE1SLkNv",
+            "bG9yTGFiLklucHV0Q29vcmRpbmF0ZXMSEwoLRm9yd2FyZERhdGEYBiABKAwS",
+            "EwoLSW52ZXJzZURhdGEYByABKAwSFQoNU2VnbWVudExlbmd0aBgIIAEoARIT",
+            "CgtEZWx0YUNocm9tYRgJIAEoARIOCgZEZWx0YUwYCiABKAESNwoNUHJvY2Vz",
+            "c1JhbmdlcxgLIAMoCzIgLlRhbmdvLlBNUi5Db2xvckxhYi5Qcm9jZXNzUmFu",
+            "Z2USFAoMR2VuZXJhdGVIaXZlGAwgASgIEhQKDFVzZUxpZ2h0SW5rcxgNIAEo",
+            "CBIMCgRWTWF4GA4gASgBEg8KB0diZERhdGEYDyABKAwSDwoHTHViRGF0YRgQ",
+            "IAEoDBIdChVVc2VMdWJyaWNhbnRUcmFuc2Zvcm0YESABKAgSOgoOQ29udmVy",
+            "c2lvblR5cGUYEiABKA4yIi5UYW5nby5QTVIuQ29sb3JMYWIuQ29udmVyc2lv",
+            "blR5cGUSGwoTQ01ZS1ZQcmVkaWN0aW9uVHlwZRgTIAEoBRIdChVDTVlLVlBy",
+            "ZWRpY3Rpb25NZXRob2QYFCABKAUSGgoSQ01ZS1ZIdWVUaHJlc2hob2xkGBUg",
+            "ASgBEg8KB0NNWUtWX0sYFiABKAESHgoWU2ltcGxlUkdCUHJldmlld0ZhY3Rv",
+            "chgXIAEoARI/ChFDb2xvck1lYXN1cmVtZW50cxgYIAMoCzIkLlRhbmdvLlBN",
+            "Ui5Db2xvckxhYi5Db2xvck1lYXN1cmVtZW50Qh4KHGNvbS50d2luZS50YW5n",
+            "by5wbXIuY29sb3JsYWJiBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Tango.PMR.ColorLab.InputCoordinatesReflection.Descriptor, global::Tango.PMR.ColorLab.ColorSpaceReflection.Descriptor, global::Tango.PMR.ColorLab.ProcessRangeReflection.Descriptor, global::Tango.PMR.ColorLab.ConversionTypeReflection.Descriptor, },
+          new pbr::FileDescriptor[] { global::Tango.PMR.ColorLab.InputCoordinatesReflection.Descriptor, global::Tango.PMR.ColorLab.ColorSpaceReflection.Descriptor, global::Tango.PMR.ColorLab.ProcessRangeReflection.Descriptor, global::Tango.PMR.ColorLab.ConversionTypeReflection.Descriptor, global::Tango.PMR.ColorLab.ColorMeasurementReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.ConversionInput), global::Tango.PMR.ColorLab.ConversionInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ColorSpace", "InputCoordinates", "ForwardData", "InverseData", "SegmentLength", "DeltaChroma", "DeltaL", "ProcessRanges", "GenerateHive", "UseLightInks", "VMax", "GbdData", "LubData", "UseLubricantTransform", "ConversionType" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.ConversionInput), global::Tango.PMR.ColorLab.ConversionInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ColorSpace", "InputCoordinates", "ForwardData", "InverseData", "SegmentLength", "DeltaChroma", "DeltaL", "ProcessRanges", "GenerateHive", "UseLightInks", "VMax", "GbdData", "LubData", "UseLubricantTransform", "ConversionType", "CMYKVPredictionType", "CMYKVPredictionMethod", "CMYKVHueThreshhold", "CMYKVK", "SimpleRGBPreviewFactor", "ColorMeasurements" }, null, null, null)
           }));
     }
     #endregion
@@ -90,6 +95,12 @@ namespace Tango.PMR.ColorLab {
       lubData_ = other.lubData_;
       useLubricantTransform_ = other.useLubricantTransform_;
       conversionType_ = other.conversionType_;
+      cMYKVPredictionType_ = other.cMYKVPredictionType_;
+      cMYKVPredictionMethod_ = other.cMYKVPredictionMethod_;
+      cMYKVHueThreshhold_ = other.cMYKVHueThreshhold_;
+      cMYKVK_ = other.cMYKVK_;
+      simpleRGBPreviewFactor_ = other.simpleRGBPreviewFactor_;
+      colorMeasurements_ = other.colorMeasurements_.Clone();
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -294,6 +305,71 @@ namespace Tango.PMR.ColorLab {
       }
     }
 
+    /// <summary>Field number for the "CMYKVPredictionType" field.</summary>
+    public const int CMYKVPredictionTypeFieldNumber = 19;
+    private int cMYKVPredictionType_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int CMYKVPredictionType {
+      get { return cMYKVPredictionType_; }
+      set {
+        cMYKVPredictionType_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "CMYKVPredictionMethod" field.</summary>
+    public const int CMYKVPredictionMethodFieldNumber = 20;
+    private int cMYKVPredictionMethod_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int CMYKVPredictionMethod {
+      get { return cMYKVPredictionMethod_; }
+      set {
+        cMYKVPredictionMethod_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "CMYKVHueThreshhold" field.</summary>
+    public const int CMYKVHueThreshholdFieldNumber = 21;
+    private double cMYKVHueThreshhold_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double CMYKVHueThreshhold {
+      get { return cMYKVHueThreshhold_; }
+      set {
+        cMYKVHueThreshhold_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "CMYKV_K" field.</summary>
+    public const int CMYKVKFieldNumber = 22;
+    private double cMYKVK_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double CMYKVK {
+      get { return cMYKVK_; }
+      set {
+        cMYKVK_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "SimpleRGBPreviewFactor" field.</summary>
+    public const int SimpleRGBPreviewFactorFieldNumber = 23;
+    private double simpleRGBPreviewFactor_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double SimpleRGBPreviewFactor {
+      get { return simpleRGBPreviewFactor_; }
+      set {
+        simpleRGBPreviewFactor_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "ColorMeasurements" field.</summary>
+    public const int ColorMeasurementsFieldNumber = 24;
+    private static readonly pb::FieldCodec<global::Tango.PMR.ColorLab.ColorMeasurement> _repeated_colorMeasurements_codec
+        = pb::FieldCodec.ForMessage(194, global::Tango.PMR.ColorLab.ColorMeasurement.Parser);
+    private readonly pbc::RepeatedField<global::Tango.PMR.ColorLab.ColorMeasurement> colorMeasurements_ = new pbc::RepeatedField<global::Tango.PMR.ColorLab.ColorMeasurement>();
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<global::Tango.PMR.ColorLab.ColorMeasurement> ColorMeasurements {
+      get { return colorMeasurements_; }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as ConversionInput);
@@ -325,6 +401,12 @@ namespace Tango.PMR.ColorLab {
       if (LubData != other.LubData) return false;
       if (UseLubricantTransform != other.UseLubricantTransform) return false;
       if (ConversionType != other.ConversionType) return false;
+      if (CMYKVPredictionType != other.CMYKVPredictionType) return false;
+      if (CMYKVPredictionMethod != other.CMYKVPredictionMethod) return false;
+      if (CMYKVHueThreshhold != other.CMYKVHueThreshhold) return false;
+      if (CMYKVK != other.CMYKVK) return false;
+      if (SimpleRGBPreviewFactor != other.SimpleRGBPreviewFactor) return false;
+      if(!colorMeasurements_.Equals(other.colorMeasurements_)) return false;
       return true;
     }
 
@@ -349,6 +431,12 @@ namespace Tango.PMR.ColorLab {
       if (LubData.Length != 0) hash ^= LubData.GetHashCode();
       if (UseLubricantTransform != false) hash ^= UseLubricantTransform.GetHashCode();
       if (ConversionType != 0) hash ^= ConversionType.GetHashCode();
+      if (CMYKVPredictionType != 0) hash ^= CMYKVPredictionType.GetHashCode();
+      if (CMYKVPredictionMethod != 0) hash ^= CMYKVPredictionMethod.GetHashCode();
+      if (CMYKVHueThreshhold != 0D) hash ^= CMYKVHueThreshhold.GetHashCode();
+      if (CMYKVK != 0D) hash ^= CMYKVK.GetHashCode();
+      if (SimpleRGBPreviewFactor != 0D) hash ^= SimpleRGBPreviewFactor.GetHashCode();
+      hash ^= colorMeasurements_.GetHashCode();
       return hash;
     }
 
@@ -428,6 +516,27 @@ namespace Tango.PMR.ColorLab {
         output.WriteRawTag(144, 1);
         output.WriteEnum((int) ConversionType);
       }
+      if (CMYKVPredictionType != 0) {
+        output.WriteRawTag(152, 1);
+        output.WriteInt32(CMYKVPredictionType);
+      }
+      if (CMYKVPredictionMethod != 0) {
+        output.WriteRawTag(160, 1);
+        output.WriteInt32(CMYKVPredictionMethod);
+      }
+      if (CMYKVHueThreshhold != 0D) {
+        output.WriteRawTag(169, 1);
+        output.WriteDouble(CMYKVHueThreshhold);
+      }
+      if (CMYKVK != 0D) {
+        output.WriteRawTag(177, 1);
+        output.WriteDouble(CMYKVK);
+      }
+      if (SimpleRGBPreviewFactor != 0D) {
+        output.WriteRawTag(185, 1);
+        output.WriteDouble(SimpleRGBPreviewFactor);
+      }
+      colorMeasurements_.WriteTo(output, _repeated_colorMeasurements_codec);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -485,6 +594,22 @@ namespace Tango.PMR.ColorLab {
       if (ConversionType != 0) {
         size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) ConversionType);
       }
+      if (CMYKVPredictionType != 0) {
+        size += 2 + pb::CodedOutputStream.ComputeInt32Size(CMYKVPredictionType);
+      }
+      if (CMYKVPredictionMethod != 0) {
+        size += 2 + pb::CodedOutputStream.ComputeInt32Size(CMYKVPredictionMethod);
+      }
+      if (CMYKVHueThreshhold != 0D) {
+        size += 2 + 8;
+      }
+      if (CMYKVK != 0D) {
+        size += 2 + 8;
+      }
+      if (SimpleRGBPreviewFactor != 0D) {
+        size += 2 + 8;
+      }
+      size += colorMeasurements_.CalculateSize(_repeated_colorMeasurements_codec);
       return size;
     }
 
@@ -548,6 +673,22 @@ namespace Tango.PMR.ColorLab {
       if (other.ConversionType != 0) {
         ConversionType = other.ConversionType;
       }
+      if (other.CMYKVPredictionType != 0) {
+        CMYKVPredictionType = other.CMYKVPredictionType;
+      }
+      if (other.CMYKVPredictionMethod != 0) {
+        CMYKVPredictionMethod = other.CMYKVPredictionMethod;
+      }
+      if (other.CMYKVHueThreshhold != 0D) {
+        CMYKVHueThreshhold = other.CMYKVHueThreshhold;
+      }
+      if (other.CMYKVK != 0D) {
+        CMYKVK = other.CMYKVK;
+      }
+      if (other.SimpleRGBPreviewFactor != 0D) {
+        SimpleRGBPreviewFactor = other.SimpleRGBPreviewFactor;
+      }
+      colorMeasurements_.Add(other.colorMeasurements_);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -633,6 +774,30 @@ namespace Tango.PMR.ColorLab {
             conversionType_ = (global::Tango.PMR.ColorLab.ConversionType) input.ReadEnum();
             break;
           }
+          case 152: {
+            CMYKVPredictionType = input.ReadInt32();
+            break;
+          }
+          case 160: {
+            CMYKVPredictionMethod = input.ReadInt32();
+            break;
+          }
+          case 169: {
+            CMYKVHueThreshhold = input.ReadDouble();
+            break;
+          }
+          case 177: {
+            CMYKVK = input.ReadDouble();
+            break;
+          }
+          case 185: {
+            SimpleRGBPreviewFactor = input.ReadDouble();
+            break;
+          }
+          case 194: {
+            colorMeasurements_.AddEntriesFrom(input, _repeated_colorMeasurements_codec);
+            break;
+          }
         }
       }
     }
diff --git a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
index b5ea1877c..bd2c306f8 100644
--- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
+++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
@@ -56,6 +56,7 @@
     <Compile Include="ColorLab\CalibrationMeasurement.cs" />
     <Compile Include="ColorLab\CalibrationOutput.cs" />
     <Compile Include="ColorLab\CalibrationPoint.cs" />
+    <Compile Include="ColorLab\ColorMeasurement.cs" />
     <Compile Include="ColorLab\ColorSpace.cs" />
     <Compile Include="ColorLab\ConversionInput.cs" />
     <Compile Include="ColorLab\ConversionOutput.cs" />
@@ -527,7 +528,7 @@
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file