Fixed collision of ConversionType.

4 files changed, 120 insertions, 43 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs
index aa55383a7..1b6c796c5 100644
--- a/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs
@@ -24,23 +24,24 @@ namespace Tango.PMR.ColorLab {
           string.Concat(
             "ChVDb252ZXJzaW9uSW5wdXQucHJvdG8SElRhbmdvLlBNUi5Db2xvckxhYhoW",
             "SW5wdXRDb29yZGluYXRlcy5wcm90bxoQQ29sb3JTcGFjZS5wcm90bxoSUHJv",
-            "Y2Vzc1JhbmdlLnByb3RvIukDCg9Db252ZXJzaW9uSW5wdXQSDwoHVGhyZWFk",
-            "TBgBIAEoARIPCgdUaHJlYWRBGAIgASgBEg8KB1RocmVhZEIYAyABKAESMgoK",
-            "Q29sb3JTcGFjZRgEIAEoDjIeLlRhbmdvLlBNUi5Db2xvckxhYi5Db2xvclNw",
-            "YWNlEj4KEElucHV0Q29vcmRpbmF0ZXMYBSABKAsyJC5UYW5nby5QTVIuQ29s",
-            "b3JMYWIuSW5wdXRDb29yZGluYXRlcxITCgtGb3J3YXJkRGF0YRgGIAEoDBIT",
-            "CgtJbnZlcnNlRGF0YRgHIAEoDBIVCg1TZWdtZW50TGVuZ3RoGAggASgBEhMK",
-            "C0RlbHRhQ2hyb21hGAkgASgBEg4KBkRlbHRhTBgKIAEoARI3Cg1Qcm9jZXNz",
-            "UmFuZ2VzGAsgAygLMiAuVGFuZ28uUE1SLkNvbG9yTGFiLlByb2Nlc3NSYW5n",
-            "ZRIUCgxHZW5lcmF0ZUhpdmUYDCABKAgSFAoMVXNlTGlnaHRJbmtzGA0gASgI",
-            "EgwKBFZNYXgYDiABKAESDwoHR2JkRGF0YRgPIAEoDBIPCgdMdWJEYXRhGBAg",
-            "ASgMEh0KFVVzZUx1YnJpY2FudFRyYW5zZm9ybRgRIAEoCBIVCg1Gb3JGaW5l",
-            "VHVuaW5nGBIgASgIQh4KHGNvbS50d2luZS50YW5nby5wbXIuY29sb3JsYWJi",
-            "BnByb3RvMw=="));
+            "Y2Vzc1JhbmdlLnByb3RvGhRDb252ZXJzaW9uVHlwZS5wcm90byKOBAoPQ29u",
+            "dmVyc2lvbklucHV0Eg8KB1RocmVhZEwYASABKAESDwoHVGhyZWFkQRgCIAEo",
+            "ARIPCgdUaHJlYWRCGAMgASgBEjIKCkNvbG9yU3BhY2UYBCABKA4yHi5UYW5n",
+            "by5QTVIuQ29sb3JMYWIuQ29sb3JTcGFjZRI+ChBJbnB1dENvb3JkaW5hdGVz",
+            "GAUgASgLMiQuVGFuZ28uUE1SLkNvbG9yTGFiLklucHV0Q29vcmRpbmF0ZXMS",
+            "EwoLRm9yd2FyZERhdGEYBiABKAwSEwoLSW52ZXJzZURhdGEYByABKAwSFQoN",
+            "U2VnbWVudExlbmd0aBgIIAEoARITCgtEZWx0YUNocm9tYRgJIAEoARIOCgZE",
+            "ZWx0YUwYCiABKAESNwoNUHJvY2Vzc1JhbmdlcxgLIAMoCzIgLlRhbmdvLlBN",
+            "Ui5Db2xvckxhYi5Qcm9jZXNzUmFuZ2USFAoMR2VuZXJhdGVIaXZlGAwgASgI",
+            "EhQKDFVzZUxpZ2h0SW5rcxgNIAEoCBIMCgRWTWF4GA4gASgBEg8KB0diZERh",
+            "dGEYDyABKAwSDwoHTHViRGF0YRgQIAEoDBIdChVVc2VMdWJyaWNhbnRUcmFu",
+            "c2Zvcm0YESABKAgSOgoOQ29udmVyc2lvblR5cGUYEiABKA4yIi5UYW5nby5Q",
+            "TVIuQ29sb3JMYWIuQ29udmVyc2lvblR5cGVCHgocY29tLnR3aW5lLnRhbmdv",
+            "LnBtci5jb2xvcmxhYmIGcHJvdG8z"));
       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, },
