aboutsummaryrefslogtreecommitdiffstats
path: root/Software
diff options
context:
space:
mode:
authorVictoria Plitt <Victoria.Plitt@twine-s.com>2022-11-03 16:22:14 +0200
committerVictoria Plitt <Victoria.Plitt@twine-s.com>2022-11-03 16:22:14 +0200
commit33907cc43364f70425578cc703989149a549ff1a (patch)
tree66e4f311e3f1776784984423e5ab92874c7b4788 /Software
parent3129bcc8603f9f0dcc394c34484f7f00f04d1c50 (diff)
downloadTango-33907cc43364f70425578cc703989149a549ff1a.tar.gz
Tango-33907cc43364f70425578cc703989149a549ff1a.zip
Added to Protobuf message ConversionInput bool ForFineTuning.
Related Work Items: #7324
Diffstat (limited to 'Software')
-rw-r--r--Software/PMR/Messages/ColorLab/ConversionInput.proto1
-rw-r--r--Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/ConversionInput.pb-c.c45
-rw-r--r--Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/ConversionInput.pb-c.h8
-rw-r--r--Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/ConversionInput.pb-c.c45
-rw-r--r--Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/ConversionInput.pb-c.h8
-rw-r--r--Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/ConversionInput.pb-c.c45
-rw-r--r--Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/ConversionInput.pb-c.h8
-rw-r--r--Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/ConversionInput.pb-c.c45
-rw-r--r--Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/ConversionInput.pb-c.h8
-rw-r--r--Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/ConversionInput.pb-c.c45
-rw-r--r--Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/ConversionInput.pb-c.h8
-rw-r--r--Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/ConversionInput.pb-c.c32
-rw-r--r--Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/ConversionInput.pb-c.h6
-rw-r--r--Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs37
14 files changed, 313 insertions, 28 deletions
diff --git a/Software/PMR/Messages/ColorLab/ConversionInput.proto b/Software/PMR/Messages/ColorLab/ConversionInput.proto
index 069abd7df..a64870f52 100644
--- a/Software/PMR/Messages/ColorLab/ConversionInput.proto
+++ b/Software/PMR/Messages/ColorLab/ConversionInput.proto
@@ -26,4 +26,5 @@ message ConversionInput
bytes GbdData = 15;
bytes LubData = 16;
bool UseLubricantTransform = 17;
+ bool ForFineTuning = 18;
} \ No newline at end of file
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/ConversionInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/ConversionInput.pb-c.c
index 0defc9edf..63c7d45fb 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/ConversionInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/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[14] =
+static const ProtobufCFieldDescriptor conversion_input__field_descriptors[17] =
{
{
"ThreadL",
@@ -222,27 +222,66 @@ static const ProtobufCFieldDescriptor conversion_input__field_descriptors[14] =
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
+ {
+ "GbdData",
+ 15,
+ PROTOBUF_C_LABEL_OPTIONAL,
+ PROTOBUF_C_TYPE_BYTES,
+ offsetof(ConversionInput, has_gbddata),
+ offsetof(ConversionInput, gbddata),
+ NULL,
+ NULL,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
+ {
+ "LubData",
+ 16,
+ PROTOBUF_C_LABEL_OPTIONAL,
+ PROTOBUF_C_TYPE_BYTES,
+ offsetof(ConversionInput, has_lubdata),
+ offsetof(ConversionInput, lubdata),
+ NULL,
+ NULL,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
+ {
+ "UseLubricantTransform",
+ 17,
+ PROTOBUF_C_LABEL_OPTIONAL,
+ PROTOBUF_C_TYPE_BOOL,
+ offsetof(ConversionInput, has_uselubricanttransform),
+ offsetof(ConversionInput, uselubricanttransform),
+ NULL,
+ NULL,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
};
static const unsigned conversion_input__field_indices_by_name[] = {
3, /* field[3] = ColorSpace */
8, /* field[8] = DeltaChroma */
9, /* field[9] = DeltaL */
5, /* field[5] = ForwardData */
+ 14, /* field[14] = GbdData */
11, /* field[11] = GenerateHive */
4, /* field[4] = InputCoordinates */
6, /* field[6] = InverseData */
+ 15, /* field[15] = LubData */
10, /* field[10] = ProcessRanges */
7, /* field[7] = SegmentLength */
1, /* field[1] = ThreadA */
2, /* field[2] = ThreadB */
0, /* field[0] = ThreadL */
12, /* field[12] = UseLightInks */
+ 16, /* field[16] = UseLubricantTransform */
13, /* field[13] = VMax */
};
static const ProtobufCIntRange conversion_input__number_ranges[1 + 1] =
{
{ 1, 0 },
- { 0, 14 }
+ { 0, 17 }
};
const ProtobufCMessageDescriptor conversion_input__descriptor =
{
@@ -252,7 +291,7 @@ const ProtobufCMessageDescriptor conversion_input__descriptor =
"ConversionInput",
"",
sizeof(ConversionInput),
- 14,
+ 17,
conversion_input__field_descriptors,
conversion_input__field_indices_by_name,
1, conversion_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/ConversionInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/ConversionInput.pb-c.h
index 794ddaaac..da96bb1cf 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/ConversionInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/ConversionInput.pb-c.h
@@ -56,10 +56,16 @@ struct _ConversionInput
protobuf_c_boolean uselightinks;
protobuf_c_boolean has_vmax;
double vmax;
+ protobuf_c_boolean has_gbddata;
+ ProtobufCBinaryData gbddata;
+ protobuf_c_boolean has_lubdata;
+ ProtobufCBinaryData lubdata;
+ protobuf_c_boolean has_uselubricanttransform;
+ protobuf_c_boolean uselubricanttransform;
};
#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,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, 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
/* ConversionInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/ConversionInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/ConversionInput.pb-c.c
index 0defc9edf..63c7d45fb 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/ConversionInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/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[14] =
+static const ProtobufCFieldDescriptor conversion_input__field_descriptors[17] =
{
{
"ThreadL",
@@ -222,27 +222,66 @@ static const ProtobufCFieldDescriptor conversion_input__field_descriptors[14] =
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
+ {
+ "GbdData",
+ 15,
+ PROTOBUF_C_LABEL_OPTIONAL,
+ PROTOBUF_C_TYPE_BYTES,
+ offsetof(ConversionInput, has_gbddata),
+ offsetof(ConversionInput, gbddata),
+ NULL,
+ NULL,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
+ {
+ "LubData",
+ 16,
+ PROTOBUF_C_LABEL_OPTIONAL,
+ PROTOBUF_C_TYPE_BYTES,
+ offsetof(ConversionInput, has_lubdata),
+ offsetof(ConversionInput, lubdata),
+ NULL,
+ NULL,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
+ {
+ "UseLubricantTransform",
+ 17,
+ PROTOBUF_C_LABEL_OPTIONAL,
+ PROTOBUF_C_TYPE_BOOL,
+ offsetof(ConversionInput, has_uselubricanttransform),
+ offsetof(ConversionInput, uselubricanttransform),
+ NULL,
+ NULL,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
};
static const unsigned conversion_input__field_indices_by_name[] = {
3, /* field[3] = ColorSpace */
8, /* field[8] = DeltaChroma */
9, /* field[9] = DeltaL */
5, /* field[5] = ForwardData */
+ 14, /* field[14] = GbdData */
11, /* field[11] = GenerateHive */
4, /* field[4] = InputCoordinates */
6, /* field[6] = InverseData */
+ 15, /* field[15] = LubData */
10, /* field[10] = ProcessRanges */
7, /* field[7] = SegmentLength */
1, /* field[1] = ThreadA */
2, /* field[2] = ThreadB */
0, /* field[0] = ThreadL */
12, /* field[12] = UseLightInks */
+ 16, /* field[16] = UseLubricantTransform */
13, /* field[13] = VMax */
};
static const ProtobufCIntRange conversion_input__number_ranges[1 + 1] =
{
{ 1, 0 },
- { 0, 14 }
+ { 0, 17 }
};
const ProtobufCMessageDescriptor conversion_input__descriptor =
{
@@ -252,7 +291,7 @@ const ProtobufCMessageDescriptor conversion_input__descriptor =
"ConversionInput",
"",
sizeof(ConversionInput),
- 14,
+ 17,
conversion_input__field_descriptors,
conversion_input__field_indices_by_name,
1, conversion_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/ConversionInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/ConversionInput.pb-c.h
index 794ddaaac..da96bb1cf 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/ConversionInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/ConversionInput.pb-c.h
@@ -56,10 +56,16 @@ struct _ConversionInput
protobuf_c_boolean uselightinks;
protobuf_c_boolean has_vmax;
double vmax;
+ protobuf_c_boolean has_gbddata;
+ ProtobufCBinaryData gbddata;
+ protobuf_c_boolean has_lubdata;
+ ProtobufCBinaryData lubdata;
+ protobuf_c_boolean has_uselubricanttransform;
+ protobuf_c_boolean uselubricanttransform;
};
#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,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, 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
/* ConversionInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/ConversionInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/ConversionInput.pb-c.c
index 0defc9edf..63c7d45fb 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/ConversionInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/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[14] =
+static const ProtobufCFieldDescriptor conversion_input__field_descriptors[17] =
{
{
"ThreadL",
@@ -222,27 +222,66 @@ static const ProtobufCFieldDescriptor conversion_input__field_descriptors[14] =
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
+ {
+ "GbdData",
+ 15,
+ PROTOBUF_C_LABEL_OPTIONAL,
+ PROTOBUF_C_TYPE_BYTES,
+ offsetof(ConversionInput, has_gbddata),
+ offsetof(ConversionInput, gbddata),
+ NULL,
+ NULL,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
+ {
+ "LubData",
+ 16,
+ PROTOBUF_C_LABEL_OPTIONAL,
+ PROTOBUF_C_TYPE_BYTES,
+ offsetof(ConversionInput, has_lubdata),
+ offsetof(ConversionInput, lubdata),
+ NULL,
+ NULL,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
+ {
+ "UseLubricantTransform",
+ 17,
+ PROTOBUF_C_LABEL_OPTIONAL,
+ PROTOBUF_C_TYPE_BOOL,
+ offsetof(ConversionInput, has_uselubricanttransform),
+ offsetof(ConversionInput, uselubricanttransform),
+ NULL,
+ NULL,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
};
static const unsigned conversion_input__field_indices_by_name[] = {
3, /* field[3] = ColorSpace */
8, /* field[8] = DeltaChroma */
9, /* field[9] = DeltaL */
5, /* field[5] = ForwardData */
+ 14, /* field[14] = GbdData */
11, /* field[11] = GenerateHive */
4, /* field[4] = InputCoordinates */
6, /* field[6] = InverseData */
+ 15, /* field[15] = LubData */
10, /* field[10] = ProcessRanges */
7, /* field[7] = SegmentLength */
1, /* field[1] = ThreadA */
2, /* field[2] = ThreadB */
0, /* field[0] = ThreadL */
12, /* field[12] = UseLightInks */
+ 16, /* field[16] = UseLubricantTransform */
13, /* field[13] = VMax */
};
static const ProtobufCIntRange conversion_input__number_ranges[1 + 1] =
{
{ 1, 0 },
- { 0, 14 }
+ { 0, 17 }
};
const ProtobufCMessageDescriptor conversion_input__descriptor =
{
@@ -252,7 +291,7 @@ const ProtobufCMessageDescriptor conversion_input__descriptor =
"ConversionInput",
"",
sizeof(ConversionInput),
- 14,
+ 17,
conversion_input__field_descriptors,
conversion_input__field_indices_by_name,
1, conversion_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/ConversionInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/ConversionInput.pb-c.h
index 794ddaaac..da96bb1cf 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/ConversionInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/ConversionInput.pb-c.h
@@ -56,10 +56,16 @@ struct _ConversionInput
protobuf_c_boolean uselightinks;
protobuf_c_boolean has_vmax;
double vmax;
+ protobuf_c_boolean has_gbddata;
+ ProtobufCBinaryData gbddata;
+ protobuf_c_boolean has_lubdata;
+ ProtobufCBinaryData lubdata;
+ protobuf_c_boolean has_uselubricanttransform;
+ protobuf_c_boolean uselubricanttransform;
};
#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,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, 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
/* ConversionInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/ConversionInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/ConversionInput.pb-c.c
index 0defc9edf..63c7d45fb 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/ConversionInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/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[14] =
+static const ProtobufCFieldDescriptor conversion_input__field_descriptors[17] =
{
{
"ThreadL",
@@ -222,27 +222,66 @@ static const ProtobufCFieldDescriptor conversion_input__field_descriptors[14] =
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
+ {
+ "GbdData",
+ 15,
+ PROTOBUF_C_LABEL_OPTIONAL,
+ PROTOBUF_C_TYPE_BYTES,
+ offsetof(ConversionInput, has_gbddata),
+ offsetof(ConversionInput, gbddata),
+ NULL,
+ NULL,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
+ {
+ "LubData",
+ 16,
+ PROTOBUF_C_LABEL_OPTIONAL,
+ PROTOBUF_C_TYPE_BYTES,
+ offsetof(ConversionInput, has_lubdata),
+ offsetof(ConversionInput, lubdata),
+ NULL,
+ NULL,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
+ {
+ "UseLubricantTransform",
+ 17,
+ PROTOBUF_C_LABEL_OPTIONAL,
+ PROTOBUF_C_TYPE_BOOL,
+ offsetof(ConversionInput, has_uselubricanttransform),
+ offsetof(ConversionInput, uselubricanttransform),
+ NULL,
+ NULL,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
};
static const unsigned conversion_input__field_indices_by_name[] = {
3, /* field[3] = ColorSpace */
8, /* field[8] = DeltaChroma */
9, /* field[9] = DeltaL */
5, /* field[5] = ForwardData */
+ 14, /* field[14] = GbdData */
11, /* field[11] = GenerateHive */
4, /* field[4] = InputCoordinates */
6, /* field[6] = InverseData */
+ 15, /* field[15] = LubData */
10, /* field[10] = ProcessRanges */
7, /* field[7] = SegmentLength */
1, /* field[1] = ThreadA */
2, /* field[2] = ThreadB */
0, /* field[0] = ThreadL */
12, /* field[12] = UseLightInks */
+ 16, /* field[16] = UseLubricantTransform */
13, /* field[13] = VMax */
};
static const ProtobufCIntRange conversion_input__number_ranges[1 + 1] =
{
{ 1, 0 },
- { 0, 14 }
+ { 0, 17 }
};
const ProtobufCMessageDescriptor conversion_input__descriptor =
{
@@ -252,7 +291,7 @@ const ProtobufCMessageDescriptor conversion_input__descriptor =
"ConversionInput",
"",
sizeof(ConversionInput),
- 14,
+ 17,
conversion_input__field_descriptors,
conversion_input__field_indices_by_name,
1, conversion_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/ConversionInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/ConversionInput.pb-c.h
index 794ddaaac..da96bb1cf 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/ConversionInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/ConversionInput.pb-c.h
@@ -56,10 +56,16 @@ struct _ConversionInput
protobuf_c_boolean uselightinks;
protobuf_c_boolean has_vmax;
double vmax;
+ protobuf_c_boolean has_gbddata;
+ ProtobufCBinaryData gbddata;
+ protobuf_c_boolean has_lubdata;
+ ProtobufCBinaryData lubdata;
+ protobuf_c_boolean has_uselubricanttransform;
+ protobuf_c_boolean uselubricanttransform;
};
#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,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, 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
/* ConversionInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/ConversionInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/ConversionInput.pb-c.c
index 0defc9edf..63c7d45fb 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/ConversionInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/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[14] =
+static const ProtobufCFieldDescriptor conversion_input__field_descriptors[17] =
{
{
"ThreadL",
@@ -222,27 +222,66 @@ static const ProtobufCFieldDescriptor conversion_input__field_descriptors[14] =
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
+ {
+ "GbdData",
+ 15,
+ PROTOBUF_C_LABEL_OPTIONAL,
+ PROTOBUF_C_TYPE_BYTES,
+ offsetof(ConversionInput, has_gbddata),
+ offsetof(ConversionInput, gbddata),
+ NULL,
+ NULL,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
+ {
+ "LubData",
+ 16,
+ PROTOBUF_C_LABEL_OPTIONAL,
+ PROTOBUF_C_TYPE_BYTES,
+ offsetof(ConversionInput, has_lubdata),
+ offsetof(ConversionInput, lubdata),
+ NULL,
+ NULL,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
+ {
+ "UseLubricantTransform",
+ 17,
+ PROTOBUF_C_LABEL_OPTIONAL,
+ PROTOBUF_C_TYPE_BOOL,
+ offsetof(ConversionInput, has_uselubricanttransform),
+ offsetof(ConversionInput, uselubricanttransform),
+ NULL,
+ NULL,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
};
static const unsigned conversion_input__field_indices_by_name[] = {
3, /* field[3] = ColorSpace */
8, /* field[8] = DeltaChroma */
9, /* field[9] = DeltaL */
5, /* field[5] = ForwardData */
+ 14, /* field[14] = GbdData */
11, /* field[11] = GenerateHive */
4, /* field[4] = InputCoordinates */
6, /* field[6] = InverseData */
+ 15, /* field[15] = LubData */
10, /* field[10] = ProcessRanges */
7, /* field[7] = SegmentLength */
1, /* field[1] = ThreadA */
2, /* field[2] = ThreadB */
0, /* field[0] = ThreadL */
12, /* field[12] = UseLightInks */
+ 16, /* field[16] = UseLubricantTransform */
13, /* field[13] = VMax */
};
static const ProtobufCIntRange conversion_input__number_ranges[1 + 1] =
{
{ 1, 0 },
- { 0, 14 }
+ { 0, 17 }
};
const ProtobufCMessageDescriptor conversion_input__descriptor =
{
@@ -252,7 +291,7 @@ const ProtobufCMessageDescriptor conversion_input__descriptor =
"ConversionInput",
"",
sizeof(ConversionInput),
- 14,
+ 17,
conversion_input__field_descriptors,
conversion_input__field_indices_by_name,
1, conversion_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/ConversionInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/ConversionInput.pb-c.h
index 794ddaaac..da96bb1cf 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/ConversionInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/ConversionInput.pb-c.h
@@ -56,10 +56,16 @@ struct _ConversionInput
protobuf_c_boolean uselightinks;
protobuf_c_boolean has_vmax;
double vmax;
+ protobuf_c_boolean has_gbddata;
+ ProtobufCBinaryData gbddata;
+ protobuf_c_boolean has_lubdata;
+ ProtobufCBinaryData lubdata;
+ protobuf_c_boolean has_uselubricanttransform;
+ protobuf_c_boolean uselubricanttransform;
};
#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,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, 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
/* ConversionInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/ConversionInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/ConversionInput.pb-c.c
index 92f60a719..ab859a2ff 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/ConversionInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/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[16] =
+static const ProtobufCFieldDescriptor conversion_input__field_descriptors[18] =
{
{
"ThreadL",
@@ -246,11 +246,36 @@ static const ProtobufCFieldDescriptor conversion_input__field_descriptors[16] =
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
+ {
+ "UseLubricantTransform",
+ 17,
+ PROTOBUF_C_LABEL_OPTIONAL,
+ PROTOBUF_C_TYPE_BOOL,
+ offsetof(ConversionInput, has_uselubricanttransform),
+ offsetof(ConversionInput, uselubricanttransform),
+ NULL,
+ NULL,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
+ {
+ "ForFineTuning",
+ 18,
+ PROTOBUF_C_LABEL_OPTIONAL,
+ PROTOBUF_C_TYPE_BOOL,
+ offsetof(ConversionInput, has_forfinetuning),
+ offsetof(ConversionInput, forfinetuning),
+ NULL,
+ NULL,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
};
static const unsigned conversion_input__field_indices_by_name[] = {
3, /* field[3] = ColorSpace */
8, /* field[8] = DeltaChroma */
9, /* field[9] = DeltaL */
+ 17, /* field[17] = ForFineTuning */
5, /* field[5] = ForwardData */
14, /* field[14] = GbdData */
11, /* field[11] = GenerateHive */
@@ -263,12 +288,13 @@ static const unsigned conversion_input__field_indices_by_name[] = {
2, /* field[2] = ThreadB */
0, /* field[0] = ThreadL */
12, /* field[12] = UseLightInks */
+ 16, /* field[16] = UseLubricantTransform */
13, /* field[13] = VMax */
};
static const ProtobufCIntRange conversion_input__number_ranges[1 + 1] =
{
{ 1, 0 },
- { 0, 16 }
+ { 0, 18 }
};
const ProtobufCMessageDescriptor conversion_input__descriptor =
{
@@ -278,7 +304,7 @@ const ProtobufCMessageDescriptor conversion_input__descriptor =
"ConversionInput",
"",
sizeof(ConversionInput),
- 16,
+ 18,
conversion_input__field_descriptors,
conversion_input__field_indices_by_name,
1, conversion_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/ConversionInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/ConversionInput.pb-c.h
index 5f03aeceb..8210457e9 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/ConversionInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/ConversionInput.pb-c.h
@@ -60,10 +60,14 @@ struct _ConversionInput
ProtobufCBinaryData gbddata;
protobuf_c_boolean has_lubdata;
ProtobufCBinaryData lubdata;
+ protobuf_c_boolean has_uselubricanttransform;
+ protobuf_c_boolean uselubricanttransform;
+ protobuf_c_boolean has_forfinetuning;
+ protobuf_c_boolean forfinetuning;
};
#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,NULL, 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, {0,NULL} }
+ , 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, 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0, {0,NULL}, 0, 0, 0, 0 }
/* ConversionInput methods */
diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs
index a1f1538d3..aa55383a7 100644
--- a/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs
@@ -24,7 +24,7 @@ namespace Tango.PMR.ColorLab {
string.Concat(
"ChVDb252ZXJzaW9uSW5wdXQucHJvdG8SElRhbmdvLlBNUi5Db2xvckxhYhoW",
"SW5wdXRDb29yZGluYXRlcy5wcm90bxoQQ29sb3JTcGFjZS5wcm90bxoSUHJv",
- "Y2Vzc1JhbmdlLnByb3RvItIDCg9Db252ZXJzaW9uSW5wdXQSDwoHVGhyZWFk",
+ "Y2Vzc1JhbmdlLnByb3RvIukDCg9Db252ZXJzaW9uSW5wdXQSDwoHVGhyZWFk",
"TBgBIAEoARIPCgdUaHJlYWRBGAIgASgBEg8KB1RocmVhZEIYAyABKAESMgoK",
"Q29sb3JTcGFjZRgEIAEoDjIeLlRhbmdvLlBNUi5Db2xvckxhYi5Db2xvclNw",
"YWNlEj4KEElucHV0Q29vcmRpbmF0ZXMYBSABKAsyJC5UYW5nby5QTVIuQ29s",
@@ -34,12 +34,13 @@ namespace Tango.PMR.ColorLab {
"UmFuZ2VzGAsgAygLMiAuVGFuZ28uUE1SLkNvbG9yTGFiLlByb2Nlc3NSYW5n",
"ZRIUCgxHZW5lcmF0ZUhpdmUYDCABKAgSFAoMVXNlTGlnaHRJbmtzGA0gASgI",
"EgwKBFZNYXgYDiABKAESDwoHR2JkRGF0YRgPIAEoDBIPCgdMdWJEYXRhGBAg",
- "ASgMEh0KFVVzZUx1YnJpY2FudFRyYW5zZm9ybRgRIAEoCEIeChxjb20udHdp",
- "bmUudGFuZ28ucG1yLmNvbG9ybGFiYgZwcm90bzM="));
+ "ASgMEh0KFVVzZUx1YnJpY2FudFRyYW5zZm9ybRgRIAEoCBIVCg1Gb3JGaW5l",
+ "VHVuaW5nGBIgASgIQh4KHGNvbS50d2luZS50YW5nby5wbXIuY29sb3JsYWJi",
+ "BnByb3RvMw=="));
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::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" }, 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", "ForFineTuning" }, null, null, null)
}));
}
#endregion
@@ -87,6 +88,7 @@ namespace Tango.PMR.ColorLab {
gbdData_ = other.gbdData_;
lubData_ = other.lubData_;
useLubricantTransform_ = other.useLubricantTransform_;
+ forFineTuning_ = other.forFineTuning_;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -280,6 +282,17 @@ namespace Tango.PMR.ColorLab {
}
}
+ /// <summary>Field number for the "ForFineTuning" field.</summary>
+ public const int ForFineTuningFieldNumber = 18;
+ private bool forFineTuning_;
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public bool ForFineTuning {
+ get { return forFineTuning_; }
+ set {
+ forFineTuning_ = value;
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public override bool Equals(object other) {
return Equals(other as ConversionInput);
@@ -310,6 +323,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;
return true;
}
@@ -333,6 +347,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();
return hash;
}
@@ -408,6 +423,10 @@ namespace Tango.PMR.ColorLab {
output.WriteRawTag(136, 1);
output.WriteBool(UseLubricantTransform);
}
+ if (ForFineTuning != false) {
+ output.WriteRawTag(144, 1);
+ output.WriteBool(ForFineTuning);
+ }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -462,6 +481,9 @@ namespace Tango.PMR.ColorLab {
if (UseLubricantTransform != false) {
size += 2 + 1;
}
+ if (ForFineTuning != false) {
+ size += 2 + 1;
+ }
return size;
}
@@ -522,6 +544,9 @@ namespace Tango.PMR.ColorLab {
if (other.UseLubricantTransform != false) {
UseLubricantTransform = other.UseLubricantTransform;
}
+ if (other.ForFineTuning != false) {
+ ForFineTuning = other.ForFineTuning;
+ }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -603,6 +628,10 @@ namespace Tango.PMR.ColorLab {
UseLubricantTransform = input.ReadBool();
break;
}
+ case 144: {
+ ForFineTuning = input.ReadBool();
+ break;
+ }
}
}
}