From ee3f1aa159ebb326e7c7053501130afa06bf47d4 Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Tue, 3 Nov 2020 19:37:52 +0200 Subject: Moved ArcHeadCleaningMotorSpeed to RML => Head Cleaning Parameters. Modified local data store schema to unique machine,collection,key. --- Software/DB/PPC/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/PPC/Tango_log.ldf | Bin 53673984 -> 53673984 bytes Software/DB/TCC/TCC.mdf | Bin 8388608 -> 8388608 bytes Software/DB/TCC/TCC_log.ldf | Bin 8388608 -> 8388608 bytes Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 22675456 -> 22675456 bytes .../Messages/Printing/HeadCleaningParameters.proto | 1 + .../PMR/Messages/Printing/ProcessParameters.proto | 2 - .../Views/HeadCleaningParametersView.xaml | 3 + .../Tango.BL/DTO/ProcessParametersTableDTOBase.cs | 8 - Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs | 8 + .../Entities/ProcessParametersTableBase.cs | 42 ------ .../Visual_Studio/Tango.BL/Entities/RmlBase.cs | 38 +++++ .../DB/PROCESS_PARAMETERS_TABLES.cs | 1 - Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs | 1 + .../Tango.DAL.Remote/DB/RemoteADO.edmx | 6 +- .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram | 164 ++++++++++----------- .../Tango.Integration/Operation/MachineOperator.cs | 1 + .../Tango.PMR/Printing/HeadCleaningParameters.cs | 36 ++++- .../Tango.PMR/Printing/ProcessParameters.cs | 35 +---- 20 files changed, 172 insertions(+), 174 deletions(-) (limited to 'Software') diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf index 5c2d6f294..86dccf095 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 7da1b17b5..1e81d8c77 100644 Binary files a/Software/DB/PPC/Tango_log.ldf and b/Software/DB/PPC/Tango_log.ldf differ diff --git a/Software/DB/TCC/TCC.mdf b/Software/DB/TCC/TCC.mdf index 6a002658b..67f699f61 100644 Binary files a/Software/DB/TCC/TCC.mdf and b/Software/DB/TCC/TCC.mdf differ diff --git a/Software/DB/TCC/TCC_log.ldf b/Software/DB/TCC/TCC_log.ldf index a4e235de4..390749bbf 100644 Binary files a/Software/DB/TCC/TCC_log.ldf and b/Software/DB/TCC/TCC_log.ldf differ diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index 20a7f0234..cb06a99d3 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 8f1f49ea0..453bfc95d 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ diff --git a/Software/PMR/Messages/Printing/HeadCleaningParameters.proto b/Software/PMR/Messages/Printing/HeadCleaningParameters.proto index ca5a20d74..b9ecda142 100644 --- a/Software/PMR/Messages/Printing/HeadCleaningParameters.proto +++ b/Software/PMR/Messages/Printing/HeadCleaningParameters.proto @@ -6,4 +6,5 @@ option java_package = "com.twine.tango.pmr.printing"; message HeadCleaningParameters { double CleanerFlow = 1; + double ArcHeadCleaningMotorSpeed = 2; } diff --git a/Software/PMR/Messages/Printing/ProcessParameters.proto b/Software/PMR/Messages/Printing/ProcessParameters.proto index bb274828b..0a483d9bb 100644 --- a/Software/PMR/Messages/Printing/ProcessParameters.proto +++ b/Software/PMR/Messages/Printing/ProcessParameters.proto @@ -78,6 +78,4 @@ message ProcessParameters double PressureBuildUp = 31; - double ArcHeadCleaningMotorSpeed = 32; - } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/HeadCleaningParametersView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/HeadCleaningParametersView.xaml index 72e377c34..aec12aa63 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/HeadCleaningParametersView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/HeadCleaningParametersView.xaml @@ -44,6 +44,9 @@ + + + diff --git a/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs index 2294ec874..f0699bc72 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs @@ -285,13 +285,5 @@ namespace Tango.BL.DTO get; set; } - /// - /// arc head cleaning motor speed - /// - public Double ArcHeadCleaningMotorSpeed - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs index 51b069d54..6bb8e951d 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs @@ -365,5 +365,13 @@ namespace Tango.BL.DTO get; set; } + /// + /// arc head cleaning motor speed + /// + public Double ArcHeadCleaningMotorSpeed + { + get; set; + } + } } diff --git a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs index 172b5f18f..498bafc85 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs @@ -91,8 +91,6 @@ namespace Tango.BL.Entities public event EventHandler PressureBuildUpChanged; - public event EventHandler ArcHeadCleaningMotorSpeedChanged; - public event EventHandler ProcessParametersTablesGroupChanged; protected String _name; @@ -1109,37 +1107,6 @@ namespace Tango.BL.Entities } } - protected Double _archeadcleaningmotorspeed; - - /// - /// Gets or sets the processparameterstablebase arc head cleaning motor speed. - /// - - [Column("ARC_HEAD_CLEANING_MOTOR_SPEED")] - - [StringFormat("0.0")] - - [PropertyIndex(30)] - - public Double ArcHeadCleaningMotorSpeed - { - get - { - return _archeadcleaningmotorspeed; - } - - set - { - if (_archeadcleaningmotorspeed != value) - { - _archeadcleaningmotorspeed = value; - - OnArcHeadCleaningMotorSpeedChanged(value); - - } - } - } - protected ProcessParametersTablesGroup _processparameterstablesgroup; /// @@ -1460,15 +1427,6 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(PressureBuildUp)); } - /// - /// Called when the ArcHeadCleaningMotorSpeed has changed. - /// - protected virtual void OnArcHeadCleaningMotorSpeedChanged(Double archeadcleaningmotorspeed) - { - ArcHeadCleaningMotorSpeedChanged?.Invoke(this, archeadcleaningmotorspeed); - RaisePropertyChanged(nameof(ArcHeadCleaningMotorSpeed)); - } - /// /// Called when the ProcessParametersTablesGroup has changed. /// diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs index 2d3162c95..8958884a2 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs @@ -99,6 +99,8 @@ namespace Tango.BL.Entities public event EventHandler CleanerFlowChanged; + public event EventHandler ArcHeadCleaningMotorSpeedChanged; + public event EventHandler> CatsChanged; public event EventHandler CctChanged; @@ -1281,6 +1283,33 @@ namespace Tango.BL.Entities } } + protected Double _archeadcleaningmotorspeed; + + /// + /// Gets or sets the rmlbase arc head cleaning motor speed. + /// + + [Column("ARC_HEAD_CLEANING_MOTOR_SPEED")] + + public Double ArcHeadCleaningMotorSpeed + { + get + { + return _archeadcleaningmotorspeed; + } + + set + { + if (_archeadcleaningmotorspeed != value) + { + _archeadcleaningmotorspeed = value; + + OnArcHeadCleaningMotorSpeedChanged(value); + + } + } + } + protected SynchronizedObservableCollection _cats; /// @@ -2004,6 +2033,15 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(CleanerFlow)); } + /// + /// Called when the ArcHeadCleaningMotorSpeed has changed. + /// + protected virtual void OnArcHeadCleaningMotorSpeedChanged(Double archeadcleaningmotorspeed) + { + ArcHeadCleaningMotorSpeedChanged?.Invoke(this, archeadcleaningmotorspeed); + RaisePropertyChanged(nameof(ArcHeadCleaningMotorSpeed)); + } + /// /// Called when the Cats has changed. /// diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/PROCESS_PARAMETERS_TABLES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/PROCESS_PARAMETERS_TABLES.cs index 13c1a65f6..5896f742e 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/PROCESS_PARAMETERS_TABLES.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/PROCESS_PARAMETERS_TABLES.cs @@ -50,7 +50,6 @@ namespace Tango.DAL.Remote.DB public double L_BLOWER_FLOW { get; set; } public double L_BLOWER_TEMP { get; set; } public double PRESSURE_BUILD_UP { get; set; } - public double ARC_HEAD_CLEANING_MOTOR_SPEED { get; set; } public virtual PROCESS_PARAMETERS_TABLES_GROUPS PROCESS_PARAMETERS_TABLES_GROUPS { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs index 93648de50..af0077df7 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs @@ -72,6 +72,7 @@ namespace Tango.DAL.Remote.DB public int WINDER_D { get; set; } public bool BYPASS_ROCKERS { get; set; } public int CLEANER_FLOW { get; set; } + public double ARC_HEAD_CLEANING_MOTOR_SPEED { 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 01417ab3e..3b471ca54 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -933,7 +933,6 @@ - @@ -1023,6 +1022,7 @@ + @@ -4423,7 +4423,6 @@ - @@ -4518,6 +4517,7 @@ + @@ -6973,7 +6973,6 @@ - @@ -7057,6 +7056,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 44584e115..357b569f8 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.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs index fb33bec09..e22d1a156 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs @@ -2700,6 +2700,7 @@ namespace Tango.Integration.Operation //Head Cleaning Parameters ticket.HeadCleaningParameters = new HeadCleaningParameters(); ticket.HeadCleaningParameters.CleanerFlow = job.Rml.CleanerFlow; + ticket.HeadCleaningParameters.ArcHeadCleaningMotorSpeed = job.Rml.ArcHeadCleaningMotorSpeed; JobHandler handler = null; StorageFileHandler fileUploadHandler = null; diff --git a/Software/Visual_Studio/Tango.PMR/Printing/HeadCleaningParameters.cs b/Software/Visual_Studio/Tango.PMR/Printing/HeadCleaningParameters.cs index e086fdddf..1c6786540 100644 --- a/Software/Visual_Studio/Tango.PMR/Printing/HeadCleaningParameters.cs +++ b/Software/Visual_Studio/Tango.PMR/Printing/HeadCleaningParameters.cs @@ -23,13 +23,13 @@ namespace Tango.PMR.Printing { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChxIZWFkQ2xlYW5pbmdQYXJhbWV0ZXJzLnByb3RvEhJUYW5nby5QTVIuUHJp", - "bnRpbmciLQoWSGVhZENsZWFuaW5nUGFyYW1ldGVycxITCgtDbGVhbmVyRmxv", - "dxgBIAEoAUIeChxjb20udHdpbmUudGFuZ28ucG1yLnByaW50aW5nYgZwcm90", - "bzM=")); + "bnRpbmciUAoWSGVhZENsZWFuaW5nUGFyYW1ldGVycxITCgtDbGVhbmVyRmxv", + "dxgBIAEoARIhChlBcmNIZWFkQ2xlYW5pbmdNb3RvclNwZWVkGAIgASgBQh4K", + "HGNvbS50d2luZS50YW5nby5wbXIucHJpbnRpbmdiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.HeadCleaningParameters), global::Tango.PMR.Printing.HeadCleaningParameters.Parser, new[]{ "CleanerFlow" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.HeadCleaningParameters), global::Tango.PMR.Printing.HeadCleaningParameters.Parser, new[]{ "CleanerFlow", "ArcHeadCleaningMotorSpeed" }, null, null, null) })); } #endregion @@ -61,6 +61,7 @@ namespace Tango.PMR.Printing { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public HeadCleaningParameters(HeadCleaningParameters other) : this() { cleanerFlow_ = other.cleanerFlow_; + arcHeadCleaningMotorSpeed_ = other.arcHeadCleaningMotorSpeed_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -79,6 +80,17 @@ namespace Tango.PMR.Printing { } } + /// Field number for the "ArcHeadCleaningMotorSpeed" field. + public const int ArcHeadCleaningMotorSpeedFieldNumber = 2; + private double arcHeadCleaningMotorSpeed_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double ArcHeadCleaningMotorSpeed { + get { return arcHeadCleaningMotorSpeed_; } + set { + arcHeadCleaningMotorSpeed_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as HeadCleaningParameters); @@ -93,6 +105,7 @@ namespace Tango.PMR.Printing { return true; } if (CleanerFlow != other.CleanerFlow) return false; + if (ArcHeadCleaningMotorSpeed != other.ArcHeadCleaningMotorSpeed) return false; return true; } @@ -100,6 +113,7 @@ namespace Tango.PMR.Printing { public override int GetHashCode() { int hash = 1; if (CleanerFlow != 0D) hash ^= CleanerFlow.GetHashCode(); + if (ArcHeadCleaningMotorSpeed != 0D) hash ^= ArcHeadCleaningMotorSpeed.GetHashCode(); return hash; } @@ -114,6 +128,10 @@ namespace Tango.PMR.Printing { output.WriteRawTag(9); output.WriteDouble(CleanerFlow); } + if (ArcHeadCleaningMotorSpeed != 0D) { + output.WriteRawTag(17); + output.WriteDouble(ArcHeadCleaningMotorSpeed); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -122,6 +140,9 @@ namespace Tango.PMR.Printing { if (CleanerFlow != 0D) { size += 1 + 8; } + if (ArcHeadCleaningMotorSpeed != 0D) { + size += 1 + 8; + } return size; } @@ -133,6 +154,9 @@ namespace Tango.PMR.Printing { if (other.CleanerFlow != 0D) { CleanerFlow = other.CleanerFlow; } + if (other.ArcHeadCleaningMotorSpeed != 0D) { + ArcHeadCleaningMotorSpeed = other.ArcHeadCleaningMotorSpeed; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -147,6 +171,10 @@ namespace Tango.PMR.Printing { CleanerFlow = input.ReadDouble(); break; } + case 17: { + ArcHeadCleaningMotorSpeed = input.ReadDouble(); + break; + } } } } diff --git a/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs b/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs index 0f03cf4f0..b0c29288f 100644 --- a/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs +++ b/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs @@ -23,7 +23,7 @@ namespace Tango.PMR.Printing { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChdQcm9jZXNzUGFyYW1ldGVycy5wcm90bxISVGFuZ28uUE1SLlByaW50aW5n", - "IvUFChFQcm9jZXNzUGFyYW1ldGVycxITCgtEeWVpbmdTcGVlZBgBIAEoARIU", + "ItIFChFQcm9jZXNzUGFyYW1ldGVycxITCgtEeWVpbmdTcGVlZBgBIAEoARIU", "CgxNaW5JbmtVcHRha2UYAiABKAESFAoMTWF4SW5rVXB0YWtlGAMgASgBEhUK", "DUZlZWRlclRlbnNpb24YBCABKAESFQoNUHVsbGVyVGVuc2lvbhgFIAEoARIV", "Cg1XaW5kZXJUZW5zaW9uGAYgASgBEhEKCU1peGVyVGVtcBgHIAEoARIVCg1I", @@ -39,12 +39,11 @@ namespace Tango.PMR.Printing { "cBgZIAEoARIWCg5IZWFkWm9uZTEyVGVtcBgaIAEoARITCgtSQmxvd2VyRmxv", "dxgbIAEoARITCgtSQmxvd2VyVGVtcBgcIAEoARITCgtMQmxvd2VyRmxvdxgd", "IAEoARITCgtMQmxvd2VyVGVtcBgeIAEoARIXCg9QcmVzc3VyZUJ1aWxkVXAY", - "HyABKAESIQoZQXJjSGVhZENsZWFuaW5nTW90b3JTcGVlZBggIAEoAUIeChxj", - "b20udHdpbmUudGFuZ28ucG1yLnByaW50aW5nYgZwcm90bzM=")); + "HyABKAFCHgocY29tLnR3aW5lLnRhbmdvLnBtci5wcmludGluZ2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.ProcessParameters), global::Tango.PMR.Printing.ProcessParameters.Parser, new[]{ "DyeingSpeed", "MinInkUptake", "MaxInkUptake", "FeederTension", "PullerTension", "WinderTension", "MixerTemp", "HeadZone1Temp", "HeadZone2Temp", "HeadZone3Temp", "HeadZone4Temp", "HeadZone5Temp", "HeadZone6Temp", "DryerAirFlow", "DryerZone1Temp", "DryerZone2Temp", "DryerZone3Temp", "DryerBufferLength", "HeadAirFlow", "TableIndex", "HeadZone7Temp", "HeadZone8Temp", "HeadZone9Temp", "HeadZone10Temp", "HeadZone11Temp", "HeadZone12Temp", "RBlowerFlow", "RBlowerTemp", "LBlowerFlow", "LBlowerTemp", "PressureBuildUp", "ArcHeadCleaningMotorSpeed" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.ProcessParameters), global::Tango.PMR.Printing.ProcessParameters.Parser, new[]{ "DyeingSpeed", "MinInkUptake", "MaxInkUptake", "FeederTension", "PullerTension", "WinderTension", "MixerTemp", "HeadZone1Temp", "HeadZone2Temp", "HeadZone3Temp", "HeadZone4Temp", "HeadZone5Temp", "HeadZone6Temp", "DryerAirFlow", "DryerZone1Temp", "DryerZone2Temp", "DryerZone3Temp", "DryerBufferLength", "HeadAirFlow", "TableIndex", "HeadZone7Temp", "HeadZone8Temp", "HeadZone9Temp", "HeadZone10Temp", "HeadZone11Temp", "HeadZone12Temp", "RBlowerFlow", "RBlowerTemp", "LBlowerFlow", "LBlowerTemp", "PressureBuildUp" }, null, null, null) })); } #endregion @@ -106,7 +105,6 @@ namespace Tango.PMR.Printing { lBlowerFlow_ = other.lBlowerFlow_; lBlowerTemp_ = other.lBlowerTemp_; pressureBuildUp_ = other.pressureBuildUp_; - arcHeadCleaningMotorSpeed_ = other.arcHeadCleaningMotorSpeed_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -455,17 +453,6 @@ namespace Tango.PMR.Printing { } } - /// Field number for the "ArcHeadCleaningMotorSpeed" field. - public const int ArcHeadCleaningMotorSpeedFieldNumber = 32; - private double arcHeadCleaningMotorSpeed_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public double ArcHeadCleaningMotorSpeed { - get { return arcHeadCleaningMotorSpeed_; } - set { - arcHeadCleaningMotorSpeed_ = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as ProcessParameters); @@ -510,7 +497,6 @@ namespace Tango.PMR.Printing { if (LBlowerFlow != other.LBlowerFlow) return false; if (LBlowerTemp != other.LBlowerTemp) return false; if (PressureBuildUp != other.PressureBuildUp) return false; - if (ArcHeadCleaningMotorSpeed != other.ArcHeadCleaningMotorSpeed) return false; return true; } @@ -548,7 +534,6 @@ namespace Tango.PMR.Printing { if (LBlowerFlow != 0D) hash ^= LBlowerFlow.GetHashCode(); if (LBlowerTemp != 0D) hash ^= LBlowerTemp.GetHashCode(); if (PressureBuildUp != 0D) hash ^= PressureBuildUp.GetHashCode(); - if (ArcHeadCleaningMotorSpeed != 0D) hash ^= ArcHeadCleaningMotorSpeed.GetHashCode(); return hash; } @@ -683,10 +668,6 @@ namespace Tango.PMR.Printing { output.WriteRawTag(249, 1); output.WriteDouble(PressureBuildUp); } - if (ArcHeadCleaningMotorSpeed != 0D) { - output.WriteRawTag(129, 2); - output.WriteDouble(ArcHeadCleaningMotorSpeed); - } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -785,9 +766,6 @@ namespace Tango.PMR.Printing { if (PressureBuildUp != 0D) { size += 2 + 8; } - if (ArcHeadCleaningMotorSpeed != 0D) { - size += 2 + 8; - } return size; } @@ -889,9 +867,6 @@ namespace Tango.PMR.Printing { if (other.PressureBuildUp != 0D) { PressureBuildUp = other.PressureBuildUp; } - if (other.ArcHeadCleaningMotorSpeed != 0D) { - ArcHeadCleaningMotorSpeed = other.ArcHeadCleaningMotorSpeed; - } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -1026,10 +1001,6 @@ namespace Tango.PMR.Printing { PressureBuildUp = input.ReadDouble(); break; } - case 257: { - ArcHeadCleaningMotorSpeed = input.ReadDouble(); - break; - } } } } -- cgit v1.3.1