+          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::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", "ForFineTuning" }, 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" }, null, null, null)
           }));
     }
     #endregion
@@ -88,7 +89,7 @@ namespace Tango.PMR.ColorLab {
       gbdData_ = other.gbdData_;
       lubData_ = other.lubData_;
       useLubricantTransform_ = other.useLubricantTransform_;
-      forFineTuning_ = other.forFineTuning_;
+      conversionType_ = other.conversionType_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -282,14 +283,14 @@ namespace Tango.PMR.ColorLab {
       }
     }
 
-    /// <summary>Field number for the "ForFineTuning" field.</summary>
-    public const int ForFineTuningFieldNumber = 18;
-    private bool forFineTuning_;
+    /// <summary>Field number for the "ConversionType" field.</summary>
+    public const int ConversionTypeFieldNumber = 18;
+    private global::Tango.PMR.ColorLab.ConversionType conversionType_ = 0;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool ForFineTuning {
-      get { return forFineTuning_; }
+    public global::Tango.PMR.ColorLab.ConversionType ConversionType {
+      get { return conversionType_; }
       set {
-        forFineTuning_ = value;
+        conversionType_ = value;
       }
     }
 
@@ -323,7 +324,7 @@ namespace Tango.PMR.ColorLab {
       if (GbdData != other.GbdData) return false;
       if (LubData != other.LubData) return false;
       if (UseLubricantTransform != other.UseLubricantTransform) return false;
-      if (ForFineTuning != other.ForFineTuning) return false;
+      if (ConversionType != other.ConversionType) return false;
       return true;
     }
 
@@ -347,7 +348,7 @@ namespace Tango.PMR.ColorLab {
       if (GbdData.Length != 0) hash ^= GbdData.GetHashCode();
       if (LubData.Length != 0) hash ^= LubData.GetHashCode();
       if (UseLubricantTransform != false) hash ^= UseLubricantTransform.GetHashCode();
-      if (ForFineTuning != false) hash ^= ForFineTuning.GetHashCode();
+      if (ConversionType != 0) hash ^= ConversionType.GetHashCode();
       return hash;
     }
 
@@ -423,9 +424,9 @@ namespace Tango.PMR.ColorLab {
         output.WriteRawTag(136, 1);
         output.WriteBool(UseLubricantTransform);
       }
-      if (ForFineTuning != false) {
+      if (ConversionType != 0) {
         output.WriteRawTag(144, 1);
-        output.WriteBool(ForFineTuning);
+        output.WriteEnum((int) ConversionType);
       }
     }
 
@@ -481,8 +482,8 @@ namespace Tango.PMR.ColorLab {
       if (UseLubricantTransform != false) {
         size += 2 + 1;
       }
-      if (ForFineTuning != false) {
-        size += 2 + 1;
+      if (ConversionType != 0) {
+        size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) ConversionType);
       }
       return size;
     }
@@ -544,8 +545,8 @@ namespace Tango.PMR.ColorLab {
       if (other.UseLubricantTransform != false) {
         UseLubricantTransform = other.UseLubricantTransform;
       }
-      if (other.ForFineTuning != false) {
-        ForFineTuning = other.ForFineTuning;
+      if (other.ConversionType != 0) {
+        ConversionType = other.ConversionType;
       }
     }
 
@@ -629,7 +630,7 @@ namespace Tango.PMR.ColorLab {
             break;
           }
           case 144: {
-            ForFineTuning = input.ReadBool();
+            conversionType_ = (global::Tango.PMR.ColorLab.ConversionType) input.ReadEnum();
             break;
           }
         }
diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionType.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionType.cs
new file mode 100644
index 000000000..e322752e0
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionType.cs
@@ -0,0 +1,45 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: ConversionType.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 ConversionType.proto</summary>
+  public static partial class ConversionTypeReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for ConversionType.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static ConversionTypeReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "ChRDb252ZXJzaW9uVHlwZS5wcm90bxISVGFuZ28uUE1SLkNvbG9yTGFiKi0K",
+            "DkNvbnZlcnNpb25UeXBlEgsKB0RlZmF1bHQQABIOCgpGaW5lVHVuaW5nEAFC",
+            "HgocY29tLnR3aW5lLnRhbmdvLnBtci5jb2xvcmxhYmIGcHJvdG8z"));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { },
+          new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.ColorLab.ConversionType), }, null));
+    }
+    #endregion
+
+  }
+  #region Enums
+  public enum ConversionType {
+    [pbr::OriginalName("Default")] Default = 0,
+    [pbr::OriginalName("FineTuning")] FineTuning = 1,
+  }
+
+  #endregion
+
+}
+
+#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/OutOfGamutInput.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/OutOfGamutInput.cs
index ebde255c5..122dc8227 100644
--- a/Software/Visual_Studio/Tango.PMR/ColorLab/OutOfGamutInput.cs
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/OutOfGamutInput.cs
@@ -24,19 +24,21 @@ namespace Tango.PMR.ColorLab {
           string.Concat(
             "ChVPdXRPZkdhbXV0SW5wdXQucHJvdG8SElRhbmdvLlBNUi5Db2xvckxhYhoW",
             "SW5wdXRDb29yZGluYXRlcy5wcm90bxoQQ29sb3JTcGFjZS5wcm90bxoSUHJv",
-            "Y2Vzc1JhbmdlLnByb3RvIscCCg9PdXRPZkdhbXV0SW5wdXQSDwoHVGhyZWFk",
-            "TBgBIAEoARIPCgdUaHJlYWRBGAIgASgBEg8KB1RocmVhZEIYAyABKAESMgoK",
-            "Q29sb3JTcGFjZRgEIAEoDjIeLlRhbmdvLlBNUi5Db2xvckxhYi5Db2xvclNw",
-            "YWNlEj4KEElucHV0Q29vcmRpbmF0ZXMYBSABKAsyJC5UYW5nby5QTVIuQ29s",
-            "b3JMYWIuSW5wdXRDb29yZGluYXRlcxITCgtGb3J3YXJkRGF0YRgGIAEoDBI3",
-            "Cg1Qcm9jZXNzUmFuZ2VzGAcgAygLMiAuVGFuZ28uUE1SLkNvbG9yTGFiLlBy",
-            "b2Nlc3NSYW5nZRIPCgdHYmREYXRhGAggASgMEg8KB0x1YkRhdGEYCSABKAwS",
-            "HQoVVXNlTHVicmljYW50VHJhbnNmb3JtGAogASgIQh4KHGNvbS50d2luZS50",
-            "YW5nby5wbXIuY29sb3JsYWJiBnByb3RvMw=="));
+            "Y2Vzc1JhbmdlLnByb3RvGhRDb252ZXJzaW9uVHlwZS5wcm90byKDAwoPT3V0",
+            "T2ZHYW11dElucHV0Eg8KB1RocmVhZEwYASABKAESDwoHVGhyZWFkQRgCIAEo",
+            "ARIPCgdUaHJlYWRCGAMgASgBEjIKCkNvbG9yU3BhY2UYBCABKA4yHi5UYW5n",
+            "by5QTVIuQ29sb3JMYWIuQ29sb3JTcGFjZRI+ChBJbnB1dENvb3JkaW5hdGVz",
+            "GAUgASgLMiQuVGFuZ28uUE1SLkNvbG9yTGFiLklucHV0Q29vcmRpbmF0ZXMS",
+            "EwoLRm9yd2FyZERhdGEYBiABKAwSNwoNUHJvY2Vzc1JhbmdlcxgHIAMoCzIg",
+            "LlRhbmdvLlBNUi5Db2xvckxhYi5Qcm9jZXNzUmFuZ2USDwoHR2JkRGF0YRgI",
+            "IAEoDBIPCgdMdWJEYXRhGAkgASgMEh0KFVVzZUx1YnJpY2FudFRyYW5zZm9y",
+            "bRgKIAEoCBI6Cg5Db252ZXJzaW9uVHlwZRgLIAEoDjIiLlRhbmdvLlBNUi5D",
+            "b2xvckxhYi5Db252ZXJzaW9uVHlwZUIeChxjb20udHdpbmUudGFuZ28ucG1y",
+            "LmNvbG9ybGFiYgZwcm90bzM="));
       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, },
