Added bool value "UseLightInks" to "RecommendedProcessTableInput".

Related Work Items: #4376

4 files changed, 54 insertions, 9 deletions

diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c
index d99452d73..12a349283 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c
@@ -52,7 +52,7 @@ void   recommended_process_table_input__free_unpacked
   assert(message->base.descriptor == &recommended_process_table_input__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor recommended_process_table_input__field_descriptors[7] =
+static const ProtobufCFieldDescriptor recommended_process_table_input__field_descriptors[8] =
 {
   {
     "ThreadL",
@@ -138,6 +138,18 @@ static const ProtobufCFieldDescriptor recommended_process_table_input__field_des
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "UseLightInks",
+    8,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(RecommendedProcessTableInput, has_uselightinks),
+    offsetof(RecommendedProcessTableInput, uselightinks),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned recommended_process_table_input__field_indices_by_name[] = {
   3,   /* field[3] = ForwardData */
@@ -147,11 +159,12 @@ static const unsigned recommended_process_table_input__field_indices_by_name[] =
   1,   /* field[1] = ThreadA */
   2,   /* field[2] = ThreadB */
   0,   /* field[0] = ThreadL */
+  7,   /* field[7] = UseLightInks */
 };
 static const ProtobufCIntRange recommended_process_table_input__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 7 }
+  { 0, 8 }
 };
 const ProtobufCMessageDescriptor recommended_process_table_input__descriptor =
 {
@@ -161,7 +174,7 @@ const ProtobufCMessageDescriptor recommended_process_table_input__descriptor =
   "RecommendedProcessTableInput",
   "",
   sizeof(RecommendedProcessTableInput),
-  7,
+  8,
   recommended_process_table_input__field_descriptors,
   recommended_process_table_input__field_indices_by_name,
   1,  recommended_process_table_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h
index 1eff69b1e..98b4e1613 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h
@@ -43,10 +43,12 @@ struct  _RecommendedProcessTableInput
   InputLiquid **inputliquids;
   size_t n_processranges;
   ProcessRange **processranges;
+  protobuf_c_boolean has_uselightinks;
+  protobuf_c_boolean uselightinks;
 };
 #define RECOMMENDED_PROCESS_TABLE_INPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&recommended_process_table_input__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0,NULL, 0,NULL, 0,NULL }
+    , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0,NULL, 0,NULL, 0,NULL, 0, 0 }
 
 
 /* RecommendedProcessTableInput methods */
diff --git a/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs b/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs
index 182ee9aaf..ad2eb3d3f 100644
--- a/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs
+++ b/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs
@@ -431,6 +431,7 @@ namespace Tango.ColorConversion
             input.ThreadA = rml.WhitePointA;
             input.ThreadB = rml.WhitePointB;
             input.ForwardData = ByteString.CopyFrom(rml.Cct.Data);
+            //input.UseLightInks = false;
             foreach (var prTable in rml.GetActiveProcessGroup().ProcessParametersTables)
             {
                 input.ProcessRanges.Add(new ProcessRange()
@@ -459,7 +460,7 @@ namespace Tango.ColorConversion
                 });
             }
 
-            RecommendedProcessTableOutput output = GetRecommendedProcessParameters(input, job.Rml.ColorConversionVersion);
+            RecommendedProcessTableOutput output = GetRecommendedProcessParameters(input, rml.ColorConversionVersion);
 
             var maxIndex = output.ProcessParametersTableIndex;
             var catalogBrushStops = job.Segments.SelectMany(x => x.BrushStops).Where(x => x.BrushColorSpace == ColorSpaces.Catalog);
diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/RecommendedProcessTableInput.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/RecommendedProcessTableInput.cs
index 5ad898dbf..7f51ea62c 100644
--- a/Software/Visual_Studio/Tango.PMR/ColorLab/RecommendedProcessTableInput.cs
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/RecommendedProcessTableInput.cs
@@ -24,18 +24,19 @@ namespace Tango.PMR.ColorLab {
           string.Concat(
             "CiJSZWNvbW1lbmRlZFByb2Nlc3NUYWJsZUlucHV0LnByb3RvEhJUYW5nby5Q",
             "TVIuQ29sb3JMYWIaElByb2Nlc3NSYW5nZS5wcm90bxoRSW5wdXRMaXF1aWQu",
-            "cHJvdG8aF0dyYWRpZW50SW5wdXRTdG9wLnByb3RvIowCChxSZWNvbW1lbmRl",
+            "cHJvdG8aF0dyYWRpZW50SW5wdXRTdG9wLnByb3RvIqICChxSZWNvbW1lbmRl",
             "ZFByb2Nlc3NUYWJsZUlucHV0Eg8KB1RocmVhZEwYASABKAESDwoHVGhyZWFk",
             "QRgCIAEoARIPCgdUaHJlYWRCGAMgASgBEhMKC0ZvcndhcmREYXRhGAQgASgM",
             "EjQKBVN0b3BzGAUgAygLMiUuVGFuZ28uUE1SLkNvbG9yTGFiLkdyYWRpZW50",
             "SW5wdXRTdG9wEjUKDElucHV0TGlxdWlkcxgGIAMoCzIfLlRhbmdvLlBNUi5D",
             "b2xvckxhYi5JbnB1dExpcXVpZBI3Cg1Qcm9jZXNzUmFuZ2VzGAcgAygLMiAu",
-            "VGFuZ28uUE1SLkNvbG9yTGFiLlByb2Nlc3NSYW5nZUIeChxjb20udHdpbmUu",
-            "dGFuZ28ucG1yLmNvbG9ybGFiYgZwcm90bzM="));
+            "VGFuZ28uUE1SLkNvbG9yTGFiLlByb2Nlc3NSYW5nZRIUCgxVc2VMaWdodElu",
+            "a3MYCCABKAhCHgocY29tLnR3aW5lLnRhbmdvLnBtci5jb2xvcmxhYmIGcHJv",
+            "dG8z"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.ColorLab.ProcessRangeReflection.Descriptor, global::Tango.PMR.ColorLab.InputLiquidReflection.Descriptor, global::Tango.PMR.ColorLab.GradientInputStopReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.RecommendedProcessTableInput), global::Tango.PMR.ColorLab.RecommendedProcessTableInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ForwardData", "Stops", "InputLiquids", "ProcessRanges" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.RecommendedProcessTableInput), global::Tango.PMR.ColorLab.RecommendedProcessTableInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ForwardData", "Stops", "InputLiquids", "ProcessRanges", "UseLightInks" }, null, null, null)
           }));
     }
     #endregion
@@ -73,6 +74,7 @@ namespace Tango.PMR.ColorLab {
       stops_ = other.stops_.Clone();
       inputLiquids_ = other.inputLiquids_.Clone();
       processRanges_ = other.processRanges_.Clone();
+      useLightInks_ = other.useLightInks_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -154,6 +156,17 @@ namespace Tango.PMR.ColorLab {
       get { return processRanges_; }
     }
 
+    /// <summary>Field number for the "UseLightInks" field.</summary>
+    public const int UseLightInksFieldNumber = 8;
+    private bool useLightInks_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool UseLightInks {
+      get { return useLightInks_; }
+      set {
+        useLightInks_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as RecommendedProcessTableInput);
@@ -174,6 +187,7 @@ namespace Tango.PMR.ColorLab {
       if(!stops_.Equals(other.stops_)) return false;
       if(!inputLiquids_.Equals(other.inputLiquids_)) return false;
       if(!processRanges_.Equals(other.processRanges_)) return false;
+      if (UseLightInks != other.UseLightInks) return false;
       return true;
     }
 
@@ -187,6 +201,7 @@ namespace Tango.PMR.ColorLab {
       hash ^= stops_.GetHashCode();
       hash ^= inputLiquids_.GetHashCode();
       hash ^= processRanges_.GetHashCode();
+      if (UseLightInks != false) hash ^= UseLightInks.GetHashCode();
       return hash;
     }
 
@@ -216,6 +231,10 @@ namespace Tango.PMR.ColorLab {
       stops_.WriteTo(output, _repeated_stops_codec);
       inputLiquids_.WriteTo(output, _repeated_inputLiquids_codec);
       processRanges_.WriteTo(output, _repeated_processRanges_codec);
+      if (UseLightInks != false) {
+        output.WriteRawTag(64);
+        output.WriteBool(UseLightInks);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -236,6 +255,9 @@ namespace Tango.PMR.ColorLab {
       size += stops_.CalculateSize(_repeated_stops_codec);
       size += inputLiquids_.CalculateSize(_repeated_inputLiquids_codec);
       size += processRanges_.CalculateSize(_repeated_processRanges_codec);
+      if (UseLightInks != false) {
+        size += 1 + 1;
+      }
       return size;
     }
 
@@ -259,6 +281,9 @@ namespace Tango.PMR.ColorLab {
       stops_.Add(other.stops_);
       inputLiquids_.Add(other.inputLiquids_);
       processRanges_.Add(other.processRanges_);
+      if (other.UseLightInks != false) {
+        UseLightInks = other.UseLightInks;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -297,6 +322,10 @@ namespace Tango.PMR.ColorLab {
             processRanges_.AddEntriesFrom(input, _repeated_processRanges_codec);
             break;
           }
+          case 64: {
+            UseLightInks = input.ReadBool();
+            break;
+          }
         }
       }
     }