From dd96ebe466a3dbef253d8568910faf199b689b21 Mon Sep 17 00:00:00 2001 From: Roy Date: Mon, 12 Dec 2022 12:56:50 +0200 Subject: Fixed collision of ConversionType. --- Software/PMR/Messages/ColorLab/ConversionInput.proto | 3 ++- Software/PMR/Messages/ColorLab/ConversionType.proto | 10 ++++++++++ Software/PMR/Messages/ColorLab/OutOfGamutInput.proto | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 Software/PMR/Messages/ColorLab/ConversionType.proto (limited to 'Software/PMR/Messages') 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 -- cgit v1.3.1