aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/Tango.PMR
diff options
context:
space:
mode:
Diffstat (limited to 'Software/Visual_Studio/Tango.PMR')
-rw-r--r--Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs64
-rw-r--r--Software/Visual_Studio/Tango.PMR/ColorLab/GradientConversionInput.cs65
-rw-r--r--Software/Visual_Studio/Tango.PMR/ColorLab/OutOfGamutInput.cs64
-rw-r--r--Software/Visual_Studio/Tango.PMR/ColorLab/RecommendedProcessTableInput.cs64
4 files changed, 241 insertions, 16 deletions
diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs
index abed81ceb..592297ca0 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",
- "Y2Vzc1JhbmdlLnByb3RvIpEDCg9Db252ZXJzaW9uSW5wdXQSDwoHVGhyZWFk",
+ "Y2Vzc1JhbmdlLnByb3RvIrMDCg9Db252ZXJzaW9uSW5wdXQSDwoHVGhyZWFk",
"TBgBIAEoARIPCgdUaHJlYWRBGAIgASgBEg8KB1RocmVhZEIYAyABKAESMgoK",
"Q29sb3JTcGFjZRgEIAEoDjIeLlRhbmdvLlBNUi5Db2xvckxhYi5Db2xvclNw",
"YWNlEj4KEElucHV0Q29vcmRpbmF0ZXMYBSABKAsyJC5UYW5nby5QTVIuQ29s",
@@ -33,12 +33,12 @@ namespace Tango.PMR.ColorLab {
"C0RlbHRhQ2hyb21hGAkgASgBEg4KBkRlbHRhTBgKIAEoARI3Cg1Qcm9jZXNz",
"UmFuZ2VzGAsgAygLMiAuVGFuZ28uUE1SLkNvbG9yTGFiLlByb2Nlc3NSYW5n",
"ZRIUCgxHZW5lcmF0ZUhpdmUYDCABKAgSFAoMVXNlTGlnaHRJbmtzGA0gASgI",
- "EgwKBFZNYXgYDiABKAFCHgocY29tLnR3aW5lLnRhbmdvLnBtci5jb2xvcmxh",
- "YmIGcHJvdG8z"));
+ "EgwKBFZNYXgYDiABKAESDwoHR2JkRGF0YRgPIAEoDBIPCgdMdWJEYXRhGBAg",
+ "ASgMQh4KHGNvbS50d2luZS50YW5nby5wbXIuY29sb3JsYWJiBnByb3RvMw=="));
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" }, 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" }, null, null, null)
}));
}
#endregion
@@ -83,6 +83,8 @@ namespace Tango.PMR.ColorLab {
generateHive_ = other.generateHive_;
useLightInks_ = other.useLightInks_;
vMax_ = other.vMax_;
+ gbdData_ = other.gbdData_;
+ lubData_ = other.lubData_;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -243,6 +245,28 @@ namespace Tango.PMR.ColorLab {
}
}
+ /// <summary>Field number for the "GbdData" field.</summary>
+ public const int GbdDataFieldNumber = 15;
+ private pb::ByteString gbdData_ = pb::ByteString.Empty;
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public pb::ByteString GbdData {
+ get { return gbdData_; }
+ set {
+ gbdData_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+ }
+ }
+
+ /// <summary>Field number for the "LubData" field.</summary>
+ public const int LubDataFieldNumber = 16;
+ private pb::ByteString lubData_ = pb::ByteString.Empty;
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public pb::ByteString LubData {
+ get { return lubData_; }
+ set {
+ lubData_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public override bool Equals(object other) {
return Equals(other as ConversionInput);
@@ -270,6 +294,8 @@ namespace Tango.PMR.ColorLab {
if (GenerateHive != other.GenerateHive) return false;
if (UseLightInks != other.UseLightInks) return false;
if (VMax != other.VMax) return false;
+ if (GbdData != other.GbdData) return false;
+ if (LubData != other.LubData) return false;
return true;
}
@@ -290,6 +316,8 @@ namespace Tango.PMR.ColorLab {
if (GenerateHive != false) hash ^= GenerateHive.GetHashCode();
if (UseLightInks != false) hash ^= UseLightInks.GetHashCode();
if (VMax != 0D) hash ^= VMax.GetHashCode();
+ if (GbdData.Length != 0) hash ^= GbdData.GetHashCode();
+ if (LubData.Length != 0) hash ^= LubData.GetHashCode();
return hash;
}
@@ -353,6 +381,14 @@ namespace Tango.PMR.ColorLab {
output.WriteRawTag(113);
output.WriteDouble(VMax);
}
+ if (GbdData.Length != 0) {
+ output.WriteRawTag(122);
+ output.WriteBytes(GbdData);
+ }
+ if (LubData.Length != 0) {
+ output.WriteRawTag(130, 1);
+ output.WriteBytes(LubData);
+ }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -398,6 +434,12 @@ namespace Tango.PMR.ColorLab {
if (VMax != 0D) {
size += 1 + 8;
}
+ if (GbdData.Length != 0) {
+ size += 1 + pb::CodedOutputStream.ComputeBytesSize(GbdData);
+ }
+ if (LubData.Length != 0) {
+ size += 2 + pb::CodedOutputStream.ComputeBytesSize(LubData);
+ }
return size;
}
@@ -449,6 +491,12 @@ namespace Tango.PMR.ColorLab {
if (other.VMax != 0D) {
VMax = other.VMax;
}
+ if (other.GbdData.Length != 0) {
+ GbdData = other.GbdData;
+ }
+ if (other.LubData.Length != 0) {
+ LubData = other.LubData;
+ }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -518,6 +566,14 @@ namespace Tango.PMR.ColorLab {
VMax = input.ReadDouble();
break;
}
+ case 122: {
+ GbdData = input.ReadBytes();
+ break;
+ }
+ case 130: {
+ LubData = input.ReadBytes();
+ break;
+ }
}
}
}
diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/GradientConversionInput.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/GradientConversionInput.cs
index 85257e80c..abb24ddb0 100644
--- a/Software/Visual_Studio/Tango.PMR/ColorLab/GradientConversionInput.cs
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/GradientConversionInput.cs
@@ -24,18 +24,19 @@ namespace Tango.PMR.ColorLab {
string.Concat(
"Ch1HcmFkaWVudENvbnZlcnNpb25JbnB1dC5wcm90bxISVGFuZ28uUE1SLkNv",
"bG9yTGFiGhJQcm9jZXNzUmFuZ2UucHJvdG8aEUlucHV0TGlxdWlkLnByb3Rv",
- "GhdHcmFkaWVudElucHV0U3RvcC5wcm90byKeAgoXR3JhZGllbnRDb252ZXJz",
+ "GhdHcmFkaWVudElucHV0U3RvcC5wcm90byLAAgoXR3JhZGllbnRDb252ZXJz",
"aW9uSW5wdXQSDwoHVGhyZWFkTBgBIAEoARIPCgdUaHJlYWRBGAIgASgBEg8K",
"B1RocmVhZEIYAyABKAESEwoLRm9yd2FyZERhdGEYBCABKAwSFQoNU2VnbWVu",
"dExlbmd0aBgFIAEoARI0CgVTdG9wcxgGIAMoCzIlLlRhbmdvLlBNUi5Db2xv",
"ckxhYi5HcmFkaWVudElucHV0U3RvcBI1CgxJbnB1dExpcXVpZHMYByADKAsy",
"Hy5UYW5nby5QTVIuQ29sb3JMYWIuSW5wdXRMaXF1aWQSNwoNUHJvY2Vzc1Jh",
- "bmdlcxgIIAMoCzIgLlRhbmdvLlBNUi5Db2xvckxhYi5Qcm9jZXNzUmFuZ2VC",
- "HgocY29tLnR3aW5lLnRhbmdvLnBtci5jb2xvcmxhYmIGcHJvdG8z"));
+ "bmdlcxgIIAMoCzIgLlRhbmdvLlBNUi5Db2xvckxhYi5Qcm9jZXNzUmFuZ2US",
+ "DwoHR2JkRGF0YRgJIAEoDBIPCgdMdWJEYXRhGAogASgMQh4KHGNvbS50d2lu",
+ "ZS50YW5nby5wbXIuY29sb3JsYWJiBnByb3RvMw=="));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
new pbr::FileDescriptor[] { global::Tango.PMR.ColorLab.ProcessRangeReflection.Descriptor, global::Tango.PMR.ColorLab.InputLiquidReflection.Descriptor, global::Tango.PMR.ColorLab.GradientInputStopReflection.Descriptor, },
new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
- new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.GradientConversionInput), global::Tango.PMR.ColorLab.GradientConversionInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ForwardData", "SegmentLength", "Stops", "InputLiquids", "ProcessRanges" }, null, null, null)
+ new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.GradientConversionInput), global::Tango.PMR.ColorLab.GradientConversionInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ForwardData", "SegmentLength", "Stops", "InputLiquids", "ProcessRanges", "GbdData", "LubData" }, null, null, null)
}));
}
#endregion
@@ -74,6 +75,8 @@ namespace Tango.PMR.ColorLab {
stops_ = other.stops_.Clone();
inputLiquids_ = other.inputLiquids_.Clone();
processRanges_ = other.processRanges_.Clone();
+ gbdData_ = other.gbdData_;
+ lubData_ = other.lubData_;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -166,6 +169,28 @@ namespace Tango.PMR.ColorLab {
get { return processRanges_; }
}
+ /// <summary>Field number for the "GbdData" field.</summary>
+ public const int GbdDataFieldNumber = 9;
+ private pb::ByteString gbdData_ = pb::ByteString.Empty;
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public pb::ByteString GbdData {
+ get { return gbdData_; }
+ set {
+ gbdData_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+ }
+ }
+
+ /// <summary>Field number for the "LubData" field.</summary>
+ public const int LubDataFieldNumber = 10;
+ private pb::ByteString lubData_ = pb::ByteString.Empty;
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public pb::ByteString LubData {
+ get { return lubData_; }
+ set {
+ lubData_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public override bool Equals(object other) {
return Equals(other as GradientConversionInput);
@@ -187,6 +212,8 @@ namespace Tango.PMR.ColorLab {
if(!stops_.Equals(other.stops_)) return false;
if(!inputLiquids_.Equals(other.inputLiquids_)) return false;
if(!processRanges_.Equals(other.processRanges_)) return false;
+ if (GbdData != other.GbdData) return false;
+ if (LubData != other.LubData) return false;
return true;
}
@@ -201,6 +228,8 @@ namespace Tango.PMR.ColorLab {
hash ^= stops_.GetHashCode();
hash ^= inputLiquids_.GetHashCode();
hash ^= processRanges_.GetHashCode();
+ if (GbdData.Length != 0) hash ^= GbdData.GetHashCode();
+ if (LubData.Length != 0) hash ^= LubData.GetHashCode();
return hash;
}
@@ -234,6 +263,14 @@ namespace Tango.PMR.ColorLab {
stops_.WriteTo(output, _repeated_stops_codec);
inputLiquids_.WriteTo(output, _repeated_inputLiquids_codec);
processRanges_.WriteTo(output, _repeated_processRanges_codec);
+ if (GbdData.Length != 0) {
+ output.WriteRawTag(74);
+ output.WriteBytes(GbdData);
+ }
+ if (LubData.Length != 0) {
+ output.WriteRawTag(82);
+ output.WriteBytes(LubData);
+ }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -257,6 +294,12 @@ namespace Tango.PMR.ColorLab {
size += stops_.CalculateSize(_repeated_stops_codec);
size += inputLiquids_.CalculateSize(_repeated_inputLiquids_codec);
size += processRanges_.CalculateSize(_repeated_processRanges_codec);
+ if (GbdData.Length != 0) {
+ size += 1 + pb::CodedOutputStream.ComputeBytesSize(GbdData);
+ }
+ if (LubData.Length != 0) {
+ size += 1 + pb::CodedOutputStream.ComputeBytesSize(LubData);
+ }
return size;
}
@@ -283,6 +326,12 @@ namespace Tango.PMR.ColorLab {
stops_.Add(other.stops_);
inputLiquids_.Add(other.inputLiquids_);
processRanges_.Add(other.processRanges_);
+ if (other.GbdData.Length != 0) {
+ GbdData = other.GbdData;
+ }
+ if (other.LubData.Length != 0) {
+ LubData = other.LubData;
+ }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -325,6 +374,14 @@ namespace Tango.PMR.ColorLab {
processRanges_.AddEntriesFrom(input, _repeated_processRanges_codec);
break;
}
+ case 74: {
+ GbdData = input.ReadBytes();
+ break;
+ }
+ case 82: {
+ LubData = input.ReadBytes();
+ break;
+ }
}
}
}
diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/OutOfGamutInput.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/OutOfGamutInput.cs
index adef09dfd..e56cf37fe 100644
--- a/Software/Visual_Studio/Tango.PMR/ColorLab/OutOfGamutInput.cs
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/OutOfGamutInput.cs
@@ -24,18 +24,18 @@ namespace Tango.PMR.ColorLab {
string.Concat(
"ChVPdXRPZkdhbXV0SW5wdXQucHJvdG8SElRhbmdvLlBNUi5Db2xvckxhYhoW",
"SW5wdXRDb29yZGluYXRlcy5wcm90bxoQQ29sb3JTcGFjZS5wcm90bxoSUHJv",
- "Y2Vzc1JhbmdlLnByb3RvIoYCCg9PdXRPZkdhbXV0SW5wdXQSDwoHVGhyZWFk",
+ "Y2Vzc1JhbmdlLnByb3RvIqgCCg9PdXRPZkdhbXV0SW5wdXQSDwoHVGhyZWFk",
"TBgBIAEoARIPCgdUaHJlYWRBGAIgASgBEg8KB1RocmVhZEIYAyABKAESMgoK",
"Q29sb3JTcGFjZRgEIAEoDjIeLlRhbmdvLlBNUi5Db2xvckxhYi5Db2xvclNw",
"YWNlEj4KEElucHV0Q29vcmRpbmF0ZXMYBSABKAsyJC5UYW5nby5QTVIuQ29s",
"b3JMYWIuSW5wdXRDb29yZGluYXRlcxITCgtGb3J3YXJkRGF0YRgGIAEoDBI3",
"Cg1Qcm9jZXNzUmFuZ2VzGAcgAygLMiAuVGFuZ28uUE1SLkNvbG9yTGFiLlBy",
- "b2Nlc3NSYW5nZUIeChxjb20udHdpbmUudGFuZ28ucG1yLmNvbG9ybGFiYgZw",
- "cm90bzM="));
+ "b2Nlc3NSYW5nZRIPCgdHYmREYXRhGAggASgMEg8KB0x1YkRhdGEYCSABKAxC",
+ "HgocY29tLnR3aW5lLnRhbmdvLnBtci5jb2xvcmxhYmIGcHJvdG8z"));
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.OutOfGamutInput), global::Tango.PMR.ColorLab.OutOfGamutInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ColorSpace", "InputCoordinates", "ForwardData", "ProcessRanges" }, 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" }, null, null, null)
}));
}
#endregion
@@ -73,6 +73,8 @@ namespace Tango.PMR.ColorLab {
InputCoordinates = other.inputCoordinates_ != null ? other.InputCoordinates.Clone() : null;
forwardData_ = other.forwardData_;
processRanges_ = other.processRanges_.Clone();
+ gbdData_ = other.gbdData_;
+ lubData_ = other.lubData_;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -156,6 +158,28 @@ namespace Tango.PMR.ColorLab {
get { return processRanges_; }
}
+ /// <summary>Field number for the "GbdData" field.</summary>
+ public const int GbdDataFieldNumber = 8;
+ private pb::ByteString gbdData_ = pb::ByteString.Empty;
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public pb::ByteString GbdData {
+ get { return gbdData_; }
+ set {
+ gbdData_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+ }
+ }
+
+ /// <summary>Field number for the "LubData" field.</summary>
+ public const int LubDataFieldNumber = 9;
+ private pb::ByteString lubData_ = pb::ByteString.Empty;
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public pb::ByteString LubData {
+ get { return lubData_; }
+ set {
+ lubData_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public override bool Equals(object other) {
return Equals(other as OutOfGamutInput);
@@ -176,6 +200,8 @@ namespace Tango.PMR.ColorLab {
if (!object.Equals(InputCoordinates, other.InputCoordinates)) return false;
if (ForwardData != other.ForwardData) return false;
if(!processRanges_.Equals(other.processRanges_)) return false;
+ if (GbdData != other.GbdData) return false;
+ if (LubData != other.LubData) return false;
return true;
}
@@ -189,6 +215,8 @@ namespace Tango.PMR.ColorLab {
if (inputCoordinates_ != null) hash ^= InputCoordinates.GetHashCode();
if (ForwardData.Length != 0) hash ^= ForwardData.GetHashCode();
hash ^= processRanges_.GetHashCode();
+ if (GbdData.Length != 0) hash ^= GbdData.GetHashCode();
+ if (LubData.Length != 0) hash ^= LubData.GetHashCode();
return hash;
}
@@ -224,6 +252,14 @@ namespace Tango.PMR.ColorLab {
output.WriteBytes(ForwardData);
}
processRanges_.WriteTo(output, _repeated_processRanges_codec);
+ if (GbdData.Length != 0) {
+ output.WriteRawTag(66);
+ output.WriteBytes(GbdData);
+ }
+ if (LubData.Length != 0) {
+ output.WriteRawTag(74);
+ output.WriteBytes(LubData);
+ }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -248,6 +284,12 @@ namespace Tango.PMR.ColorLab {
size += 1 + pb::CodedOutputStream.ComputeBytesSize(ForwardData);
}
size += processRanges_.CalculateSize(_repeated_processRanges_codec);
+ if (GbdData.Length != 0) {
+ size += 1 + pb::CodedOutputStream.ComputeBytesSize(GbdData);
+ }
+ if (LubData.Length != 0) {
+ size += 1 + pb::CodedOutputStream.ComputeBytesSize(LubData);
+ }
return size;
}
@@ -278,6 +320,12 @@ namespace Tango.PMR.ColorLab {
ForwardData = other.ForwardData;
}
processRanges_.Add(other.processRanges_);
+ if (other.GbdData.Length != 0) {
+ GbdData = other.GbdData;
+ }
+ if (other.LubData.Length != 0) {
+ LubData = other.LubData;
+ }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -319,6 +367,14 @@ namespace Tango.PMR.ColorLab {
processRanges_.AddEntriesFrom(input, _repeated_processRanges_codec);
break;
}
+ case 66: {
+ GbdData = input.ReadBytes();
+ break;
+ }
+ case 74: {
+ LubData = input.ReadBytes();
+ break;
+ }
}
}
}
diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/RecommendedProcessTableInput.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/RecommendedProcessTableInput.cs
index 7f51ea62c..8384769a6 100644
--- a/Software/Visual_Studio/Tango.PMR/ColorLab/RecommendedProcessTableInput.cs
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/RecommendedProcessTableInput.cs
@@ -24,19 +24,19 @@ namespace Tango.PMR.ColorLab {
string.Concat(
"CiJSZWNvbW1lbmRlZFByb2Nlc3NUYWJsZUlucHV0LnByb3RvEhJUYW5nby5Q",
"TVIuQ29sb3JMYWIaElByb2Nlc3NSYW5nZS5wcm90bxoRSW5wdXRMaXF1aWQu",
- "cHJvdG8aF0dyYWRpZW50SW5wdXRTdG9wLnByb3RvIqICChxSZWNvbW1lbmRl",
+ "cHJvdG8aF0dyYWRpZW50SW5wdXRTdG9wLnByb3RvIsQCChxSZWNvbW1lbmRl",
"ZFByb2Nlc3NUYWJsZUlucHV0Eg8KB1RocmVhZEwYASABKAESDwoHVGhyZWFk",
"QRgCIAEoARIPCgdUaHJlYWRCGAMgASgBEhMKC0ZvcndhcmREYXRhGAQgASgM",
"EjQKBVN0b3BzGAUgAygLMiUuVGFuZ28uUE1SLkNvbG9yTGFiLkdyYWRpZW50",
"SW5wdXRTdG9wEjUKDElucHV0TGlxdWlkcxgGIAMoCzIfLlRhbmdvLlBNUi5D",
"b2xvckxhYi5JbnB1dExpcXVpZBI3Cg1Qcm9jZXNzUmFuZ2VzGAcgAygLMiAu",
"VGFuZ28uUE1SLkNvbG9yTGFiLlByb2Nlc3NSYW5nZRIUCgxVc2VMaWdodElu",
- "a3MYCCABKAhCHgocY29tLnR3aW5lLnRhbmdvLnBtci5jb2xvcmxhYmIGcHJv",
- "dG8z"));
+ "a3MYCCABKAgSDwoHR2JkRGF0YRgJIAEoDBIPCgdMdWJEYXRhGAogASgMQh4K",
+ "HGNvbS50d2luZS50YW5nby5wbXIuY29sb3JsYWJiBnByb3RvMw=="));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
new pbr::FileDescriptor[] { global::Tango.PMR.ColorLab.ProcessRangeReflection.Descriptor, global::Tango.PMR.ColorLab.InputLiquidReflection.Descriptor, global::Tango.PMR.ColorLab.GradientInputStopReflection.Descriptor, },
new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
- new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.RecommendedProcessTableInput), global::Tango.PMR.ColorLab.RecommendedProcessTableInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ForwardData", "Stops", "InputLiquids", "ProcessRanges", "UseLightInks" }, null, null, null)
+ new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.RecommendedProcessTableInput), global::Tango.PMR.ColorLab.RecommendedProcessTableInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ForwardData", "Stops", "InputLiquids", "ProcessRanges", "UseLightInks", "GbdData", "LubData" }, null, null, null)
}));
}
#endregion
@@ -75,6 +75,8 @@ namespace Tango.PMR.ColorLab {
inputLiquids_ = other.inputLiquids_.Clone();
processRanges_ = other.processRanges_.Clone();
useLightInks_ = other.useLightInks_;
+ gbdData_ = other.gbdData_;
+ lubData_ = other.lubData_;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -167,6 +169,28 @@ namespace Tango.PMR.ColorLab {
}
}
+ /// <summary>Field number for the "GbdData" field.</summary>
+ public const int GbdDataFieldNumber = 9;
+ private pb::ByteString gbdData_ = pb::ByteString.Empty;
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public pb::ByteString GbdData {
+ get { return gbdData_; }
+ set {
+ gbdData_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+ }
+ }
+
+ /// <summary>Field number for the "LubData" field.</summary>
+ public const int LubDataFieldNumber = 10;
+ private pb::ByteString lubData_ = pb::ByteString.Empty;
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public pb::ByteString LubData {
+ get { return lubData_; }
+ set {
+ lubData_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public override bool Equals(object other) {
return Equals(other as RecommendedProcessTableInput);
@@ -188,6 +212,8 @@ namespace Tango.PMR.ColorLab {
if(!inputLiquids_.Equals(other.inputLiquids_)) return false;
if(!processRanges_.Equals(other.processRanges_)) return false;
if (UseLightInks != other.UseLightInks) return false;
+ if (GbdData != other.GbdData) return false;
+ if (LubData != other.LubData) return false;
return true;
}
@@ -202,6 +228,8 @@ namespace Tango.PMR.ColorLab {
hash ^= inputLiquids_.GetHashCode();
hash ^= processRanges_.GetHashCode();
if (UseLightInks != false) hash ^= UseLightInks.GetHashCode();
+ if (GbdData.Length != 0) hash ^= GbdData.GetHashCode();
+ if (LubData.Length != 0) hash ^= LubData.GetHashCode();
return hash;
}
@@ -235,6 +263,14 @@ namespace Tango.PMR.ColorLab {
output.WriteRawTag(64);
output.WriteBool(UseLightInks);
}
+ if (GbdData.Length != 0) {
+ output.WriteRawTag(74);
+ output.WriteBytes(GbdData);
+ }
+ if (LubData.Length != 0) {
+ output.WriteRawTag(82);
+ output.WriteBytes(LubData);
+ }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -258,6 +294,12 @@ namespace Tango.PMR.ColorLab {
if (UseLightInks != false) {
size += 1 + 1;
}
+ if (GbdData.Length != 0) {
+ size += 1 + pb::CodedOutputStream.ComputeBytesSize(GbdData);
+ }
+ if (LubData.Length != 0) {
+ size += 1 + pb::CodedOutputStream.ComputeBytesSize(LubData);
+ }
return size;
}
@@ -284,6 +326,12 @@ namespace Tango.PMR.ColorLab {
if (other.UseLightInks != false) {
UseLightInks = other.UseLightInks;
}
+ if (other.GbdData.Length != 0) {
+ GbdData = other.GbdData;
+ }
+ if (other.LubData.Length != 0) {
+ LubData = other.LubData;
+ }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -326,6 +374,14 @@ namespace Tango.PMR.ColorLab {
UseLightInks = input.ReadBool();
break;
}
+ case 74: {
+ GbdData = input.ReadBytes();
+ break;
+ }
+ case 82: {
+ LubData = input.ReadBytes();
+ break;
+ }
}
}
}