+          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::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.OutOfGamutInput), global::Tango.PMR.ColorLab.OutOfGamutInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ColorSpace", "InputCoordinates", "ForwardData", "ProcessRanges", "GbdData", "LubData", "UseLubricantTransform" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.OutOfGamutInput), global::Tango.PMR.ColorLab.OutOfGamutInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ColorSpace", "InputCoordinates", "ForwardData", "ProcessRanges", "GbdData", "LubData", "UseLubricantTransform", "ConversionType" }, null, null, null)
           }));
     }
     #endregion
@@ -77,6 +79,7 @@ namespace Tango.PMR.ColorLab {
       gbdData_ = other.gbdData_;
       lubData_ = other.lubData_;
       useLubricantTransform_ = other.useLubricantTransform_;
+      conversionType_ = other.conversionType_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -193,6 +196,17 @@ namespace Tango.PMR.ColorLab {
       }
     }
 
+    /// <summary>Field number for the "ConversionType" field.</summary>
+    public const int ConversionTypeFieldNumber = 11;
+    private global::Tango.PMR.ColorLab.ConversionType conversionType_ = 0;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public global::Tango.PMR.ColorLab.ConversionType ConversionType {
+      get { return conversionType_; }
+      set {
+        conversionType_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as OutOfGamutInput);
@@ -216,6 +230,7 @@ namespace Tango.PMR.ColorLab {
       if (GbdData != other.GbdData) return false;
       if (LubData != other.LubData) return false;
       if (UseLubricantTransform != other.UseLubricantTransform) return false;
+      if (ConversionType != other.ConversionType) return false;
       return true;
     }
 
@@ -232,6 +247,7 @@ namespace Tango.PMR.ColorLab {
       if (GbdData.Length != 0) hash ^= GbdData.GetHashCode();
       if (LubData.Length != 0) hash ^= LubData.GetHashCode();
       if (UseLubricantTransform != false) hash ^= UseLubricantTransform.GetHashCode();
+      if (ConversionType != 0) hash ^= ConversionType.GetHashCode();
       return hash;
     }
 
@@ -279,6 +295,10 @@ namespace Tango.PMR.ColorLab {
         output.WriteRawTag(80);
         output.WriteBool(UseLubricantTransform);
       }
+      if (ConversionType != 0) {
+        output.WriteRawTag(88);
+        output.WriteEnum((int) ConversionType);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -312,6 +332,9 @@ namespace Tango.PMR.ColorLab {
       if (UseLubricantTransform != false) {
         size += 1 + 1;
       }
+      if (ConversionType != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) ConversionType);
+      }
       return size;
     }
 
@@ -351,6 +374,9 @@ namespace Tango.PMR.ColorLab {
       if (other.UseLubricantTransform != false) {
         UseLubricantTransform = other.UseLubricantTransform;
       }
+      if (other.ConversionType != 0) {
+        ConversionType = other.ConversionType;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -404,6 +430,10 @@ namespace Tango.PMR.ColorLab {
             UseLubricantTransform = input.ReadBool();
             break;
           }
+          case 88: {
+            conversionType_ = (global::Tango.PMR.ColorLab.ConversionType) input.ReadEnum();
+            break;
+          }
         }
       }
     }
diff --git a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
index 9effc3fcf..a1f1db7a5 100644
--- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
+++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
@@ -59,6 +59,7 @@
     <Compile Include="ColorLab\ColorSpace.cs" />
     <Compile Include="ColorLab\ConversionInput.cs" />
     <Compile Include="ColorLab\ConversionOutput.cs" />
+    <Compile Include="ColorLab\ConversionType.cs" />
     <Compile Include="ColorLab\GradientConversionInput.cs" />
     <Compile Include="ColorLab\GradientConversionOutput.cs" />
     <Compile Include="ColorLab\GradientInputStop.cs" />
@@ -513,7 +514,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