aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Software/PMR/Messages/ColorLab/ConversionInput.proto3
-rw-r--r--Software/PMR/Messages/ColorLab/ConversionType.proto10
-rw-r--r--Software/PMR/Messages/ColorLab/OutOfGamutInput.proto2
-rw-r--r--Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/ConversionInput.pb-c.c12
-rw-r--r--Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/ConversionInput.pb-c.h7
-rw-r--r--Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/OutOfGamutInput.pb-c.c19
-rw-r--r--Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/OutOfGamutInput.pb-c.h5
-rw-r--r--Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Tango.ColorLib_v6.vcxproj2
-rw-r--r--Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Tango.ColorLib_v6.vcxproj.filters6
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs2
-rw-r--r--Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs11
-rw-r--r--Software/Visual_Studio/Tango.ColorConversion/IColorConverter.cs4
-rw-r--r--Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs63
-rw-r--r--Software/Visual_Studio/Tango.PMR/ColorLab/ConversionType.cs45
-rw-r--r--Software/Visual_Studio/Tango.PMR/ColorLab/OutOfGamutInput.cs52
-rw-r--r--Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj3
16 files changed, 180 insertions, 66 deletions
diff --git a/Software/PMR/Messages/ColorLab/ConversionInput.proto b/Software/PMR/Messages/ColorLab/ConversionInput.proto
index a64870f52..601a231a5 100644
--- a/Software/PMR/Messages/ColorLab/ConversionInput.proto
+++ b/Software/PMR/Messages/ColorLab/ConversionInput.proto
@@ -6,6 +6,7 @@ option java_package = "com.twine.tango.pmr.colorlab";
import "InputCoordinates.proto";
import "ColorSpace.proto";
import "ProcessRange.proto";
+import "ConversionType.proto";
message ConversionInput
{
@@ -26,5 +27,5 @@ message ConversionInput
bytes GbdData = 15;
bytes LubData = 16;
bool UseLubricantTransform = 17;
- bool ForFineTuning = 18;
+ ConversionType ConversionType = 18;
} \ No newline at end of file
diff --git a/Software/PMR/Messages/ColorLab/ConversionType.proto b/Software/PMR/Messages/ColorLab/ConversionType.proto
new file mode 100644
index 000000000..ad04b7b70
--- /dev/null
+++ b/Software/PMR/Messages/ColorLab/ConversionType.proto
@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+package Tango.PMR.ColorLab;
+option java_package = "com.twine.tango.pmr.colorlab";
+
+enum ConversionType
+{
+ Default = 0;
+ FineTuning = 1;
+}
diff --git a/Software/PMR/Messages/ColorLab/OutOfGamutInput.proto b/Software/PMR/Messages/ColorLab/OutOfGamutInput.proto
index 1b361a180..1d242c8b7 100644
--- a/Software/PMR/Messages/ColorLab/OutOfGamutInput.proto
+++ b/Software/PMR/Messages/ColorLab/OutOfGamutInput.proto
@@ -6,6 +6,7 @@ option java_package = "com.twine.tango.pmr.colorlab";
import "InputCoordinates.proto";
import "ColorSpace.proto";
import "ProcessRange.proto";
+import "ConversionType.proto";
message OutOfGamutInput
{
@@ -19,4 +20,5 @@ message OutOfGamutInput
bytes GbdData = 8;
bytes LubData = 9;
bool UseLubricantTransform = 10;
+ ConversionType ConversionType = 11;
} \ No newline at end of file
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 ab859a2ff..157c06832 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
@@ -259,13 +259,13 @@ static const ProtobufCFieldDescriptor conversion_input__field_descriptors[18] =
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
- "ForFineTuning",
+ "ConversionType",
18,
PROTOBUF_C_LABEL_OPTIONAL,
- PROTOBUF_C_TYPE_BOOL,
- offsetof(ConversionInput, has_forfinetuning),
- offsetof(ConversionInput, forfinetuning),
- NULL,
+ PROTOBUF_C_TYPE_ENUM,
+ offsetof(ConversionInput, has_conversiontype),
+ offsetof(ConversionInput, conversiontype),
+ &conversion_type__descriptor,
NULL,
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
@@ -273,9 +273,9 @@ static const ProtobufCFieldDescriptor conversion_input__field_descriptors[18] =
};
static const unsigned conversion_input__field_indices_by_name[] = {
3, /* field[3] = ColorSpace */
+ 17, /* field[17] = ConversionType */
8, /* field[8] = DeltaChroma */
9, /* field[9] = DeltaL */
- 17, /* field[17] = ForFineTuning */
5, /* field[5] = ForwardData */
14, /* field[14] = GbdData */
11, /* field[11] = GenerateHive */
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 8210457e9..bc7638822 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
@@ -17,6 +17,7 @@ PROTOBUF_C__BEGIN_DECLS
#include "InputCoordinates.pb-c.h"
#include "ColorSpace.pb-c.h"
#include "ProcessRange.pb-c.h"
+#include "ConversionType.pb-c.h"
typedef struct _ConversionInput ConversionInput;
@@ -62,12 +63,12 @@ struct _ConversionInput
ProtobufCBinaryData lubdata;
protobuf_c_boolean has_uselubricanttransform;
protobuf_c_boolean uselubricanttransform;
- protobuf_c_boolean has_forfinetuning;
- protobuf_c_boolean forfinetuning;
+ protobuf_c_boolean has_conversiontype;
+ ConversionType conversiontype;
};
#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, 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, CONVERSION_TYPE__Default }
/* ConversionInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/OutOfGamutInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/OutOfGamutInput.pb-c.c
index 876fbb7a9..2db72703e 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/OutOfGamutInput.pb-c.c
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/OutOfGamutInput.pb-c.c
@@ -52,7 +52,7 @@ void out_of_gamut_input__free_unpacked
assert(message->base.descriptor == &out_of_gamut_input__descriptor);
protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
}
-static const ProtobufCFieldDescriptor out_of_gamut_input__field_descriptors[10] =
+static const ProtobufCFieldDescriptor out_of_gamut_input__field_descriptors[11] =
{
{
"ThreadL",
@@ -174,9 +174,22 @@ static const ProtobufCFieldDescriptor out_of_gamut_input__field_descriptors[10]
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
+ {
+ "ConversionType",
+ 11,
+ PROTOBUF_C_LABEL_OPTIONAL,
+ PROTOBUF_C_TYPE_ENUM,
+ offsetof(OutOfGamutInput, has_conversiontype),
+ offsetof(OutOfGamutInput, conversiontype),
+ &conversion_type__descriptor,
+ NULL,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
};
static const unsigned out_of_gamut_input__field_indices_by_name[] = {
3, /* field[3] = ColorSpace */
+ 10, /* field[10] = ConversionType */
5, /* field[5] = ForwardData */
7, /* field[7] = GbdData */
4, /* field[4] = InputCoordinates */
@@ -190,7 +203,7 @@ static const unsigned out_of_gamut_input__field_indices_by_name[] = {
static const ProtobufCIntRange out_of_gamut_input__number_ranges[1 + 1] =
{
{ 1, 0 },
- { 0, 10 }
+ { 0, 11 }
};
const ProtobufCMessageDescriptor out_of_gamut_input__descriptor =
{
@@ -200,7 +213,7 @@ const ProtobufCMessageDescriptor out_of_gamut_input__descriptor =
"OutOfGamutInput",
"",
sizeof(OutOfGamutInput),
- 10,
+ 11,
out_of_gamut_input__field_descriptors,
out_of_gamut_input__field_indices_by_name,
1, out_of_gamut_input__number_ranges,
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/OutOfGamutInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/OutOfGamutInput.pb-c.h
index 41d5749be..99fd013e0 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/OutOfGamutInput.pb-c.h
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/OutOfGamutInput.pb-c.h
@@ -17,6 +17,7 @@ PROTOBUF_C__BEGIN_DECLS
#include "InputCoordinates.pb-c.h"
#include "ColorSpace.pb-c.h"
#include "ProcessRange.pb-c.h"
+#include "ConversionType.pb-c.h"
typedef struct _OutOfGamutInput OutOfGamutInput;
@@ -48,10 +49,12 @@ struct _OutOfGamutInput
ProtobufCBinaryData lubdata;
protobuf_c_boolean has_uselubricanttransform;
protobuf_c_boolean uselubricanttransform;
+ protobuf_c_boolean has_conversiontype;
+ ConversionType conversiontype;
};
#define OUT_OF_GAMUT_INPUT__INIT \
{ PROTOBUF_C_MESSAGE_INIT (&out_of_gamut_input__descriptor) \
- , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0,NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0 }
+ , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0,NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0, 0, CONVERSION_TYPE__Default }
/* OutOfGamutInput methods */
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Tango.ColorLib_v6.vcxproj b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Tango.ColorLib_v6.vcxproj
index 6192a5652..3db9667a9 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Tango.ColorLib_v6.vcxproj
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Tango.ColorLib_v6.vcxproj
@@ -174,6 +174,7 @@
<ClInclude Include="PMR\ColorLab\ColorSpace.pb-c.h" />
<ClInclude Include="PMR\ColorLab\ConversionInput.pb-c.h" />
<ClInclude Include="PMR\ColorLab\ConversionOutput.pb-c.h" />
+ <ClInclude Include="PMR\ColorLab\ConversionType.pb-c.h" />
<ClInclude Include="PMR\ColorLab\GradientConversionInput.pb-c.h" />
<ClInclude Include="PMR\ColorLab\GradientConversionOutput.pb-c.h" />
<ClInclude Include="PMR\ColorLab\GradientInputStop.pb-c.h" />
@@ -226,6 +227,7 @@
<ClCompile Include="PMR\ColorLab\ColorSpace.pb-c.c" />
<ClCompile Include="PMR\ColorLab\ConversionInput.pb-c.c" />
<ClCompile Include="PMR\ColorLab\ConversionOutput.pb-c.c" />
+ <ClCompile Include="PMR\ColorLab\ConversionType.pb-c.c" />
<ClCompile Include="PMR\ColorLab\GradientConversionInput.pb-c.c" />
<ClCompile Include="PMR\ColorLab\GradientConversionOutput.pb-c.c" />
<ClCompile Include="PMR\ColorLab\GradientInputStop.pb-c.c" />
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Tango.ColorLib_v6.vcxproj.filters b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Tango.ColorLib_v6.vcxproj.filters
index dec116881..43f65d93d 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Tango.ColorLib_v6.vcxproj.filters
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/Tango.ColorLib_v6.vcxproj.filters
@@ -177,6 +177,9 @@
<ClInclude Include="LubTable.h">
<Filter>Utils</Filter>
</ClInclude>
+ <ClInclude Include="PMR\ColorLab\ConversionType.pb-c.h">
+ <Filter>PMR</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="Exports.cpp">
@@ -320,5 +323,8 @@
<ClCompile Include="LubTable.cpp">
<Filter>Utils</Filter>
</ClCompile>
+ <ClCompile Include="PMR\ColorLab\ConversionType.pb-c.c">
+ <Filter>PMR</Filter>
+ </ClCompile>
</ItemGroup>
</Project> \ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs
index 9f251939c..14c642cd1 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs
@@ -1439,7 +1439,7 @@ namespace Tango.PPC.Jobs.Models
try
{
IsBusy = true;
- var output = _converter.Convert(stop, SegmentModel.Job.Machine.Configuration, SegmentModel.Job.Rml, false, false, false, true);
+ var output = _converter.Convert(stop, SegmentModel.Job.Machine.Configuration, SegmentModel.Job.Rml, false, false, false, ConversionType.FineTuning);
_cyan = (output.SingleCoordinates.OutputLiquids.SingleOrDefault(x => x.LiquidType == PMR.ColorLab.LiquidType.Cyan).Volume);
_yellow = (output.SingleCoordinates.OutputLiquids.SingleOrDefault(x => x.LiquidType == PMR.ColorLab.LiquidType.Yellow).Volume);
diff --git a/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs b/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs
index f76e3bd39..2bce461d3 100644
--- a/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs
+++ b/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs
@@ -65,7 +65,7 @@ namespace Tango.ColorConversion
return output;
}
- public ConversionOutput Convert(BrushStop stop, Configuration configuration, Rml rml, bool generateHive, bool lightInksInstalled, bool useLightInks = false, bool forFineTuning = false)
+ public ConversionOutput Convert(BrushStop stop, Configuration configuration, Rml rml, bool generateHive, bool lightInksInstalled, bool useLightInks = false, ConversionType conversionType = ConversionType.Default)
{
if (stop == null)
{
@@ -99,7 +99,7 @@ namespace Tango.ColorConversion
conversionInput.InputCoordinates = new InputCoordinates();
- conversionInput.ForFineTuning = forFineTuning;
+ conversionInput.ConversionType = conversionType;
if (stop.BrushColorSpace == ColorSpaces.RGB)
{
@@ -112,7 +112,7 @@ namespace Tango.ColorConversion
conversionInput.InputCoordinates.L = stop.L;
conversionInput.InputCoordinates.A = stop.A;
conversionInput.InputCoordinates.B = stop.B;
- if(forFineTuning)
+ if(conversionType == ConversionType.FineTuning)
{
conversionInput.InputCoordinates.Cyan = stop.Cyan;
conversionInput.InputCoordinates.Magenta = stop.Magenta;
@@ -498,7 +498,6 @@ namespace Tango.ColorConversion
return GetRecommendedProcessParameters( rml, job.Machine, stops, group, useLightInks );
}
-
public ProcessParametersTable GetRecommendedProcessParameters(Rml rml, Machine machine, List<BrushStop> stops, ProcessParametersTablesGroup group, bool useLightInks = false)
{
var configuration = machine.Configuration;
@@ -696,11 +695,11 @@ namespace Tango.ColorConversion
return processParameters;
}
- public Task<ConversionOutput> ConvertAsync(BrushStop stop, Configuration configuration, Rml rml, bool generateHive, bool lightInksInstalled, bool useLightInks = false, bool forFineTuning = false)
+ public Task<ConversionOutput> ConvertAsync(BrushStop stop, Configuration configuration, Rml rml, bool generateHive, bool lightInksInstalled, bool useLightInks = false, ConversionType conversionType = ConversionType.Default)
{
return Task.Factory.StartNew<ConversionOutput>(() =>
{
- return Convert(stop, configuration, rml, generateHive, lightInksInstalled, useLightInks, forFineTuning);
+ return Convert(stop, configuration, rml, generateHive, lightInksInstalled, useLightInks, conversionType);
});
}
diff --git a/Software/Visual_Studio/Tango.ColorConversion/IColorConverter.cs b/Software/Visual_Studio/Tango.ColorConversion/IColorConverter.cs
index 92733cf0b..ed3d6ec85 100644
--- a/Software/Visual_Studio/Tango.ColorConversion/IColorConverter.cs
+++ b/Software/Visual_Studio/Tango.ColorConversion/IColorConverter.cs
@@ -15,10 +15,10 @@ namespace Tango.ColorConversion
public interface IColorConverter
{
ConversionOutput Convert(ConversionInput conversionInput, int version);
- ConversionOutput Convert(BrushStop stop, Configuration configuration, Rml rml, bool generateHive, bool lightInksInstalled, bool useLightInks = false, bool forFineTuning = false);
+ ConversionOutput Convert(BrushStop stop, Configuration configuration, Rml rml, bool generateHive, bool lightInksInstalled, bool useLightInks = false, ConversionType conversionType = ConversionType.Default);
ConversionOutput Convert(BrushStop stop, bool generateHive, bool useLightInks = false);
ConversionOutput Convert(Job job, Color color, bool generateHive, bool useLightInks = false);
- Task<ConversionOutput> ConvertAsync(BrushStop stop, Configuration configuration, Rml rml, bool generateHive, bool lightInksInstalled, bool useLightInks = false, bool forFineTuning = false);
+ Task<ConversionOutput> ConvertAsync(BrushStop stop, Configuration configuration, Rml rml, bool generateHive, bool lightInksInstalled, bool useLightInks = false, ConversionType conversionType = ConversionType.Default);
Task<ConversionOutput> ConvertAsync(BrushStop stop, bool generateHive, bool useLightInks = false);
Task<ConversionOutput> ConvertAsync(Job job, Color color, bool generateHive, bool useLightInks = false);
bool IsOutOfGamut(BrushStop stop);
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
generated by cgit v1.3.1 (git 2.54.0) at 2026-06-19 16:40:27 +0000