Started support for color conversion gamut region.

6 files changed, 210 insertions, 4 deletions

diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ConversionInput.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ConversionInput.pb-c.c
index 46b4b2f54..d71d3ac3b 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ConversionInput.pb-c.c
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ConversionInput.pb-c.c
@@ -52,7 +52,7 @@ void   conversion_input__free_unpacked
   assert(message->base.descriptor == &conversion_input__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor conversion_input__field_descriptors[10] =
+static const ProtobufCFieldDescriptor conversion_input__field_descriptors[11] =
 {
   {
     "ThreadL",
@@ -174,6 +174,18 @@ static const ProtobufCFieldDescriptor conversion_input__field_descriptors[10] =
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "ProcessRanges",
+    11,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_MESSAGE,
+    offsetof(ConversionInput, n_processranges),
+    offsetof(ConversionInput, processranges),
+    &process_range__descriptor,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned conversion_input__field_indices_by_name[] = {
   3,   /* field[3] = ColorSpace */
@@ -182,6 +194,7 @@ static const unsigned conversion_input__field_indices_by_name[] = {
   5,   /* field[5] = ForwardData */
   4,   /* field[4] = InputCoordinates */
   6,   /* field[6] = InverseData */
+  10,   /* field[10] = ProcessRanges */
   7,   /* field[7] = SegmentLength */
   1,   /* field[1] = ThreadA */
   2,   /* field[2] = ThreadB */
@@ -190,7 +203,7 @@ static const unsigned conversion_input__field_indices_by_name[] = {
 static const ProtobufCIntRange conversion_input__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 10 }
+  { 0, 11 }
 };
 const ProtobufCMessageDescriptor conversion_input__descriptor =
 {
@@ -200,7 +213,7 @@ const ProtobufCMessageDescriptor conversion_input__descriptor =
   "ConversionInput",
   "",
   sizeof(ConversionInput),
-  10,
+  11,
   conversion_input__field_descriptors,
   conversion_input__field_indices_by_name,
   1,  conversion_input__number_ranges,
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ConversionInput.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ConversionInput.pb-c.h
index 4184f6551..eac601d16 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ConversionInput.pb-c.h
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ConversionInput.pb-c.h
@@ -16,6 +16,7 @@ PROTOBUF_C__BEGIN_DECLS
 
 #include "InputCoordinates.pb-c.h"
 #include "ColorSpace.pb-c.h"
+#include "ProcessRange.pb-c.h"
 
 typedef struct _ConversionInput ConversionInput;
 
@@ -47,10 +48,12 @@ struct  _ConversionInput
   double deltachroma;
   protobuf_c_boolean has_deltal;
   double deltal;
+  size_t n_processranges;
+  ProcessRange **processranges;
 };
 #define CONVERSION_INPUT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&conversion_input__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0, 0, 0, 0, 0 }
+    , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0, 0, 0, 0, 0, 0,NULL }
 
 
 /* ConversionInput methods */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ProcessRange.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ProcessRange.pb-c.c
new file mode 100644
index 000000000..f1caa25dc
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ProcessRange.pb-c.c
@@ -0,0 +1,105 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: ProcessRange.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "ProcessRange.pb-c.h"
+void   process_range__init
+                     (ProcessRange         *message)
+{
+  static const ProcessRange init_value = PROCESS_RANGE__INIT;
+  *message = init_value;
+}
+size_t process_range__get_packed_size
+                     (const ProcessRange *message)
+{
+  assert(message->base.descriptor == &process_range__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t process_range__pack
+                     (const ProcessRange *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &process_range__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t process_range__pack_to_buffer
+                     (const ProcessRange *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &process_range__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+ProcessRange *
+       process_range__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (ProcessRange *)
+     protobuf_c_message_unpack (&process_range__descriptor,
+                                allocator, len, data);
+}
+void   process_range__free_unpacked
+                     (ProcessRange *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &process_range__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor process_range__field_descriptors[2] =
+{
+  {
+    "MinInkUptake",
+    1,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(ProcessRange, has_mininkuptake),
+    offsetof(ProcessRange, mininkuptake),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "MaxInkUptake",
+    2,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(ProcessRange, has_maxinkuptake),
+    offsetof(ProcessRange, maxinkuptake),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned process_range__field_indices_by_name[] = {
+  1,   /* field[1] = MaxInkUptake */
+  0,   /* field[0] = MinInkUptake */
+};
+static const ProtobufCIntRange process_range__number_ranges[1 + 1] =
+{
+  { 1, 0 },
+  { 0, 2 }
+};
+const ProtobufCMessageDescriptor process_range__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "ProcessRange",
+  "ProcessRange",
+  "ProcessRange",
+  "",
+  sizeof(ProcessRange),
+  2,
+  process_range__field_descriptors,
+  process_range__field_indices_by_name,
+  1,  process_range__number_ranges,
+  (ProtobufCMessageInit) process_range__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ProcessRange.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ProcessRange.pb-c.h
new file mode 100644
index 000000000..c7eedfd8a
--- /dev/null
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ProcessRange.pb-c.h
@@ -0,0 +1,74 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: ProcessRange.proto */
+
+#ifndef PROTOBUF_C_ProcessRange_2eproto__INCLUDED
+#define PROTOBUF_C_ProcessRange_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c.
+#endif
+
+
+typedef struct _ProcessRange ProcessRange;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _ProcessRange
+{
+  ProtobufCMessage base;
+  protobuf_c_boolean has_mininkuptake;
+  double mininkuptake;
+  protobuf_c_boolean has_maxinkuptake;
+  double maxinkuptake;
+};
+#define PROCESS_RANGE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&process_range__descriptor) \
+    , 0, 0, 0, 0 }
+
+
+/* ProcessRange methods */
+void   process_range__init
+                     (ProcessRange         *message);
+size_t process_range__get_packed_size
+                     (const ProcessRange   *message);
+size_t process_range__pack
+                     (const ProcessRange   *message,
+                      uint8_t             *out);
+size_t process_range__pack_to_buffer
+                     (const ProcessRange   *message,
+                      ProtobufCBuffer     *buffer);
+ProcessRange *
+       process_range__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   process_range__free_unpacked
+                     (ProcessRange *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*ProcessRange_Closure)
+                 (const ProcessRange *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor process_range__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_ProcessRange_2eproto__INCLUDED */
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj b/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj
index 949ad79d8..65bfc667b 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj
@@ -136,6 +136,9 @@
       <OptimizeReferences>true</OptimizeReferences>
       <AssemblyDebug>true</AssemblyDebug>
     </Link>
+    <PreBuildEvent>
+      <Command>"$(SolutionDir)Build\Utilities\Debug\proto-tc.exe" -i "$(SolutionDir)..\PMR\Messages" -o "$(SolutionDir)Native\Tango.ColorLib\PMR" -l C -c "ColorLab"</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -169,6 +172,7 @@
     <ClInclude Include="PMR\ColorLab\LiquidType.pb-c.h" />
     <ClInclude Include="PMR\ColorLab\OutputCoordinates.pb-c.h" />
     <ClInclude Include="PMR\ColorLab\OutputLiquid.pb-c.h" />
+    <ClInclude Include="PMR\ColorLab\ProcessRange.pb-c.h" />
     <ClInclude Include="PMR\Stubs\CalculateRequest.pb-c.h" />
     <ClInclude Include="PMR\Stubs\CalculateResponse.pb-c.h" />
     <ClInclude Include="protobuf-c\protobuf-c.h" />
@@ -195,6 +199,7 @@
     <ClCompile Include="PMR\ColorLab\LiquidType.pb-c.c" />
     <ClCompile Include="PMR\ColorLab\OutputCoordinates.pb-c.c" />
     <ClCompile Include="PMR\ColorLab\OutputLiquid.pb-c.c" />
+    <ClCompile Include="PMR\ColorLab\ProcessRange.pb-c.c" />
     <ClCompile Include="protobuf-c\protobuf-c.c" />
     <ClCompile Include="Utils\CalibData.cpp" />
     <ClCompile Include="Utils\ColorConvert.cpp" />
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj.filters b/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj.filters
index 38b89c2f3..b929da503 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj.filters
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj.filters
@@ -99,6 +99,9 @@
     <ClInclude Include="Utils\GBD.h">
       <Filter>Utils</Filter>
     </ClInclude>
+    <ClInclude Include="PMR\ColorLab\ProcessRange.pb-c.h">
+      <Filter>PMR</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Exports.cpp">
@@ -164,5 +167,8 @@
     <ClCompile Include="Utils\GBD.cpp">
       <Filter>Utils</Filter>
     </ClCompile>
+    <ClCompile Include="PMR\ColorLab\ProcessRange.pb-c.c">
+      <Filter>PMR</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file