Implemented ColorLib gradient generation API interface.

5 files changed, 53 insertions, 12 deletions

diff --git a/Software/PMR/Messages/ColorLab/GradientConversionInput.proto b/Software/PMR/Messages/ColorLab/GradientConversionInput.proto
index 08cbe585c..35c885495 100644
--- a/Software/PMR/Messages/ColorLab/GradientConversionInput.proto
+++ b/Software/PMR/Messages/ColorLab/GradientConversionInput.proto
@@ -5,7 +5,7 @@ option java_package = "com.twine.tango.pmr.colorlab";
 
 import "ProcessRange.proto";
 import "InputLiquid.proto";
-import "InputRGB.proto";
+import "GradientInputStop.proto";
 
 message GradientConversionInput
 {
@@ -14,9 +14,7 @@ message GradientConversionInput
 	double ThreadB = 3;
 	bytes ForwardData = 4;
 	double SegmentLength = 5;
-	double DeltaChroma = 6;
-	double DeltaL = 7;
-	repeated InputRGB Colors = 8;
-	repeated InputLiquid InputLiquids = 9;
-	repeated ProcessRange ProcessRanges = 10;
+	repeated GradientInputStop Stops = 6;
+	repeated InputLiquid InputLiquids = 7;
+	repeated ProcessRange ProcessRanges = 8;
 }
\ No newline at end of file
diff --git a/Software/PMR/Messages/ColorLab/GradientConversionOutput.proto b/Software/PMR/Messages/ColorLab/GradientConversionOutput.proto
index 57b74e22b..1af508310 100644
--- a/Software/PMR/Messages/ColorLab/GradientConversionOutput.proto
+++ b/Software/PMR/Messages/ColorLab/GradientConversionOutput.proto
@@ -3,11 +3,11 @@ syntax = "proto3";
 package Tango.PMR.ColorLab;
 option java_package = "com.twine.tango.pmr.colorlab";
 
-import "OutputCoordinates.proto";
+import "GradientOutputStop.proto";
 
 message GradientConversionOutput
 {
-	repeated OutputCoordinates Coordinates = 1;
+	repeated GradientOutputStop Stops = 1;
 	bool HasError = 2;
 	string ErrorMessage = 3;
 }
\ No newline at end of file
diff --git a/Software/PMR/Messages/ColorLab/GradientInputStop.proto b/Software/PMR/Messages/ColorLab/GradientInputStop.proto
new file mode 100644
index 000000000..5b7cbd890
--- /dev/null
+++ b/Software/PMR/Messages/ColorLab/GradientInputStop.proto
@@ -0,0 +1,29 @@
+syntax = "proto3";
+
+import "ColorSpace.proto";
+import "LiquidVolume.proto";
+
+package Tango.PMR.ColorLab;
+option java_package = "com.twine.tango.pmr.colorlab";
+
+message GradientInputStop
+{
+	double Offset = 1;
+
+	ColorSpace ColorSpace = 2;
+
+	int32 Red = 3;
+	int32 Green = 4;
+	int32 Blue = 5;
+
+	double Cyan = 6;
+	double Magenta = 7;
+	double Yellow = 8;
+	double Key = 9;
+
+	double L = 10;
+	double A = 11;
+	double B = 12;
+
+	repeated LiquidVolume LiquidVolumes = 13;
+}
\ No newline at end of file
diff --git a/Software/PMR/Messages/ColorLab/GradientOutputStop.proto b/Software/PMR/Messages/ColorLab/GradientOutputStop.proto
new file mode 100644
index 000000000..2c9479870
--- /dev/null
+++ b/Software/PMR/Messages/ColorLab/GradientOutputStop.proto
@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+package Tango.PMR.ColorLab;
+option java_package = "com.twine.tango.pmr.colorlab";
+
+import "OutputLiquid.proto";
+
+message GradientOutputStop
+{
+	double Offset = 1;
+	int32 ProcessParametersTableIndex = 2;
+  	repeated OutputLiquid OutputLiquids = 3;
+}
\ No newline at end of file
diff --git a/Software/PMR/Messages/ColorLab/InputRGB.proto b/Software/PMR/Messages/ColorLab/LiquidVolume.proto
index bc0983fb6..cf5da9101 100644
--- a/Software/PMR/Messages/ColorLab/InputRGB.proto
+++ b/Software/PMR/Messages/ColorLab/LiquidVolume.proto
@@ -1,11 +1,12 @@
 syntax = "proto3";
 
+import "LiquidType.proto";
+
 package Tango.PMR.ColorLab;
 option java_package = "com.twine.tango.pmr.colorlab";
 
-message InputRGB
+message LiquidVolume
 {
-	int32 Red = 1;
-	int32 Green = 2;
-	int32 Blue = 3;
+	LiquidType LiquidType = 1;
+	double Volume = 2;
 }
\ No newline at end of file