diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2024-11-24 23:28:19 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2024-11-24 23:28:19 +0200 |
| commit | 9e9a565b76877c7bcedd82639c4b5f851196ea90 (patch) | |
| tree | 81e111fa5cd84d48d9b4aadfeaf6cdcf29267c31 /Software/PMR | |
| parent | 331266b13685e16520ae5baa8a7aff50789c31df (diff) | |
| download | Tango-9e9a565b76877c7bcedd82639c4b5f851196ea90.tar.gz Tango-9e9a565b76877c7bcedd82639c4b5f851196ea90.zip | |
Added Extra Inks + Color Blending + MS Handling.
Removed Violet Impl.
Updated Inks LAB.
Diffstat (limited to 'Software/PMR')
5 files changed, 30 insertions, 24 deletions
diff --git a/Software/PMR/Messages/ColorLab/ColorMeasurement.proto b/Software/PMR/Messages/ColorLab/ColorMeasurement.proto deleted file mode 100644 index a5e179f2f..000000000 --- a/Software/PMR/Messages/ColorLab/ColorMeasurement.proto +++ /dev/null @@ -1,17 +0,0 @@ -syntax = "proto3"; - -package Tango.PMR.ColorLab; -option java_package = "com.twine.tango.pmr.colorlab"; - -message ColorMeasurement -{ - double C = 1; - double M = 2; - double Y = 3; - double K = 4; - double V = 5; - - double L = 10; - double A = 11; - double B = 12; -}
\ No newline at end of file diff --git a/Software/PMR/Messages/ColorLab/ConversionInput.proto b/Software/PMR/Messages/ColorLab/ConversionInput.proto index 1b45ac5cf..601a231a5 100644 --- a/Software/PMR/Messages/ColorLab/ConversionInput.proto +++ b/Software/PMR/Messages/ColorLab/ConversionInput.proto @@ -7,7 +7,6 @@ import "InputCoordinates.proto"; import "ColorSpace.proto"; import "ProcessRange.proto"; import "ConversionType.proto"; -import "ColorMeasurement.proto"; message ConversionInput { @@ -29,10 +28,4 @@ message ConversionInput bytes LubData = 16; bool UseLubricantTransform = 17; ConversionType ConversionType = 18; - int32 CMYKVPredictionType = 19; - int32 CMYKVPredictionMethod = 20; - double CMYKVHueThreshhold = 21; - double CMYKV_K = 22; - double SimpleRGBPreviewFactor = 23; - repeated ColorMeasurement ColorMeasurements = 24; }
\ No newline at end of file diff --git a/Software/PMR/Messages/ColorLab/InputLiquid.proto b/Software/PMR/Messages/ColorLab/InputLiquid.proto index add34e2eb..5fb8523bf 100644 --- a/Software/PMR/Messages/ColorLab/InputLiquid.proto +++ b/Software/PMR/Messages/ColorLab/InputLiquid.proto @@ -12,4 +12,6 @@ message InputLiquid CalibrationData CalibrationData = 2; double MaxNanoliterPerCentimeter = 3; double Volume = 4; + bool IsExtraInk = 5; + int32 Color = 6; }
\ No newline at end of file diff --git a/Software/PMR/Messages/ColorLab/LiquidType.proto b/Software/PMR/Messages/ColorLab/LiquidType.proto index 8ca966062..ba57de125 100644 --- a/Software/PMR/Messages/ColorLab/LiquidType.proto +++ b/Software/PMR/Messages/ColorLab/LiquidType.proto @@ -38,4 +38,18 @@ enum LiquidType Violet = 10; + Blue = 11; + + LightBlue = 12; + + Orange = 13; + + LightOrange = 14; + + Rubine = 15; + + LightRubine = 16; + + Navy = 17; + } diff --git a/Software/PMR/Messages/Printing/DispenserLiquidType.proto b/Software/PMR/Messages/Printing/DispenserLiquidType.proto index b362b3f00..5472f18e0 100644 --- a/Software/PMR/Messages/Printing/DispenserLiquidType.proto +++ b/Software/PMR/Messages/Printing/DispenserLiquidType.proto @@ -38,4 +38,18 @@ enum DispenserLiquidType Violet = 10; + Blue = 11; + + LightBlue = 12; + + Orange = 13; + + LightOrange = 14; + + Rubine = 15; + + LightRubine = 16; + + Navy = 17; + } |