diff options
Diffstat (limited to 'Software')
6 files changed, 57 insertions, 9 deletions
diff --git a/Software/PMR/Messages/ColorLab/RecommendedProcessTableInput.proto b/Software/PMR/Messages/ColorLab/RecommendedProcessTableInput.proto index 62ddc1f07..ef4595c50 100644 --- a/Software/PMR/Messages/ColorLab/RecommendedProcessTableInput.proto +++ b/Software/PMR/Messages/ColorLab/RecommendedProcessTableInput.proto @@ -20,4 +20,5 @@ message RecommendedProcessTableInput bytes GbdData = 9; bytes LubData = 10; bool UseLubricantTransform = 11; + double VMax = 12; }
\ No newline at end of file diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c index 39c139cda..90164c8b7 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/RecommendedProcessTableInput.pb-c.c @@ -52,7 +52,7 @@ void recommended_process_table_input__free_unpacked assert(message->base.descriptor == &recommended_process_table_input__descriptor); protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); } -static const ProtobufCFieldDescriptor recommended_process_table_input__field_descriptors[11] = +static const ProtobufCFieldDescriptor recommended_process_table_input__field_descriptors[12] = { { "ThreadL", @@ -186,6 +186,18 @@ static const ProtobufCFieldDescriptor recommended_process_table_input__field_des 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, + { + "VMax", + 12, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_DOUBLE, + offsetof(RecommendedProcessTableInput, has_vmax), + offsetof(RecommendedProcessTableInput, vmax), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, }; static const unsigned recommended_process_table_input__field_indices_by_name[] = { 3, /* field[3] = ForwardData */ @@ -199,11 +211,12 @@ static const unsigned recommended_process_table_input__field_indices_by_name[] = 0, /* field[0] = ThreadL */ 7, /* field[7] = UseLightInks */ 10, /* field[10] = UseLubricantTransform */ + 11, /* field[11] = VMax */ }; static const ProtobufCIntRange recommended_process_table_input__number_ranges[1 + 1] = { { 1, 0 }, - { 0, 11 } + { 0, 12 } }; const ProtobufCMessageDescriptor recommended_process_table_input__descriptor = { @@ -213,7 +226,7 @@ const ProtobufCMessageDescriptor recommended_process_table_input__descriptor = "RecommendedProcessTableInput", "", sizeof(RecommendedProcessTableInput), - 11, + 12, recommended_process_table_input__field_descriptors, recommended_process_table_input__field_indices_by_name, 1, recommended_process_table_input__number_ranges, diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h index e75ddd39e..df4a26da3 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/RecommendedProcessTableInput.pb-c.h @@ -51,10 +51,12 @@ struct _RecommendedProcessTableInput ProtobufCBinaryData lubdata; protobuf_c_boolean has_uselubricanttransform; protobuf_c_boolean uselubricanttransform; + protobuf_c_boolean has_vmax; + double vmax; }; #define RECOMMENDED_PROCESS_TABLE_INPUT__INIT \ { PROTOBUF_C_MESSAGE_INIT (&recommended_process_table_input__descriptor) \ - , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0,NULL, 0,NULL, 0,NULL, 0, 0, 0, {0,NULL}, 0, {0,NULL}, 0, 0 } + , 0, 0, 0, 0, 0, 0, 0, {0,NULL}, 0,NULL, 0,NULL, 0,NULL, 0, 0, 0, {0,NULL}, 0, {0,NULL}, 0, 0, 0, 0 } /* RecommendedProcessTableInput methods */ diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs index cb16c99e7..4fd1a834b 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs @@ -919,7 +919,10 @@ namespace Tango.MachineStudio.Developer.ViewModels { try { - var recommendedProcess = _converter.GetRecommendedProcessParameters(ActiveJob, RmlProcessParametersTableGroup); + bool useLightInks = true; + if (ActiveJob.OrderedSegmentsWithGroups.Count > 1 && !ActiveJob.EnableInterSegment) useLightInks = false; + + var recommendedProcess = _converter.GetRecommendedProcessParameters(ActiveJob, RmlProcessParametersTableGroup, useLightInks); if (recommendedProcess != null && recommendedProcess != SelectedProcessParametersTable) { diff --git a/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs b/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs index 2bce461d3..78339fe1d 100644 --- a/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs +++ b/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs @@ -566,6 +566,7 @@ namespace Tango.ColorConversion var settings = SettingsManager.Default.GetOrCreate<ColorConversionSettings>(); input.UseLightInks = settings.UseLightInks && rml.UseLightInks && machine.LightInksInstalled && useLightInks; input.UseLubricantTransform = rml.UseLubricantTransform; + input.VMax = rml.VMax; //TODO: Do we need input.Vmax ?? (Mirta) diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/RecommendedProcessTableInput.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/RecommendedProcessTableInput.cs index 4e5a52d8d..26188b1ef 100644 --- a/Software/Visual_Studio/Tango.PMR/ColorLab/RecommendedProcessTableInput.cs +++ b/Software/Visual_Studio/Tango.PMR/ColorLab/RecommendedProcessTableInput.cs @@ -24,7 +24,7 @@ namespace Tango.PMR.ColorLab { string.Concat( "CiJSZWNvbW1lbmRlZFByb2Nlc3NUYWJsZUlucHV0LnByb3RvEhJUYW5nby5Q", "TVIuQ29sb3JMYWIaElByb2Nlc3NSYW5nZS5wcm90bxoRSW5wdXRMaXF1aWQu", - "cHJvdG8aF0dyYWRpZW50SW5wdXRTdG9wLnByb3RvIuMCChxSZWNvbW1lbmRl", + "cHJvdG8aF0dyYWRpZW50SW5wdXRTdG9wLnByb3RvIvECChxSZWNvbW1lbmRl", "ZFByb2Nlc3NUYWJsZUlucHV0Eg8KB1RocmVhZEwYASABKAESDwoHVGhyZWFk", "QRgCIAEoARIPCgdUaHJlYWRCGAMgASgBEhMKC0ZvcndhcmREYXRhGAQgASgM", "EjQKBVN0b3BzGAUgAygLMiUuVGFuZ28uUE1SLkNvbG9yTGFiLkdyYWRpZW50", @@ -32,12 +32,12 @@ namespace Tango.PMR.ColorLab { "b2xvckxhYi5JbnB1dExpcXVpZBI3Cg1Qcm9jZXNzUmFuZ2VzGAcgAygLMiAu", "VGFuZ28uUE1SLkNvbG9yTGFiLlByb2Nlc3NSYW5nZRIUCgxVc2VMaWdodElu", "a3MYCCABKAgSDwoHR2JkRGF0YRgJIAEoDBIPCgdMdWJEYXRhGAogASgMEh0K", - "FVVzZUx1YnJpY2FudFRyYW5zZm9ybRgLIAEoCEIeChxjb20udHdpbmUudGFu", - "Z28ucG1yLmNvbG9ybGFiYgZwcm90bzM=")); + "FVVzZUx1YnJpY2FudFRyYW5zZm9ybRgLIAEoCBIMCgRWTWF4GAwgASgBQh4K", + "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", "GbdData", "LubData", "UseLubricantTransform" }, 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", "UseLubricantTransform", "VMax" }, null, null, null) })); } #endregion @@ -79,6 +79,7 @@ namespace Tango.PMR.ColorLab { gbdData_ = other.gbdData_; lubData_ = other.lubData_; useLubricantTransform_ = other.useLubricantTransform_; + vMax_ = other.vMax_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -204,6 +205,17 @@ namespace Tango.PMR.ColorLab { } } + /// <summary>Field number for the "VMax" field.</summary> + public const int VMaxFieldNumber = 12; + private double vMax_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double VMax { + get { return vMax_; } + set { + vMax_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as RecommendedProcessTableInput); @@ -228,6 +240,7 @@ namespace Tango.PMR.ColorLab { if (GbdData != other.GbdData) return false; if (LubData != other.LubData) return false; if (UseLubricantTransform != other.UseLubricantTransform) return false; + if (VMax != other.VMax) return false; return true; } @@ -245,6 +258,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 (VMax != 0D) hash ^= VMax.GetHashCode(); return hash; } @@ -290,6 +304,10 @@ namespace Tango.PMR.ColorLab { output.WriteRawTag(88); output.WriteBool(UseLubricantTransform); } + if (VMax != 0D) { + output.WriteRawTag(97); + output.WriteDouble(VMax); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -322,6 +340,9 @@ namespace Tango.PMR.ColorLab { if (UseLubricantTransform != false) { size += 1 + 1; } + if (VMax != 0D) { + size += 1 + 8; + } return size; } @@ -357,6 +378,9 @@ namespace Tango.PMR.ColorLab { if (other.UseLubricantTransform != false) { UseLubricantTransform = other.UseLubricantTransform; } + if (other.VMax != 0D) { + VMax = other.VMax; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -411,6 +435,10 @@ namespace Tango.PMR.ColorLab { UseLubricantTransform = input.ReadBool(); break; } + case 97: { + VMax = input.ReadDouble(); + break; + } } } } |