From 6571e92dd34dedb02611a6e9a7714f8185bb4488 Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Tue, 19 Jan 2021 22:19:03 +0200 Subject: Light Inks Basics. --- .../Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs index 95de19f42..fb9a246ce 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs @@ -217,6 +217,8 @@ namespace Tango.MachineStudio.RML.ViewModels input.ThreadA = RML.WhitePointA; input.ThreadB = RML.WhitePointB; + input.UseLightInks = RML.UseLightInks; + //Validate calibration data foreach (var vm in LiquidsCalibrationData.Where(x => x.LiquidType.HasPigment)) { -- cgit v1.3.1 From a4bd79a77bba87b8644e73903f020de94e1c7ade Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Thu, 28 Jan 2021 19:37:51 +0200 Subject: Added RML & Color Conversion VMax. --- Software/DB/PPC/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/PPC/Tango_log.ldf | Bin 53673984 -> 53673984 bytes Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 22675456 -> 22675456 bytes .../PMR/Messages/ColorLab/ConversionInput.proto | 1 + .../ViewModels/ColorConversionViewVM.cs | 1 + .../Tango.MachineStudio.RML/Views/RmlView.xaml | 9 +- Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs | 8 + .../Visual_Studio/Tango.BL/Entities/RmlBase.cs | 38 +++++ .../Tango.ColorConversion/DefaultColorConverter.cs | 2 + Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs | 1 + .../Tango.DAL.Remote/DB/RemoteADO.edmx | 3 + .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram | 168 ++++++++++----------- .../Tango.PMR/ColorLab/ConversionInput.cs | 35 ++++- .../SQLExaminer/Configurations/OverrideData.xml | Bin 86768 -> 86838 bytes 15 files changed, 177 insertions(+), 89 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels') diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf index 9bba44732..b4ea2b8a2 100644 Binary files a/Software/DB/PPC/Tango.mdf and b/Software/DB/PPC/Tango.mdf differ diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf index 6c2bb4822..a1f2ace90 100644 Binary files a/Software/DB/PPC/Tango_log.ldf and b/Software/DB/PPC/Tango_log.ldf differ diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index 16753592d..e2aef1aa6 100644 Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf index c2c7c2686..a4af854e7 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ diff --git a/Software/PMR/Messages/ColorLab/ConversionInput.proto b/Software/PMR/Messages/ColorLab/ConversionInput.proto index edf1c368f..5a7bfde10 100644 --- a/Software/PMR/Messages/ColorLab/ConversionInput.proto +++ b/Software/PMR/Messages/ColorLab/ConversionInput.proto @@ -22,4 +22,5 @@ message ConversionInput repeated ProcessRange ProcessRanges = 11; bool GenerateHive = 12; bool UseLightInks = 13; + double VMax = 14; } \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs index fb9a246ce..4a6fd7d36 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs @@ -218,6 +218,7 @@ namespace Tango.MachineStudio.RML.ViewModels input.ThreadB = RML.WhitePointB; input.UseLightInks = RML.UseLightInks; + input.VMax = RML.VMax; //Validate calibration data foreach (var vm in LiquidsCalibrationData.Where(x => x.LiquidType.HasPigment)) diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml index 788c78b9c..62b6dc335 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml @@ -187,7 +187,7 @@ - CCT + Engine @@ -217,7 +217,12 @@ Enable Gradient Generation - Use Light Inks + Use Light Inks + + + + + diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs index f9717002d..4530ae25d 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs @@ -381,5 +381,13 @@ namespace Tango.BL.DTO get; set; } + /// + /// v max + /// + public Double VMax + { + get; set; + } + } } diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs index cc360ca64..cb081f263 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs @@ -103,6 +103,8 @@ namespace Tango.BL.Entities public event EventHandler ArcHeadCleaningMotorSpeedChanged; + public event EventHandler VMaxChanged; + public event EventHandler> CatsChanged; public event EventHandler CctChanged; @@ -1339,6 +1341,33 @@ namespace Tango.BL.Entities } } + protected Double _vmax; + + /// + /// Gets or sets the rmlbase v max. + /// + + [Column("V_MAX")] + + public Double VMax + { + get + { + return _vmax; + } + + set + { + if (_vmax != value) + { + _vmax = value; + + OnVMaxChanged(value); + + } + } + } + protected SynchronizedObservableCollection _cats; /// @@ -2080,6 +2109,15 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(ArcHeadCleaningMotorSpeed)); } + /// + /// Called when the VMax has changed. + /// + protected virtual void OnVMaxChanged(Double vmax) + { + VMaxChanged?.Invoke(this, vmax); + RaisePropertyChanged(nameof(VMax)); + } + /// /// Called when the Cats has changed. /// diff --git a/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs b/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs index 51cac0ef1..bcdd20c88 100644 --- a/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs +++ b/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs @@ -133,6 +133,8 @@ namespace Tango.ColorConversion conversionInput.UseLightInks = rml.UseLightInks && lightInksInstalled && useLightInks && settings.UseLightInks; + conversionInput.VMax = rml.VMax; + conversionInput.ForwardData = ByteString.CopyFrom(rml.Cct.Data); foreach (var processTable in rml.GetActiveProcessGroup().ProcessParametersTables) diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs index c140fa362..f00189ce7 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs @@ -74,6 +74,7 @@ namespace Tango.DAL.Remote.DB public bool BYPASS_ROCKERS { get; set; } public int CLEANER_FLOW { get; set; } public double ARC_HEAD_CLEANING_MOTOR_SPEED { get; set; } + public double V_MAX { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection CATS { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx index a365ae5b8..1f8eb6454 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -1033,6 +1033,7 @@ + @@ -4539,6 +4540,7 @@ + @@ -7087,6 +7089,7 @@ + diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram index 31eb5296d..be7e5f5e5 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -5,90 +5,90 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs index 87a63fe27..abed81ceb 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", - "Y2Vzc1JhbmdlLnByb3RvIoMDCg9Db252ZXJzaW9uSW5wdXQSDwoHVGhyZWFk", + "Y2Vzc1JhbmdlLnByb3RvIpEDCg9Db252ZXJzaW9uSW5wdXQSDwoHVGhyZWFk", "TBgBIAEoARIPCgdUaHJlYWRBGAIgASgBEg8KB1RocmVhZEIYAyABKAESMgoK", "Q29sb3JTcGFjZRgEIAEoDjIeLlRhbmdvLlBNUi5Db2xvckxhYi5Db2xvclNw", "YWNlEj4KEElucHV0Q29vcmRpbmF0ZXMYBSABKAsyJC5UYW5nby5QTVIuQ29s", @@ -33,11 +33,12 @@ namespace Tango.PMR.ColorLab { "C0RlbHRhQ2hyb21hGAkgASgBEg4KBkRlbHRhTBgKIAEoARI3Cg1Qcm9jZXNz", "UmFuZ2VzGAsgAygLMiAuVGFuZ28uUE1SLkNvbG9yTGFiLlByb2Nlc3NSYW5n", "ZRIUCgxHZW5lcmF0ZUhpdmUYDCABKAgSFAoMVXNlTGlnaHRJbmtzGA0gASgI", - "Qh4KHGNvbS50d2luZS50YW5nby5wbXIuY29sb3JsYWJiBnByb3RvMw==")); + "EgwKBFZNYXgYDiABKAFCHgocY29tLnR3aW5lLnRhbmdvLnBtci5jb2xvcmxh", + "YmIGcHJvdG8z")); 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" }, 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" }, null, null, null) })); } #endregion @@ -81,6 +82,7 @@ namespace Tango.PMR.ColorLab { processRanges_ = other.processRanges_.Clone(); generateHive_ = other.generateHive_; useLightInks_ = other.useLightInks_; + vMax_ = other.vMax_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -230,6 +232,17 @@ namespace Tango.PMR.ColorLab { } } + /// Field number for the "VMax" field. + public const int VMaxFieldNumber = 14; + 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 ConversionInput); @@ -256,6 +269,7 @@ namespace Tango.PMR.ColorLab { if(!processRanges_.Equals(other.processRanges_)) return false; if (GenerateHive != other.GenerateHive) return false; if (UseLightInks != other.UseLightInks) return false; + if (VMax != other.VMax) return false; return true; } @@ -275,6 +289,7 @@ namespace Tango.PMR.ColorLab { hash ^= processRanges_.GetHashCode(); if (GenerateHive != false) hash ^= GenerateHive.GetHashCode(); if (UseLightInks != false) hash ^= UseLightInks.GetHashCode(); + if (VMax != 0D) hash ^= VMax.GetHashCode(); return hash; } @@ -334,6 +349,10 @@ namespace Tango.PMR.ColorLab { output.WriteRawTag(104); output.WriteBool(UseLightInks); } + if (VMax != 0D) { + output.WriteRawTag(113); + output.WriteDouble(VMax); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -376,6 +395,9 @@ namespace Tango.PMR.ColorLab { if (UseLightInks != false) { size += 1 + 1; } + if (VMax != 0D) { + size += 1 + 8; + } return size; } @@ -424,6 +446,9 @@ namespace Tango.PMR.ColorLab { if (other.UseLightInks != false) { UseLightInks = other.UseLightInks; } + if (other.VMax != 0D) { + VMax = other.VMax; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -489,6 +514,10 @@ namespace Tango.PMR.ColorLab { UseLightInks = input.ReadBool(); break; } + case 113: { + VMax = input.ReadDouble(); + break; + } } } } diff --git a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml index 06dcf7642..efc7fa5fb 100644 Binary files a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml and b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml differ -- cgit v1.3.1 From a6df02f37338475580623f32b7102919d84b99c5 Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Mon, 1 Feb 2021 16:28:06 +0200 Subject: Fixed RML module VMax & Use Light Inks Flags. --- .../PMR/ColorLab/ConversionInput.pb-c.c | 32 ++++++++++++++++++++-- .../PMR/ColorLab/ConversionInput.pb-c.h | 6 +++- .../ViewModels/ColorConversionViewVM.cs | 3 ++ 3 files changed, 37 insertions(+), 4 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels') diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/ConversionInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/ConversionInput.pb-c.c index 3c1230489..0defc9edf 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/ConversionInput.pb-c.c +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/ConversionInput.pb-c.c @@ -52,7 +52,7 @@ void conversion_input__free_unpacked assert(message->base.descriptor == &conversion_input__descriptor); protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); } -static const ProtobufCFieldDescriptor conversion_input__field_descriptors[12] = +static const ProtobufCFieldDescriptor conversion_input__field_descriptors[14] = { { "ThreadL", @@ -198,6 +198,30 @@ static const ProtobufCFieldDescriptor conversion_input__field_descriptors[12] = 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, + { + "UseLightInks", + 13, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_BOOL, + offsetof(ConversionInput, has_uselightinks), + offsetof(ConversionInput, uselightinks), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "VMax", + 14, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_DOUBLE, + offsetof(ConversionInput, has_vmax), + offsetof(ConversionInput, vmax), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, }; static const unsigned conversion_input__field_indices_by_name[] = { 3, /* field[3] = ColorSpace */ @@ -212,11 +236,13 @@ static const unsigned conversion_input__field_indices_by_name[] = { 1, /* field[1] = ThreadA */ 2, /* field[2] = ThreadB */ 0, /* field[0] = ThreadL */ + 12, /* field[12] = UseLightInks */ + 13, /* field[13] = VMax */ }; static const ProtobufCIntRange conversion_input__number_ranges[1 + 1] = { { 1, 0 }, - { 0, 12 } + { 0, 14 } }; const ProtobufCMessageDescriptor conversion_input__descriptor = { @@ -226,7 +252,7 @@ const ProtobufCMessageDescriptor conversion_input__descriptor = "ConversionInput", "", sizeof(ConversionInput), - 12, + 14, conversion_input__field_descriptors, conversion_input__field_indices_by_name, 1, conversion_input__number_ranges, diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/ConversionInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/ConversionInput.pb-c.h index 15c30fc10..794ddaaac 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/ConversionInput.pb-c.h +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/ConversionInput.pb-c.h @@ -52,10 +52,14 @@ struct _ConversionInput ProcessRange **processranges; protobuf_c_boolean has_generatehive; protobuf_c_boolean generatehive; + protobuf_c_boolean has_uselightinks; + protobuf_c_boolean uselightinks; + protobuf_c_boolean has_vmax; + double vmax; }; #define CONVERSION_INPUT__INIT \ { PROTOBUF_C_MESSAGE_INIT (&conversion_input__descriptor) \ - , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0, 0, 0, 0, 0, 0,NULL, 0, 0 } + , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0, 0, 0, 0, 0, 0,NULL, 0, 0, 0, 0, 0, 0 } /* ConversionInput methods */ diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs index 4a6fd7d36..6ba539078 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs @@ -353,6 +353,9 @@ namespace Tango.MachineStudio.RML.ViewModels input.ThreadA = RML.WhitePointA; input.ThreadB = RML.WhitePointB; + input.UseLightInks = RML.UseLightInks; + input.VMax = RML.VMax; + foreach (var vm in LiquidsCalibrationData.Where(x => x.LiquidType.HasPigment)) { InputLiquid inputLiquid = new InputLiquid(); -- cgit v1.3.1