From 2bfa60ab677ec1da8f968614015ac0147694d31e Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Mon, 15 Feb 2021 17:19:40 +0200 Subject: BTSR DB, BL & PMR. --- .../Tango.BL/DTO/BtsrApplicationTypeDTO.cs | 14 ++ .../Tango.BL/DTO/BtsrApplicationTypeDTOBase.cs | 49 +++++ .../Visual_Studio/Tango.BL/DTO/BtsrYarnTypeDTO.cs | 14 ++ .../Tango.BL/DTO/BtsrYarnTypeDTOBase.cs | 49 +++++ .../Tango.BL/DTO/ProcessParametersTableDTOBase.cs | 24 +++ Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs | 16 ++ .../Visual_Studio/Tango.BL/DTO/RmlsSpoolDTOBase.cs | 8 + .../Visual_Studio/Tango.BL/DTO/SpoolTypeDTOBase.cs | 8 + .../Tango.BL/Entities/BtsrApplicationType.cs | 36 ++++ .../Tango.BL/Entities/BtsrApplicationTypeBase.cs | 190 ++++++++++++++++++ .../Tango.BL/Entities/BtsrYarnType.cs | 36 ++++ .../Tango.BL/Entities/BtsrYarnTypeBase.cs | 190 ++++++++++++++++++ .../Entities/ProcessParametersTableBase.cs | 126 ++++++++++++ .../Visual_Studio/Tango.BL/Entities/RmlBase.cs | 138 +++++++++++++ .../Tango.BL/Entities/RmlsSpoolBase.cs | 38 ++++ .../Tango.BL/Entities/SpoolTypeBase.cs | 38 ++++ .../Tango.BL/Enumerations/BtsrApplicationTypes.cs | 119 +++++++++++ .../Tango.BL/Enumerations/BtsrYarnTypes.cs | 59 ++++++ .../Visual_Studio/Tango.BL/ObservablesContext.cs | 16 ++ .../ObservablesEntitiesAdapterExtension.cs | 76 +++++++ .../ObservablesStaticCollectionsExtension.cs | 76 +++++++ Software/Visual_Studio/Tango.BL/Tango.BL.csproj | 12 +- .../Tango.DAL.Remote/DB/BTSR_APPLICATION_TYPES.cs | 33 ++++ .../Tango.DAL.Remote/DB/BTSR_YARN_TYPES.cs | 33 ++++ .../DB/PROCESS_PARAMETERS_TABLES.cs | 3 + Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs | 4 + .../Tango.DAL.Remote/DB/RMLS_SPOOLS.cs | 1 + .../Tango.DAL.Remote/DB/RemoteADO.Context.cs | 2 + .../Tango.DAL.Remote/DB/RemoteADO.edmx | 161 +++++++++++++++ .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram | 174 ++++++++-------- .../Tango.DAL.Remote/DB/SPOOL_TYPES.cs | 1 + .../Tango.DAL.Remote/Tango.DAL.Remote.csproj | 8 +- .../Tango.PMR/BTSR/BtsrApplicationType.cs | 65 ++++++ .../Visual_Studio/Tango.PMR/BTSR/BtsrParameters.cs | 219 +++++++++++++++++++++ .../Visual_Studio/Tango.PMR/BTSR/BtsrYarnType.cs | 52 +++++ .../Tango.PMR/Diagnostics/EventType.cs | 144 +++++++------- .../Visual_Studio/Tango.PMR/Printing/JobSpool.cs | 37 +++- .../Visual_Studio/Tango.PMR/Printing/JobTicket.cs | 72 +++++-- .../Tango.PMR/Printing/ProcessParameters.cs | 92 ++++++++- .../Utilities/Tango.PMRGenerator.CLI/Program.cs | 58 ++++++ 40 files changed, 2307 insertions(+), 184 deletions(-) create mode 100644 Software/Visual_Studio/Tango.BL/DTO/BtsrApplicationTypeDTO.cs create mode 100644 Software/Visual_Studio/Tango.BL/DTO/BtsrApplicationTypeDTOBase.cs create mode 100644 Software/Visual_Studio/Tango.BL/DTO/BtsrYarnTypeDTO.cs create mode 100644 Software/Visual_Studio/Tango.BL/DTO/BtsrYarnTypeDTOBase.cs create mode 100644 Software/Visual_Studio/Tango.BL/Entities/BtsrApplicationType.cs create mode 100644 Software/Visual_Studio/Tango.BL/Entities/BtsrApplicationTypeBase.cs create mode 100644 Software/Visual_Studio/Tango.BL/Entities/BtsrYarnType.cs create mode 100644 Software/Visual_Studio/Tango.BL/Entities/BtsrYarnTypeBase.cs create mode 100644 Software/Visual_Studio/Tango.BL/Enumerations/BtsrApplicationTypes.cs create mode 100644 Software/Visual_Studio/Tango.BL/Enumerations/BtsrYarnTypes.cs create mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_APPLICATION_TYPES.cs create mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_YARN_TYPES.cs create mode 100644 Software/Visual_Studio/Tango.PMR/BTSR/BtsrApplicationType.cs create mode 100644 Software/Visual_Studio/Tango.PMR/BTSR/BtsrParameters.cs create mode 100644 Software/Visual_Studio/Tango.PMR/BTSR/BtsrYarnType.cs (limited to 'Software/Visual_Studio') diff --git a/Software/Visual_Studio/Tango.BL/DTO/BtsrApplicationTypeDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/BtsrApplicationTypeDTO.cs new file mode 100644 index 000000000..5b70ab2db --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/DTO/BtsrApplicationTypeDTO.cs @@ -0,0 +1,14 @@ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.BL.DTO +{ + public class BtsrApplicationTypeDTO : BtsrApplicationTypeDTOBase + { + + } +} diff --git a/Software/Visual_Studio/Tango.BL/DTO/BtsrApplicationTypeDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/BtsrApplicationTypeDTOBase.cs new file mode 100644 index 000000000..31aef5fca --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/DTO/BtsrApplicationTypeDTOBase.cs @@ -0,0 +1,49 @@ + +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.BL.Entities; + +namespace Tango.BL.DTO +{ + public abstract class BtsrApplicationTypeDTOBase : ObservableEntityDTO + { + + /// + /// code + /// + public Int32 Code + { + get; set; + } + + /// + /// name + /// + public String Name + { + get; set; + } + + /// + /// description + /// + public String Description + { + get; set; + } + + } +} diff --git a/Software/Visual_Studio/Tango.BL/DTO/BtsrYarnTypeDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/BtsrYarnTypeDTO.cs new file mode 100644 index 000000000..41f2b3fd4 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/DTO/BtsrYarnTypeDTO.cs @@ -0,0 +1,14 @@ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.BL.DTO +{ + public class BtsrYarnTypeDTO : BtsrYarnTypeDTOBase + { + + } +} diff --git a/Software/Visual_Studio/Tango.BL/DTO/BtsrYarnTypeDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/BtsrYarnTypeDTOBase.cs new file mode 100644 index 000000000..31b7f04f0 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/DTO/BtsrYarnTypeDTOBase.cs @@ -0,0 +1,49 @@ + +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.BL.Entities; + +namespace Tango.BL.DTO +{ + public abstract class BtsrYarnTypeDTOBase : ObservableEntityDTO + { + + /// + /// code + /// + public Int32 Code + { + get; set; + } + + /// + /// name + /// + public String Name + { + get; set; + } + + /// + /// description + /// + public String Description + { + get; set; + } + + } +} diff --git a/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs index f0699bc72..3207c0a0d 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs @@ -285,5 +285,29 @@ namespace Tango.BL.DTO get; set; } + /// + /// btsr feeding tension + /// + public Double BtsrFeedingTension + { + get; set; + } + + /// + /// btsr exit tension + /// + public Double BtsrExitTension + { + get; set; + } + + /// + /// btsr thread length offset + /// + public Double BtsrThreadLengthOffset + { + get; set; + } + } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs index 4530ae25d..5a13afe18 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs @@ -389,5 +389,21 @@ namespace Tango.BL.DTO get; set; } + /// + /// btsr application type guid + /// + public String BtsrApplicationTypeGuid + { + get; set; + } + + /// + /// btsr yarn type guid + /// + public String BtsrYarnTypeGuid + { + get; set; + } + } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlsSpoolDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlsSpoolDTOBase.cs index 1598a321f..c17e2b426 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/RmlsSpoolDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/RmlsSpoolDTOBase.cs @@ -69,5 +69,13 @@ namespace Tango.BL.DTO get; set; } + /// + /// btsr spool tension + /// + public Nullable BtsrSpoolTension + { + get; set; + } + } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/SpoolTypeDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/SpoolTypeDTOBase.cs index 5b02cb536..f16b07d53 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/SpoolTypeDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/SpoolTypeDTOBase.cs @@ -109,5 +109,13 @@ namespace Tango.BL.DTO get; set; } + /// + /// btsr spool tension + /// + public Int32 BtsrSpoolTension + { + get; set; + } + } } diff --git a/Software/Visual_Studio/Tango.BL/Entities/BtsrApplicationType.cs b/Software/Visual_Studio/Tango.BL/Entities/BtsrApplicationType.cs new file mode 100644 index 000000000..1ebb4dcae --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Entities/BtsrApplicationType.cs @@ -0,0 +1,36 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; +using System.Linq; +using Tango.DAL.Remote.DB; +using Tango.Core; +using System.ComponentModel; +using Tango.Core.CustomAttributes; +using Tango.BL.Enumerations; + +namespace Tango.BL.Entities +{ + public class BtsrApplicationType: BtsrApplicationTypeBase + { + [NotMapped] + [JsonIgnore] + public BtsrApplicationTypes Type + { + get { return (BtsrApplicationTypes)Code; } + } + } +} diff --git a/Software/Visual_Studio/Tango.BL/Entities/BtsrApplicationTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/BtsrApplicationTypeBase.cs new file mode 100644 index 000000000..ee1ff6ecc --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Entities/BtsrApplicationTypeBase.cs @@ -0,0 +1,190 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; +using System.Linq; +using Tango.DAL.Remote.DB; +using Tango.Core; +using System.ComponentModel; +using Tango.Core.CustomAttributes; + +namespace Tango.BL.Entities +{ + [Table("BTSR_APPLICATION_TYPES")] + public abstract class BtsrApplicationTypeBase : ObservableEntity + { + + public event EventHandler CodeChanged; + + public event EventHandler NameChanged; + + public event EventHandler DescriptionChanged; + + public event EventHandler> RmlsChanged; + + protected Int32 _code; + + /// + /// Gets or sets the btsrapplicationtypebase code. + /// + + [Column("CODE")] + + public Int32 Code + { + get + { + return _code; + } + + set + { + if (_code != value) + { + _code = value; + + OnCodeChanged(value); + + } + } + } + + protected String _name; + + /// + /// Gets or sets the btsrapplicationtypebase name. + /// + + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + if (_name != value) + { + _name = value; + + OnNameChanged(value); + + } + } + } + + protected String _description; + + /// + /// Gets or sets the btsrapplicationtypebase description. + /// + + [Column("DESCRIPTION")] + + public String Description + { + get + { + return _description; + } + + set + { + if (_description != value) + { + _description = value; + + OnDescriptionChanged(value); + + } + } + } + + protected SynchronizedObservableCollection _rmls; + + /// + /// Gets or sets the btsrapplicationtypebase rmls. + /// + + public virtual SynchronizedObservableCollection Rmls + { + get + { + return _rmls; + } + + set + { + if (_rmls != value) + { + _rmls = value; + + OnRmlsChanged(value); + + } + } + } + + /// + /// Called when the Code has changed. + /// + protected virtual void OnCodeChanged(Int32 code) + { + CodeChanged?.Invoke(this, code); + RaisePropertyChanged(nameof(Code)); + } + + /// + /// Called when the Name has changed. + /// + protected virtual void OnNameChanged(String name) + { + NameChanged?.Invoke(this, name); + RaisePropertyChanged(nameof(Name)); + } + + /// + /// Called when the Description has changed. + /// + protected virtual void OnDescriptionChanged(String description) + { + DescriptionChanged?.Invoke(this, description); + RaisePropertyChanged(nameof(Description)); + } + + /// + /// Called when the Rmls has changed. + /// + protected virtual void OnRmlsChanged(SynchronizedObservableCollection rmls) + { + RmlsChanged?.Invoke(this, rmls); + RaisePropertyChanged(nameof(Rmls)); + } + + /// + /// Initializes a new instance of the class. + /// + public BtsrApplicationTypeBase() : base() + { + + Rmls = new SynchronizedObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.BL/Entities/BtsrYarnType.cs b/Software/Visual_Studio/Tango.BL/Entities/BtsrYarnType.cs new file mode 100644 index 000000000..036f64ee0 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Entities/BtsrYarnType.cs @@ -0,0 +1,36 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; +using System.Linq; +using Tango.DAL.Remote.DB; +using Tango.Core; +using System.ComponentModel; +using Tango.Core.CustomAttributes; +using Tango.BL.Enumerations; + +namespace Tango.BL.Entities +{ + public class BtsrYarnType : BtsrYarnTypeBase + { + [NotMapped] + [JsonIgnore] + public BtsrYarnTypes Type + { + get { return (BtsrYarnTypes)Code; } + } + } +} diff --git a/Software/Visual_Studio/Tango.BL/Entities/BtsrYarnTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/BtsrYarnTypeBase.cs new file mode 100644 index 000000000..608989fab --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Entities/BtsrYarnTypeBase.cs @@ -0,0 +1,190 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; +using System.Linq; +using Tango.DAL.Remote.DB; +using Tango.Core; +using System.ComponentModel; +using Tango.Core.CustomAttributes; + +namespace Tango.BL.Entities +{ + [Table("BTSR_YARN_TYPES")] + public abstract class BtsrYarnTypeBase : ObservableEntity + { + + public event EventHandler CodeChanged; + + public event EventHandler NameChanged; + + public event EventHandler DescriptionChanged; + + public event EventHandler> RmlsChanged; + + protected Int32 _code; + + /// + /// Gets or sets the btsryarntypebase code. + /// + + [Column("CODE")] + + public Int32 Code + { + get + { + return _code; + } + + set + { + if (_code != value) + { + _code = value; + + OnCodeChanged(value); + + } + } + } + + protected String _name; + + /// + /// Gets or sets the btsryarntypebase name. + /// + + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + if (_name != value) + { + _name = value; + + OnNameChanged(value); + + } + } + } + + protected String _description; + + /// + /// Gets or sets the btsryarntypebase description. + /// + + [Column("DESCRIPTION")] + + public String Description + { + get + { + return _description; + } + + set + { + if (_description != value) + { + _description = value; + + OnDescriptionChanged(value); + + } + } + } + + protected SynchronizedObservableCollection _rmls; + + /// + /// Gets or sets the btsryarntypebase rmls. + /// + + public virtual SynchronizedObservableCollection Rmls + { + get + { + return _rmls; + } + + set + { + if (_rmls != value) + { + _rmls = value; + + OnRmlsChanged(value); + + } + } + } + + /// + /// Called when the Code has changed. + /// + protected virtual void OnCodeChanged(Int32 code) + { + CodeChanged?.Invoke(this, code); + RaisePropertyChanged(nameof(Code)); + } + + /// + /// Called when the Name has changed. + /// + protected virtual void OnNameChanged(String name) + { + NameChanged?.Invoke(this, name); + RaisePropertyChanged(nameof(Name)); + } + + /// + /// Called when the Description has changed. + /// + protected virtual void OnDescriptionChanged(String description) + { + DescriptionChanged?.Invoke(this, description); + RaisePropertyChanged(nameof(Description)); + } + + /// + /// Called when the Rmls has changed. + /// + protected virtual void OnRmlsChanged(SynchronizedObservableCollection rmls) + { + RmlsChanged?.Invoke(this, rmls); + RaisePropertyChanged(nameof(Rmls)); + } + + /// + /// Initializes a new instance of the class. + /// + public BtsrYarnTypeBase() : base() + { + + Rmls = new SynchronizedObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs index 498bafc85..06248ab32 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs @@ -91,6 +91,12 @@ namespace Tango.BL.Entities public event EventHandler PressureBuildUpChanged; + public event EventHandler BtsrFeedingTensionChanged; + + public event EventHandler BtsrExitTensionChanged; + + public event EventHandler BtsrThreadLengthOffsetChanged; + public event EventHandler ProcessParametersTablesGroupChanged; protected String _name; @@ -1107,6 +1113,99 @@ namespace Tango.BL.Entities } } + protected Double _btsrfeedingtension; + + /// + /// Gets or sets the processparameterstablebase btsr feeding tension. + /// + + [Column("BTSR_FEEDING_TENSION")] + + [StringFormat("0.0")] + + [PropertyIndex(30)] + + public Double BtsrFeedingTension + { + get + { + return _btsrfeedingtension; + } + + set + { + if (_btsrfeedingtension != value) + { + _btsrfeedingtension = value; + + OnBtsrFeedingTensionChanged(value); + + } + } + } + + protected Double _btsrexittension; + + /// + /// Gets or sets the processparameterstablebase btsr exit tension. + /// + + [Column("BTSR_EXIT_TENSION")] + + [StringFormat("0.0")] + + [PropertyIndex(31)] + + public Double BtsrExitTension + { + get + { + return _btsrexittension; + } + + set + { + if (_btsrexittension != value) + { + _btsrexittension = value; + + OnBtsrExitTensionChanged(value); + + } + } + } + + protected Double _btsrthreadlengthoffset; + + /// + /// Gets or sets the processparameterstablebase btsr thread length offset. + /// + + [Column("BTSR_THREAD_LENGTH_OFFSET")] + + [StringFormat("0.0")] + + [PropertyIndex(32)] + + public Double BtsrThreadLengthOffset + { + get + { + return _btsrthreadlengthoffset; + } + + set + { + if (_btsrthreadlengthoffset != value) + { + _btsrthreadlengthoffset = value; + + OnBtsrThreadLengthOffsetChanged(value); + + } + } + } + protected ProcessParametersTablesGroup _processparameterstablesgroup; /// @@ -1427,6 +1526,33 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(PressureBuildUp)); } + /// + /// Called when the BtsrFeedingTension has changed. + /// + protected virtual void OnBtsrFeedingTensionChanged(Double btsrfeedingtension) + { + BtsrFeedingTensionChanged?.Invoke(this, btsrfeedingtension); + RaisePropertyChanged(nameof(BtsrFeedingTension)); + } + + /// + /// Called when the BtsrExitTension has changed. + /// + protected virtual void OnBtsrExitTensionChanged(Double btsrexittension) + { + BtsrExitTensionChanged?.Invoke(this, btsrexittension); + RaisePropertyChanged(nameof(BtsrExitTension)); + } + + /// + /// Called when the BtsrThreadLengthOffset has changed. + /// + protected virtual void OnBtsrThreadLengthOffsetChanged(Double btsrthreadlengthoffset) + { + BtsrThreadLengthOffsetChanged?.Invoke(this, btsrthreadlengthoffset); + RaisePropertyChanged(nameof(BtsrThreadLengthOffset)); + } + /// /// 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 cb081f263..f3851ab6d 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs @@ -105,6 +105,10 @@ namespace Tango.BL.Entities public event EventHandler VMaxChanged; + public event EventHandler BtsrApplicationTypeChanged; + + public event EventHandler BtsrYarnTypeChanged; + public event EventHandler> CatsChanged; public event EventHandler CctChanged; @@ -1368,6 +1372,122 @@ namespace Tango.BL.Entities } } + protected String _btsrapplicationtypeguid; + + /// + /// Gets or sets the rmlbase btsr application type guid. + /// + + [Column("BTSR_APPLICATION_TYPE_GUID")] + [ForeignKey("BtsrApplicationType")] + + public String BtsrApplicationTypeGuid + { + get + { + return _btsrapplicationtypeguid; + } + + set + { + if (_btsrapplicationtypeguid != value) + { + _btsrapplicationtypeguid = value; + + } + } + } + + protected String _btsryarntypeguid; + + /// + /// Gets or sets the rmlbase btsr yarn type guid. + /// + + [Column("BTSR_YARN_TYPE_GUID")] + [ForeignKey("BtsrYarnType")] + + public String BtsrYarnTypeGuid + { + get + { + return _btsryarntypeguid; + } + + set + { + if (_btsryarntypeguid != value) + { + _btsryarntypeguid = value; + + } + } + } + + protected BtsrApplicationType _btsrapplicationtype; + + /// + /// Gets or sets the rmlbase btsr application types. + /// + + [XmlIgnore] + [JsonIgnore] + public virtual BtsrApplicationType BtsrApplicationType + { + get + { + return _btsrapplicationtype; + } + + set + { + if (_btsrapplicationtype != value) + { + _btsrapplicationtype = value; + + if (BtsrApplicationType != null) + { + BtsrApplicationTypeGuid = BtsrApplicationType.Guid; + } + + OnBtsrApplicationTypeChanged(value); + + } + } + } + + protected BtsrYarnType _btsryarntype; + + /// + /// Gets or sets the rmlbase btsr yarn types. + /// + + [XmlIgnore] + [JsonIgnore] + public virtual BtsrYarnType BtsrYarnType + { + get + { + return _btsryarntype; + } + + set + { + if (_btsryarntype != value) + { + _btsryarntype = value; + + if (BtsrYarnType != null) + { + BtsrYarnTypeGuid = BtsrYarnType.Guid; + } + + OnBtsrYarnTypeChanged(value); + + } + } + } + protected SynchronizedObservableCollection _cats; /// @@ -2118,6 +2238,24 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(VMax)); } + /// + /// Called when the BtsrApplicationType has changed. + /// + protected virtual void OnBtsrApplicationTypeChanged(BtsrApplicationType btsrapplicationtype) + { + BtsrApplicationTypeChanged?.Invoke(this, btsrapplicationtype); + RaisePropertyChanged(nameof(BtsrApplicationType)); + } + + /// + /// Called when the BtsrYarnType has changed. + /// + protected virtual void OnBtsrYarnTypeChanged(BtsrYarnType btsryarntype) + { + BtsrYarnTypeChanged?.Invoke(this, btsryarntype); + RaisePropertyChanged(nameof(BtsrYarnType)); + } + /// /// Called when the Cats has changed. /// diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlsSpoolBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlsSpoolBase.cs index fee4ef6b4..0edd11cfd 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlsSpoolBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlsSpoolBase.cs @@ -35,6 +35,8 @@ namespace Tango.BL.Entities public event EventHandler> BottomBackingRateChanged; + public event EventHandler> BtsrSpoolTensionChanged; + public event EventHandler RmlChanged; public event EventHandler SpoolTypeChanged; @@ -199,6 +201,33 @@ namespace Tango.BL.Entities } } + protected Nullable _btsrspooltension; + + /// + /// Gets or sets the rmlsspoolbase btsr spool tension. + /// + + [Column("BTSR_SPOOL_TENSION")] + + public Nullable BtsrSpoolTension + { + get + { + return _btsrspooltension; + } + + set + { + if (_btsrspooltension != value) + { + _btsrspooltension = value; + + OnBtsrSpoolTensionChanged(value); + + } + } + } + protected Rml _rml; /// @@ -299,6 +328,15 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(BottomBackingRate)); } + /// + /// Called when the BtsrSpoolTension has changed. + /// + protected virtual void OnBtsrSpoolTensionChanged(Nullable btsrspooltension) + { + BtsrSpoolTensionChanged?.Invoke(this, btsrspooltension); + RaisePropertyChanged(nameof(BtsrSpoolTension)); + } + /// /// Called when the Rml has changed. /// diff --git a/Software/Visual_Studio/Tango.BL/Entities/SpoolTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SpoolTypeBase.cs index a3e59bbc7..5939a3c62 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/SpoolTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/SpoolTypeBase.cs @@ -49,6 +49,8 @@ namespace Tango.BL.Entities public event EventHandler LimitSwitchStartPointOffsetChanged; + public event EventHandler BtsrSpoolTensionChanged; + public event EventHandler> JobsChanged; public event EventHandler> RmlsSpoolsChanged; @@ -352,6 +354,33 @@ namespace Tango.BL.Entities } } + protected Int32 _btsrspooltension; + + /// + /// Gets or sets the spooltypebase btsr spool tension. + /// + + [Column("BTSR_SPOOL_TENSION")] + + public Int32 BtsrSpoolTension + { + get + { + return _btsrspooltension; + } + + set + { + if (_btsrspooltension != value) + { + _btsrspooltension = value; + + OnBtsrSpoolTensionChanged(value); + + } + } + } + protected SynchronizedObservableCollection _jobs; /// @@ -526,6 +555,15 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(LimitSwitchStartPointOffset)); } + /// + /// Called when the BtsrSpoolTension has changed. + /// + protected virtual void OnBtsrSpoolTensionChanged(Int32 btsrspooltension) + { + BtsrSpoolTensionChanged?.Invoke(this, btsrspooltension); + RaisePropertyChanged(nameof(BtsrSpoolTension)); + } + /// /// Called when the Jobs has changed. /// diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/BtsrApplicationTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/BtsrApplicationTypes.cs new file mode 100644 index 000000000..e3dad13b3 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Enumerations/BtsrApplicationTypes.cs @@ -0,0 +1,119 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.BL.Enumerations +{ + public enum BtsrApplicationTypes + { + + /// + /// (Socks) + /// + [Description("Socks")] + SOCKS = 1, + + /// + /// (Reverse Socks) + /// + [Description("Reverse Socks")] + REVERSE_SOCKS = 2, + + /// + /// (Medical Socks) + /// + [Description("Medical Socks")] + MEDICAL_SOCKS = 3, + + /// + /// (Pantyhose) + /// + [Description("Pantyhose")] + PANTYHOSE = 4, + + /// + /// (Seamless) + /// + [Description("Seamless")] + SEAMLESS = 5, + + /// + /// (Knit) + /// + [Description("Knit")] + KNIT = 6, + + /// + /// (Reverse Knit) + /// + [Description("Reverse Knit")] + REVERSE_KNIT = 7, + + /// + /// (Raschel) + /// + [Description("Raschel")] + RASCHEL = 8, + + /// + /// (Sewing) + /// + [Description("Sewing")] + SEWING = 9, + + /// + /// (Flat Knit) + /// + [Description("Flat Knit")] + FLAT_KNIT = 10, + + /// + /// (Small Loom) + /// + [Description("Small Loom")] + SMALL_LOOM = 11, + + /// + /// (Shoes) + /// + [Description("Shoes")] + SHOES = 12, + + /// + /// (Flat Shoes) + /// + [Description("Flat Shoes")] + FLAT_SHOES = 17, + + /// + /// (Inlay) + /// + [Description("Inlay")] + INLAY = 18, + + /// + /// (Warp) + /// + [Description("Warp")] + WARP = 30, + + /// + /// (Rewind) + /// + [Description("Rewind")] + REWIND = 31, + + } +} diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/BtsrYarnTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/BtsrYarnTypes.cs new file mode 100644 index 000000000..0c29e8006 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Enumerations/BtsrYarnTypes.cs @@ -0,0 +1,59 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.BL.Enumerations +{ + public enum BtsrYarnTypes + { + + /// + /// (Elastic 1) + /// + [Description("Elastic 1")] + ELASTIC_1 = 1, + + /// + /// (All Yarn 1) + /// + [Description("All Yarn 1")] + ALL_YARN_1 = 2, + + /// + /// (All Yarn 2) + /// + [Description("All Yarn 2")] + ALL_YARN_2 = 3, + + /// + /// (All Yarn 3) + /// + [Description("All Yarn 3")] + ALL_YARN_3 = 4, + + /// + /// (Elastic 2) + /// + [Description("Elastic 2")] + ELASTIC_2 = 5, + + /// + /// (Elastic 3) + /// + [Description("Elastic 3")] + ELASTIC_3 = 6, + + } +} diff --git a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs index 9f3deb2d2..73d51e4d4 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs @@ -78,6 +78,22 @@ namespace Tango.BL get; set; } + /// + /// Gets or sets the BtsrApplicationTypes. + /// + public DbSet BtsrApplicationTypes + { + get; set; + } + + /// + /// Gets or sets the BtsrYarnTypes. + /// + public DbSet BtsrYarnTypes + { + get; set; + } + /// /// Gets or sets the CartridgeTypes. /// diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs index ef6704031..075760170 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs @@ -269,6 +269,78 @@ namespace Tango.BL } + private ObservableCollection _btsrapplicationtypes; + /// + /// Gets or sets the BtsrApplicationTypes. + /// + public ObservableCollection BtsrApplicationTypes + { + get + { + return _btsrapplicationtypes; + } + + set + { + _btsrapplicationtypes = value; RaisePropertyChanged(nameof(BtsrApplicationTypes)); + } + + } + + private ICollectionView _btsrapplicationtypesViewSource; + /// + /// Gets or sets the BtsrApplicationTypes View Source. + /// + public ICollectionView BtsrApplicationTypesViewSource + { + get + { + return _btsrapplicationtypesViewSource; + } + + set + { + _btsrapplicationtypesViewSource = value; RaisePropertyChanged(nameof(BtsrApplicationTypesViewSource)); + } + + } + + private ObservableCollection _btsryarntypes; + /// + /// Gets or sets the BtsrYarnTypes. + /// + public ObservableCollection BtsrYarnTypes + { + get + { + return _btsryarntypes; + } + + set + { + _btsryarntypes = value; RaisePropertyChanged(nameof(BtsrYarnTypes)); + } + + } + + private ICollectionView _btsryarntypesViewSource; + /// + /// Gets or sets the BtsrYarnTypes View Source. + /// + public ICollectionView BtsrYarnTypesViewSource + { + get + { + return _btsryarntypesViewSource; + } + + set + { + _btsryarntypesViewSource = value; RaisePropertyChanged(nameof(BtsrYarnTypesViewSource)); + } + + } + private ObservableCollection _cartridgetypes; /// /// Gets or sets the CartridgeTypes. @@ -3133,6 +3205,10 @@ namespace Tango.BL BrushStopsViewSource = CreateCollectionView(BrushStops); + BtsrApplicationTypesViewSource = CreateCollectionView(BtsrApplicationTypes); + + BtsrYarnTypesViewSource = CreateCollectionView(BtsrYarnTypes); + CartridgeTypesViewSource = CreateCollectionView(CartridgeTypes); CatsViewSource = CreateCollectionView(Cats); diff --git a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs index de6e5f0a1..49679267e 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs @@ -269,6 +269,78 @@ namespace Tango.BL } + private ObservableCollection _btsrapplicationtypes; + /// + /// Gets or sets the BtsrApplicationTypes. + /// + public ObservableCollection BtsrApplicationTypes + { + get + { + return _btsrapplicationtypes; + } + + set + { + _btsrapplicationtypes = value; RaisePropertyChanged(nameof(BtsrApplicationTypes)); + } + + } + + private ICollectionView _btsrapplicationtypesViewSource; + /// + /// Gets or sets the BtsrApplicationTypes View Source. + /// + public ICollectionView BtsrApplicationTypesViewSource + { + get + { + return _btsrapplicationtypesViewSource; + } + + set + { + _btsrapplicationtypesViewSource = value; RaisePropertyChanged(nameof(BtsrApplicationTypesViewSource)); + } + + } + + private ObservableCollection _btsryarntypes; + /// + /// Gets or sets the BtsrYarnTypes. + /// + public ObservableCollection BtsrYarnTypes + { + get + { + return _btsryarntypes; + } + + set + { + _btsryarntypes = value; RaisePropertyChanged(nameof(BtsrYarnTypes)); + } + + } + + private ICollectionView _btsryarntypesViewSource; + /// + /// Gets or sets the BtsrYarnTypes View Source. + /// + public ICollectionView BtsrYarnTypesViewSource + { + get + { + return _btsryarntypesViewSource; + } + + set + { + _btsryarntypesViewSource = value; RaisePropertyChanged(nameof(BtsrYarnTypesViewSource)); + } + + } + private ObservableCollection _cartridgetypes; /// /// Gets or sets the CartridgeTypes. @@ -3133,6 +3205,10 @@ namespace Tango.BL BrushStopsViewSource = CreateCollectionView(BrushStops); + BtsrApplicationTypesViewSource = CreateCollectionView(BtsrApplicationTypes); + + BtsrYarnTypesViewSource = CreateCollectionView(BtsrYarnTypes); + CartridgeTypesViewSource = CreateCollectionView(CartridgeTypes); CatsViewSource = CreateCollectionView(Cats); diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj index cdbabb469..9f49af596 100644 --- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj +++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj @@ -152,6 +152,10 @@ + + + + @@ -317,6 +321,10 @@ + + + + @@ -426,6 +434,8 @@ + + @@ -658,7 +668,7 @@ - + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_APPLICATION_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_APPLICATION_TYPES.cs new file mode 100644 index 000000000..a4ebc4b0f --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_APPLICATION_TYPES.cs @@ -0,0 +1,33 @@ +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tango.DAL.Remote.DB +{ + using System; + using System.Collections.Generic; + + public partial class BTSR_APPLICATION_TYPES + { + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public BTSR_APPLICATION_TYPES() + { + this.RMLS = new HashSet(); + } + + public int ID { get; set; } + public string GUID { get; set; } + public System.DateTime LAST_UPDATED { get; set; } + public int CODE { get; set; } + public string NAME { get; set; } + public string DESCRIPTION { get; set; } + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection RMLS { get; set; } + } +} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_YARN_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_YARN_TYPES.cs new file mode 100644 index 000000000..256af7baf --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_YARN_TYPES.cs @@ -0,0 +1,33 @@ +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tango.DAL.Remote.DB +{ + using System; + using System.Collections.Generic; + + public partial class BTSR_YARN_TYPES + { + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public BTSR_YARN_TYPES() + { + this.RMLS = new HashSet(); + } + + public int ID { get; set; } + public string GUID { get; set; } + public System.DateTime LAST_UPDATED { get; set; } + public int CODE { get; set; } + public string NAME { get; set; } + public string DESCRIPTION { get; set; } + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection RMLS { get; set; } + } +} 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 5896f742e..b4719188c 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,6 +50,9 @@ 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 BTSR_FEEDING_TENSION { get; set; } + public double BTSR_EXIT_TENSION { get; set; } + public double BTSR_THREAD_LENGTH_OFFSET { 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 f00189ce7..b5f9cacf3 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs @@ -75,7 +75,11 @@ namespace Tango.DAL.Remote.DB public int CLEANER_FLOW { get; set; } public double ARC_HEAD_CLEANING_MOTOR_SPEED { get; set; } public double V_MAX { get; set; } + public string BTSR_APPLICATION_TYPE_GUID { get; set; } + public string BTSR_YARN_TYPE_GUID { get; set; } + public virtual BTSR_APPLICATION_TYPES BTSR_APPLICATION_TYPES { get; set; } + public virtual BTSR_YARN_TYPES BTSR_YARN_TYPES { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection CATS { get; set; } public virtual CCT CCT { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RMLS_SPOOLS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RMLS_SPOOLS.cs index a314530ec..e6f7d52f7 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RMLS_SPOOLS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RMLS_SPOOLS.cs @@ -23,6 +23,7 @@ namespace Tango.DAL.Remote.DB public Nullable LENGTH { get; set; } public Nullable BACKING_RATE { get; set; } public Nullable BOTTOM_BACKING_RATE { get; set; } + public Nullable BTSR_SPOOL_TENSION { get; set; } public virtual RML RML { get; set; } public virtual SPOOL_TYPES SPOOL_TYPES { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs index 49b63ad5d..c92b72726 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs @@ -32,6 +32,8 @@ namespace Tango.DAL.Remote.DB public virtual DbSet APPLICATION_FIRMWARE_VERSIONS { get; set; } public virtual DbSet APPLICATION_OS_VERSIONS { get; set; } public virtual DbSet BRUSH_STOPS { get; set; } + public virtual DbSet BTSR_APPLICATION_TYPES { get; set; } + public virtual DbSet BTSR_YARN_TYPES { get; set; } public virtual DbSet CARTRIDGE_TYPES { get; set; } public virtual DbSet CATS { get; set; } public virtual DbSet CCTS { 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 26e142522..a40614cf0 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -110,6 +110,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -956,6 +978,9 @@ + + + @@ -1048,6 +1073,8 @@ + + @@ -1062,6 +1089,7 @@ + @@ -1145,6 +1173,7 @@ + @@ -2233,6 +2262,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -2506,6 +2559,8 @@ + + @@ -2862,6 +2917,14 @@ + + + + + + + + @@ -2955,6 +3018,8 @@ + + @@ -3074,6 +3139,14 @@ + + + + + + + + @@ -3514,6 +3587,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -4474,6 +4571,9 @@ + + + @@ -4571,6 +4671,10 @@ + + + + @@ -4599,6 +4703,7 @@ + @@ -4697,6 +4802,7 @@ + @@ -5023,6 +5129,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -6189,6 +6319,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -7051,6 +7205,9 @@ + + + @@ -7134,6 +7291,8 @@ + + @@ -7189,6 +7348,7 @@ + @@ -7274,6 +7434,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 ef97ba374..41e56d6d9 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -5,91 +5,93 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -100,6 +102,8 @@ + + diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL_TYPES.cs index af2355553..836112ec7 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL_TYPES.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL_TYPES.cs @@ -36,6 +36,7 @@ namespace Tango.DAL.Remote.DB public int SEGMENT_OFFSET_PULSES { get; set; } public int BOTTOM_BACKING_RATE { get; set; } public int LIMIT_SWITCH_START_POINT_OFFSET { get; set; } + public int BTSR_SPOOL_TENSION { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection JOBS { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj index bdb0b7715..6cf0f995c 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj +++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj @@ -84,6 +84,12 @@ RemoteADO.tt + + RemoteADO.tt + + + RemoteADO.tt + RemoteADO.tt @@ -389,7 +395,7 @@ - + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.PMR/BTSR/BtsrApplicationType.cs b/Software/Visual_Studio/Tango.PMR/BTSR/BtsrApplicationType.cs new file mode 100644 index 000000000..c7d6c2616 --- /dev/null +++ b/Software/Visual_Studio/Tango.PMR/BTSR/BtsrApplicationType.cs @@ -0,0 +1,65 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: BtsrApplicationType.proto +#pragma warning disable 1591, 0612, 3021 +#region Designer generated code + +using pb = global::Google.Protobuf; +using pbc = global::Google.Protobuf.Collections; +using pbr = global::Google.Protobuf.Reflection; +using scg = global::System.Collections.Generic; +namespace Tango.PMR.BTSR { + + /// Holder for reflection information generated from BtsrApplicationType.proto + public static partial class BtsrApplicationTypeReflection { + + #region Descriptor + /// File descriptor for BtsrApplicationType.proto + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static BtsrApplicationTypeReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "ChlCdHNyQXBwbGljYXRpb25UeXBlLnByb3RvEg5UYW5nby5QTVIuQlRTUiqO", + "AgoTQnRzckFwcGxpY2F0aW9uVHlwZRIZChVVTkRFRklORURfQVBQTElDQVRJ", + "T04QABIJCgVTT0NLUxABEhEKDVJFVkVSU0VfU09DS1MQAhIRCg1NRURJQ0FM", + "X1NPQ0tTEAMSDQoJUEFOVFlIT1NFEAQSDAoIU0VBTUxFU1MQBRIICgRLTklU", + "EAYSEAoMUkVWRVJTRV9LTklUEAcSCwoHUkFTQ0hFTBAIEgoKBlNFV0lORxAJ", + "Eg0KCUZMQVRfS05JVBAKEg4KClNNQUxMX0xPT00QCxIJCgVTSE9FUxAMEg4K", + "CkZMQVRfU0hPRVMQERIJCgVJTkxBWRASEggKBFdBUlAQHhIKCgZSRVdJTkQQ", + "H0IaChhjb20udHdpbmUudGFuZ28ucG1yLmJ0c3JiBnByb3RvMw==")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { }, + new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.BTSR.BtsrApplicationType), }, null)); + } + #endregion + + } + #region Enums + public enum BtsrApplicationType { + [pbr::OriginalName("UNDEFINED_APPLICATION")] UndefinedApplication = 0, + [pbr::OriginalName("SOCKS")] Socks = 1, + [pbr::OriginalName("REVERSE_SOCKS")] ReverseSocks = 2, + [pbr::OriginalName("MEDICAL_SOCKS")] MedicalSocks = 3, + [pbr::OriginalName("PANTYHOSE")] Pantyhose = 4, + [pbr::OriginalName("SEAMLESS")] Seamless = 5, + [pbr::OriginalName("KNIT")] Knit = 6, + [pbr::OriginalName("REVERSE_KNIT")] ReverseKnit = 7, + [pbr::OriginalName("RASCHEL")] Raschel = 8, + [pbr::OriginalName("SEWING")] Sewing = 9, + [pbr::OriginalName("FLAT_KNIT")] FlatKnit = 10, + [pbr::OriginalName("SMALL_LOOM")] SmallLoom = 11, + [pbr::OriginalName("SHOES")] Shoes = 12, + [pbr::OriginalName("FLAT_SHOES")] FlatShoes = 17, + [pbr::OriginalName("INLAY")] Inlay = 18, + [pbr::OriginalName("WARP")] Warp = 30, + [pbr::OriginalName("REWIND")] Rewind = 31, + } + + #endregion + +} + +#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/BTSR/BtsrParameters.cs b/Software/Visual_Studio/Tango.PMR/BTSR/BtsrParameters.cs new file mode 100644 index 000000000..964e490d0 --- /dev/null +++ b/Software/Visual_Studio/Tango.PMR/BTSR/BtsrParameters.cs @@ -0,0 +1,219 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: BtsrParameters.proto +#pragma warning disable 1591, 0612, 3021 +#region Designer generated code + +using pb = global::Google.Protobuf; +using pbc = global::Google.Protobuf.Collections; +using pbr = global::Google.Protobuf.Reflection; +using scg = global::System.Collections.Generic; +namespace Tango.PMR.BTSR { + + /// Holder for reflection information generated from BtsrParameters.proto + public static partial class BtsrParametersReflection { + + #region Descriptor + /// File descriptor for BtsrParameters.proto + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static BtsrParametersReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "ChRCdHNyUGFyYW1ldGVycy5wcm90bxIOVGFuZ28uUE1SLkJUU1IaGUJ0c3JB", + "cHBsaWNhdGlvblR5cGUucHJvdG8aEkJ0c3JZYXJuVHlwZS5wcm90byKcAQoO", + "QnRzclBhcmFtZXRlcnMSQAoTQnRzckFwcGxpY2F0aW9uVHlwZRgBIAEoDjIj", + "LlRhbmdvLlBNUi5CVFNSLkJ0c3JBcHBsaWNhdGlvblR5cGUSMgoMQnRzcllh", + "cm5UeXBlGAIgASgOMhwuVGFuZ28uUE1SLkJUU1IuQnRzcllhcm5UeXBlEhQK", + "DFRlbnNpb25FcnJvchgDIAEoAkIaChhjb20udHdpbmUudGFuZ28ucG1yLmJ0", + "c3JiBnByb3RvMw==")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { global::Tango.PMR.BTSR.BtsrApplicationTypeReflection.Descriptor, global::Tango.PMR.BTSR.BtsrYarnTypeReflection.Descriptor, }, + new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.BTSR.BtsrParameters), global::Tango.PMR.BTSR.BtsrParameters.Parser, new[]{ "BtsrApplicationType", "BtsrYarnType", "TensionError" }, null, null, null) + })); + } + #endregion + + } + #region Messages + public sealed partial class BtsrParameters : pb::IMessage { + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new BtsrParameters()); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::Tango.PMR.BTSR.BtsrParametersReflection.Descriptor.MessageTypes[0]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public BtsrParameters() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public BtsrParameters(BtsrParameters other) : this() { + btsrApplicationType_ = other.btsrApplicationType_; + btsrYarnType_ = other.btsrYarnType_; + tensionError_ = other.tensionError_; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public BtsrParameters Clone() { + return new BtsrParameters(this); + } + + /// Field number for the "BtsrApplicationType" field. + public const int BtsrApplicationTypeFieldNumber = 1; + private global::Tango.PMR.BTSR.BtsrApplicationType btsrApplicationType_ = 0; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public global::Tango.PMR.BTSR.BtsrApplicationType BtsrApplicationType { + get { return btsrApplicationType_; } + set { + btsrApplicationType_ = value; + } + } + + /// Field number for the "BtsrYarnType" field. + public const int BtsrYarnTypeFieldNumber = 2; + private global::Tango.PMR.BTSR.BtsrYarnType btsrYarnType_ = 0; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public global::Tango.PMR.BTSR.BtsrYarnType BtsrYarnType { + get { return btsrYarnType_; } + set { + btsrYarnType_ = value; + } + } + + /// Field number for the "TensionError" field. + public const int TensionErrorFieldNumber = 3; + private float tensionError_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public float TensionError { + get { return tensionError_; } + set { + tensionError_ = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as BtsrParameters); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(BtsrParameters other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (BtsrApplicationType != other.BtsrApplicationType) return false; + if (BtsrYarnType != other.BtsrYarnType) return false; + if (TensionError != other.TensionError) return false; + return true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + if (BtsrApplicationType != 0) hash ^= BtsrApplicationType.GetHashCode(); + if (BtsrYarnType != 0) hash ^= BtsrYarnType.GetHashCode(); + if (TensionError != 0F) hash ^= TensionError.GetHashCode(); + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void WriteTo(pb::CodedOutputStream output) { + if (BtsrApplicationType != 0) { + output.WriteRawTag(8); + output.WriteEnum((int) BtsrApplicationType); + } + if (BtsrYarnType != 0) { + output.WriteRawTag(16); + output.WriteEnum((int) BtsrYarnType); + } + if (TensionError != 0F) { + output.WriteRawTag(29); + output.WriteFloat(TensionError); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + if (BtsrApplicationType != 0) { + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) BtsrApplicationType); + } + if (BtsrYarnType != 0) { + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) BtsrYarnType); + } + if (TensionError != 0F) { + size += 1 + 4; + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(BtsrParameters other) { + if (other == null) { + return; + } + if (other.BtsrApplicationType != 0) { + BtsrApplicationType = other.BtsrApplicationType; + } + if (other.BtsrYarnType != 0) { + BtsrYarnType = other.BtsrYarnType; + } + if (other.TensionError != 0F) { + TensionError = other.TensionError; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(pb::CodedInputStream input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + input.SkipLastField(); + break; + case 8: { + btsrApplicationType_ = (global::Tango.PMR.BTSR.BtsrApplicationType) input.ReadEnum(); + break; + } + case 16: { + btsrYarnType_ = (global::Tango.PMR.BTSR.BtsrYarnType) input.ReadEnum(); + break; + } + case 29: { + TensionError = input.ReadFloat(); + break; + } + } + } + } + + } + + #endregion + +} + +#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/BTSR/BtsrYarnType.cs b/Software/Visual_Studio/Tango.PMR/BTSR/BtsrYarnType.cs new file mode 100644 index 000000000..995922a22 --- /dev/null +++ b/Software/Visual_Studio/Tango.PMR/BTSR/BtsrYarnType.cs @@ -0,0 +1,52 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: BtsrYarnType.proto +#pragma warning disable 1591, 0612, 3021 +#region Designer generated code + +using pb = global::Google.Protobuf; +using pbc = global::Google.Protobuf.Collections; +using pbr = global::Google.Protobuf.Reflection; +using scg = global::System.Collections.Generic; +namespace Tango.PMR.BTSR { + + /// Holder for reflection information generated from BtsrYarnType.proto + public static partial class BtsrYarnTypeReflection { + + #region Descriptor + /// File descriptor for BtsrYarnType.proto + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static BtsrYarnTypeReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "ChJCdHNyWWFyblR5cGUucHJvdG8SDlRhbmdvLlBNUi5CVFNSKn8KDEJ0c3JZ", + "YXJuVHlwZRISCg5VTkRFRklORURfWUFSThAAEg0KCUVMQVNUSUNfMRABEg4K", + "CkFMTF9ZQVJOXzEQAhIOCgpBTExfWUFSTl8yEAMSDgoKQUxMX1lBUk5fMxAE", + "Eg0KCUVMQVNUSUNfMhAFEg0KCUVMQVNUSUNfMxAGQhoKGGNvbS50d2luZS50", + "YW5nby5wbXIuYnRzcmIGcHJvdG8z")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { }, + new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.BTSR.BtsrYarnType), }, null)); + } + #endregion + + } + #region Enums + public enum BtsrYarnType { + [pbr::OriginalName("UNDEFINED_YARN")] UndefinedYarn = 0, + [pbr::OriginalName("ELASTIC_1")] Elastic1 = 1, + [pbr::OriginalName("ALL_YARN_1")] AllYarn1 = 2, + [pbr::OriginalName("ALL_YARN_2")] AllYarn2 = 3, + [pbr::OriginalName("ALL_YARN_3")] AllYarn3 = 4, + [pbr::OriginalName("ELASTIC_2")] Elastic2 = 5, + [pbr::OriginalName("ELASTIC_3")] Elastic3 = 6, + } + + #endregion + +} + +#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs index d69fb761b..1af8dad60 100644 --- a/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs +++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs @@ -1242,67 +1242,67 @@ namespace Tango.PMR.Diagnostics { /// [pbr::OriginalName("MIXER_CURRENT_LOOP_BREAK")] MixerCurrentLoopBreak = 6005, /// - ///Overpressure in @ dispenser . Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in the @ dispenser . Cannot execute job (Group = Dispensers, Category = Critical) /// [pbr::OriginalName("DISPENSER_1_OVERPRESSURE")] Dispenser1Overpressure = 7000, /// - ///Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) /// [pbr::OriginalName("DISPENSER_2_OVERPRESSURE")] Dispenser2Overpressure = 7001, /// - ///Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) /// [pbr::OriginalName("DISPENSER_3_OVERPRESSURE")] Dispenser3Overpressure = 7002, /// - ///Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) /// [pbr::OriginalName("DISPENSER_4_OVERPRESSURE")] Dispenser4Overpressure = 7003, /// - ///Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) /// [pbr::OriginalName("DISPENSER_5_OVERPRESSURE")] Dispenser5Overpressure = 7004, /// - ///Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) /// [pbr::OriginalName("DISPENSER_6_OVERPRESSURE")] Dispenser6Overpressure = 7005, /// - ///Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) /// [pbr::OriginalName("DISPENSER_7_OVERPRESSURE")] Dispenser7Overpressure = 7006, /// - ///Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) /// [pbr::OriginalName("DISPENSER_8_OVERPRESSURE")] Dispenser8Overpressure = 7007, /// - ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// [pbr::OriginalName("DISPENSER_1_UNDERPRESSURE")] Dispenser1Underpressure = 7008, /// - ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// [pbr::OriginalName("DISPENSER_2_UNDERPRESSURE")] Dispenser2Underpressure = 7009, /// - ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// [pbr::OriginalName("DISPENSER_3_UNDERPRESSURE")] Dispenser3Underpressure = 7010, /// - ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// [pbr::OriginalName("DISPENSER_4_UNDERPRESSURE")] Dispenser4Underpressure = 7011, /// - ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// [pbr::OriginalName("DISPENSER_5_UNDERPRESSURE")] Dispenser5Underpressure = 7012, /// - ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// [pbr::OriginalName("DISPENSER_6_UNDERPRESSURE")] Dispenser6Underpressure = 7013, /// - ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// [pbr::OriginalName("DISPENSER_7_UNDERPRESSURE")] Dispenser7Underpressure = 7014, /// - ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// [pbr::OriginalName("DISPENSER_8_UNDERPRESSURE")] Dispenser8Underpressure = 7015, /// @@ -1562,227 +1562,227 @@ namespace Tango.PMR.Diagnostics { /// [pbr::OriginalName("DISPENSER_8_LOWER_HARD_LIMIT")] Dispenser8LowerHardLimit = 7079, /// - ///Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) /// [pbr::OriginalName("DISPENSER_1_HIGH_PRESSURE")] Dispenser1HighPressure = 7080, /// - ///Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) /// [pbr::OriginalName("DISPENSER_2_HIGH_PRESSURE")] Dispenser2HighPressure = 7081, /// - ///Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) /// [pbr::OriginalName("DISPENSER_3_HIGH_PRESSURE")] Dispenser3HighPressure = 7082, /// - ///Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) /// [pbr::OriginalName("DISPENSER_4_HIGH_PRESSURE")] Dispenser4HighPressure = 7083, /// - ///Pressure in @ dispenser is too high. Cannot execue job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too high. Cannot execue job (Group = Dispensers, Category = Error) /// [pbr::OriginalName("DISPENSER_5_HIGH_PRESSURE")] Dispenser5HighPressure = 7084, /// - ///Pressure in@ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) /// [pbr::OriginalName("DISPENSER_6_HIGH_PRESSURE")] Dispenser6HighPressure = 7085, /// - ///Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) /// [pbr::OriginalName("DISPENSER_7_HIGH_PRESSURE")] Dispenser7HighPressure = 7086, /// - ///Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) /// [pbr::OriginalName("DISPENSER_8_HIGH_PRESSURE")] Dispenser8HighPressure = 7087, /// - ///Overpressure in @. Cannot execute job (Group = Dispensers, Category = Error) + ///Overpressure in @ module. Cannot execute job (Group = Dispensers, Category = Error) /// [pbr::OriginalName("DISPENSER_9_OVERPRESSURE")] Dispenser9Overpressure = 7088, /// - ///Pressure in @ is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ module is too low. Cannot execute job (Group = Dispensers, Category = Error) /// [pbr::OriginalName("DISPENSER_9_UNDERPRESSURE")] Dispenser9Underpressure = 7089, /// - ///Overpressure in @. Cannot execute job (Group = Dispensers, Category = Error) + ///Overpressure in @ module. Cannot execute job (Group = Dispensers, Category = Error) /// [pbr::OriginalName("DISPENSER_10_OVERPRESSURE")] Dispenser10Overpressure = 7090, /// - ///Pressure in @ is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ module is too low. Cannot execute job (Group = Dispensers, Category = Error) /// [pbr::OriginalName("DISPENSER_10_UNDERPRESSURE")] Dispenser10Underpressure = 7091, /// - ///Malfunction in @ motor 1. Cannot execute job (Group = Dispensers, Category = Error) + ///Malfunction in @ module motor 1. Cannot execute job (Group = Dispensers, Category = Error) /// [pbr::OriginalName("DISPENSER_9_MOTOR_1_MALFUNCTION")] Dispenser9Motor1Malfunction = 7092, /// - ///Malfunction in @ motor 2. Cannot execute job (Group = Dispensers, Category = Error) + ///Malfunction in @ module motor 2. Cannot execute job (Group = Dispensers, Category = Error) /// [pbr::OriginalName("DISPENSER_9_MOTOR_2_MALFUNCTION")] Dispenser9Motor2Malfunction = 7093, /// - ///Malfunction in @ motor 1. Cannot execute job (Group = Dispensers, Category = Error) + ///Malfunction in @ module motor 1. Cannot execute job (Group = Dispensers, Category = Error) /// [pbr::OriginalName("DISPENSER_10_MOTOR_1_MALFUNCTION")] Dispenser10Motor1Malfunction = 7094, /// - ///Malfunction in @ motor 2. Cannot execute job (Group = Dispensers, Category = Error) + ///Malfunction in @ module motor 2. Cannot execute job (Group = Dispensers, Category = Error) /// [pbr::OriginalName("DISPENSER_10_MOTOR_2_MALFUNCTION")] Dispenser10Motor2Malfunction = 7095, /// - ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// [pbr::OriginalName("MID_TANK_1_LOW_LEVEL")] MidTank1LowLevel = 8000, /// - ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// [pbr::OriginalName("MID_TANK_2_LOW_LEVEL")] MidTank2LowLevel = 8001, /// - ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// [pbr::OriginalName("MID_TANK_3_LOW_LEVEL")] MidTank3LowLevel = 8002, /// - ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// [pbr::OriginalName("MID_TANK_4_LOW_LEVEL")] MidTank4LowLevel = 8003, /// - ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// [pbr::OriginalName("MID_TANK_5_LOW_LEVEL")] MidTank5LowLevel = 8004, /// - ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// [pbr::OriginalName("MID_TANK_6_LOW_LEVEL")] MidTank6LowLevel = 8005, /// - ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// [pbr::OriginalName("MID_TANK_7_LOW_LEVEL")] MidTank7LowLevel = 8006, /// - ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// [pbr::OriginalName("MID_TANK_8_LOW_LEVEL")] MidTank8LowLevel = 8007, /// - ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_1_EMPTY")] MidTank1Empty = 8008, /// - ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_2_EMPTY")] MidTank2Empty = 8009, /// - ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_3_EMPTY")] MidTank3Empty = 8010, /// - ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_4_EMPTY")] MidTank4Empty = 8011, /// - ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_5_EMPTY")] MidTank5Empty = 8012, /// - ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_6_EMPTY")] MidTank6Empty = 8013, /// - ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_7_EMPTY")] MidTank7Empty = 8014, /// - ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_8_EMPTY")] MidTank8Empty = 8015, /// - ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_1_OVERFLOW")] MidTank1Overflow = 8016, /// - ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_2_OVERFLOW")] MidTank2Overflow = 8017, /// - ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_3_OVERFLOW")] MidTank3Overflow = 8018, /// - ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_4_OVERFLOW")] MidTank4Overflow = 8019, /// - ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_5_OVERFLOW")] MidTank5Overflow = 8020, /// - ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_6_OVERFLOW")] MidTank6Overflow = 8021, /// - ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_7_OVERFLOW")] MidTank7Overflow = 8022, /// - ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_8_OVERFLOW")] MidTank8Overflow = 8023, /// - ///Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_1_FILL_TIMEOUT")] MidTank1FillTimeout = 8024, /// - ///Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_2_FILL_TIMEOUT")] MidTank2FillTimeout = 8025, /// - ///Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_3_FILL_TIMEOUT")] MidTank3FillTimeout = 8026, /// - ///Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_4_FILL_TIMEOUT")] MidTank4FillTimeout = 8027, /// - ///Failed to fill @ ink. Canot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_5_FILL_TIMEOUT")] MidTank5FillTimeout = 8028, /// - ///Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_6_FILL_TIMEOUT")] MidTank6FillTimeout = 8029, /// - ///Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_7_FILL_TIMEOUT")] MidTank7FillTimeout = 8030, /// - ///Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_8_FILL_TIMEOUT")] MidTank8FillTimeout = 8031, /// - ///Level of @ is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// [pbr::OriginalName("MID_TANK_9_LOW_LEVEL")] MidTank9LowLevel = 8032, /// - ///The @ is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_9_EMPTY")] MidTank9Empty = 8033, /// - ///Overflow in @. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_9_OVERFLOW")] MidTank9Overflow = 8034, /// - ///Failed to fill @. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_9_FILL_TIMEOUT")] MidTank9FillTimeout = 8035, /// - ///Level of @ is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// [pbr::OriginalName("MID_TANK_10_LOW_LEVEL")] MidTank10LowLevel = 8036, /// - ///The @ is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_10_EMPTY")] MidTank10Empty = 8037, /// - ///Overflow in @. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_10_OVERFLOW")] MidTank10Overflow = 8038, /// - ///Failed to fill @. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// [pbr::OriginalName("MID_TANK_10_FILL_TIMEOUT")] MidTank10FillTimeout = 8039, /// diff --git a/Software/Visual_Studio/Tango.PMR/Printing/JobSpool.cs b/Software/Visual_Studio/Tango.PMR/Printing/JobSpool.cs index c716906e6..def81f838 100644 --- a/Software/Visual_Studio/Tango.PMR/Printing/JobSpool.cs +++ b/Software/Visual_Studio/Tango.PMR/Printing/JobSpool.cs @@ -23,18 +23,19 @@ namespace Tango.PMR.Printing { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "Cg5Kb2JTcG9vbC5wcm90bxISVGFuZ28uUE1SLlByaW50aW5nGhJKb2JTcG9v", - "bFR5cGUucHJvdG8ingIKCEpvYlNwb29sEjYKDEpvYlNwb29sVHlwZRgBIAEo", + "bFR5cGUucHJvdG8iuAIKCEpvYlNwb29sEjYKDEpvYlNwb29sVHlwZRgBIAEo", "DjIgLlRhbmdvLlBNUi5QcmludGluZy5Kb2JTcG9vbFR5cGUSDgoGTGVuZ3Ro", "GAIgASgBEg4KBldlaWdodBgDIAEoARIQCghEaWFtZXRlchgEIAEoARIbChNS", "b3RhdGlvbnNQZXJQYXNzYWdlGAUgASgBEhkKEVN0YXJ0T2Zmc2V0UHVsc2Vz", "GAYgASgFEhMKC0JhY2tpbmdSYXRlGAcgASgFEhsKE1NlZ21lbnRPZmZzZXRQ", "dWxzZXMYCCABKAUSGQoRQm90dG9tQmFja2luZ1JhdGUYCSABKAUSIwobTGlt", - "aXRTd2l0Y2hTdGFydFBvaW50T2Zmc2V0GAogASgFQh4KHGNvbS50d2luZS50", - "YW5nby5wbXIucHJpbnRpbmdiBnByb3RvMw==")); + "aXRTd2l0Y2hTdGFydFBvaW50T2Zmc2V0GAogASgFEhgKEEJ0c3JTcG9vbFRl", + "bnNpb24YCyABKAVCHgocY29tLnR3aW5lLnRhbmdvLnBtci5wcmludGluZ2IG", + "cHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::Tango.PMR.Printing.JobSpoolTypeReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.JobSpool), global::Tango.PMR.Printing.JobSpool.Parser, new[]{ "JobSpoolType", "Length", "Weight", "Diameter", "RotationsPerPassage", "StartOffsetPulses", "BackingRate", "SegmentOffsetPulses", "BottomBackingRate", "LimitSwitchStartPointOffset" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.JobSpool), global::Tango.PMR.Printing.JobSpool.Parser, new[]{ "JobSpoolType", "Length", "Weight", "Diameter", "RotationsPerPassage", "StartOffsetPulses", "BackingRate", "SegmentOffsetPulses", "BottomBackingRate", "LimitSwitchStartPointOffset", "BtsrSpoolTension" }, null, null, null) })); } #endregion @@ -75,6 +76,7 @@ namespace Tango.PMR.Printing { segmentOffsetPulses_ = other.segmentOffsetPulses_; bottomBackingRate_ = other.bottomBackingRate_; limitSwitchStartPointOffset_ = other.limitSwitchStartPointOffset_; + btsrSpoolTension_ = other.btsrSpoolTension_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -192,6 +194,17 @@ namespace Tango.PMR.Printing { } } + /// Field number for the "BtsrSpoolTension" field. + public const int BtsrSpoolTensionFieldNumber = 11; + private int btsrSpoolTension_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int BtsrSpoolTension { + get { return btsrSpoolTension_; } + set { + btsrSpoolTension_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as JobSpool); @@ -215,6 +228,7 @@ namespace Tango.PMR.Printing { if (SegmentOffsetPulses != other.SegmentOffsetPulses) return false; if (BottomBackingRate != other.BottomBackingRate) return false; if (LimitSwitchStartPointOffset != other.LimitSwitchStartPointOffset) return false; + if (BtsrSpoolTension != other.BtsrSpoolTension) return false; return true; } @@ -231,6 +245,7 @@ namespace Tango.PMR.Printing { if (SegmentOffsetPulses != 0) hash ^= SegmentOffsetPulses.GetHashCode(); if (BottomBackingRate != 0) hash ^= BottomBackingRate.GetHashCode(); if (LimitSwitchStartPointOffset != 0) hash ^= LimitSwitchStartPointOffset.GetHashCode(); + if (BtsrSpoolTension != 0) hash ^= BtsrSpoolTension.GetHashCode(); return hash; } @@ -281,6 +296,10 @@ namespace Tango.PMR.Printing { output.WriteRawTag(80); output.WriteInt32(LimitSwitchStartPointOffset); } + if (BtsrSpoolTension != 0) { + output.WriteRawTag(88); + output.WriteInt32(BtsrSpoolTension); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -316,6 +335,9 @@ namespace Tango.PMR.Printing { if (LimitSwitchStartPointOffset != 0) { size += 1 + pb::CodedOutputStream.ComputeInt32Size(LimitSwitchStartPointOffset); } + if (BtsrSpoolTension != 0) { + size += 1 + pb::CodedOutputStream.ComputeInt32Size(BtsrSpoolTension); + } return size; } @@ -354,6 +376,9 @@ namespace Tango.PMR.Printing { if (other.LimitSwitchStartPointOffset != 0) { LimitSwitchStartPointOffset = other.LimitSwitchStartPointOffset; } + if (other.BtsrSpoolTension != 0) { + BtsrSpoolTension = other.BtsrSpoolTension; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -404,6 +429,10 @@ namespace Tango.PMR.Printing { LimitSwitchStartPointOffset = input.ReadInt32(); break; } + case 88: { + BtsrSpoolTension = input.ReadInt32(); + break; + } } } } diff --git a/Software/Visual_Studio/Tango.PMR/Printing/JobTicket.cs b/Software/Visual_Studio/Tango.PMR/Printing/JobTicket.cs index 8e314704d..40460508f 100644 --- a/Software/Visual_Studio/Tango.PMR/Printing/JobTicket.cs +++ b/Software/Visual_Studio/Tango.PMR/Printing/JobTicket.cs @@ -26,26 +26,28 @@ namespace Tango.PMR.Printing { "bWVudC5wcm90bxoXUHJvY2Vzc1BhcmFtZXRlcnMucHJvdG8aFkpvYldpbmRp", "bmdNZXRob2QucHJvdG8aDkpvYlNwb29sLnByb3RvGhdKb2JVcGxvYWRTdHJh", "dGVneS5wcm90bxoWVGhyZWFkUGFyYW1ldGVycy5wcm90bxocSGVhZENsZWFu", - "aW5nUGFyYW1ldGVycy5wcm90byL9BAoJSm9iVGlja2V0EgwKBEd1aWQYASAB", - "KAkSDAoETmFtZRgCIAEoCRIaChJFbmFibGVJbnRlclNlZ21lbnQYAyABKAgS", - "GgoSSW50ZXJTZWdtZW50TGVuZ3RoGAQgASgBEg4KBkxlbmd0aBgFIAEoARJA", - "ChFQcm9jZXNzUGFyYW1ldGVycxgGIAEoCzIlLlRhbmdvLlBNUi5QcmludGlu", - "Zy5Qcm9jZXNzUGFyYW1ldGVycxI7Cg1XaW5kaW5nTWV0aG9kGAcgASgOMiQu", - "VGFuZ28uUE1SLlByaW50aW5nLkpvYldpbmRpbmdNZXRob2QSKwoFU3Bvb2wY", - "CCABKAsyHC5UYW5nby5QTVIuUHJpbnRpbmcuSm9iU3Bvb2wSMAoIU2VnbWVu", - "dHMYCSADKAsyHi5UYW5nby5QTVIuUHJpbnRpbmcuSm9iU2VnbWVudBI9Cg5V", - "cGxvYWRTdHJhdGVneRgKIAEoDjIlLlRhbmdvLlBNUi5QcmludGluZy5Kb2JV", - "cGxvYWRTdHJhdGVneRIaChJKb2JEZXNjcmlwdGlvbkZpbGUYCyABKAkSGQoR", - "RW5hYmxlTHVicmljYXRpb24YDCABKAgSFQoNTnVtYmVyT2ZVbml0cxgNIAEo", - "DRIVCg1TYW1wbGVXaW5kaW5nGA4gASgIEj4KEFRocmVhZFBhcmFtZXRlcnMY", - "DyABKAsyJC5UYW5nby5QTVIuUHJpbnRpbmcuVGhyZWFkUGFyYW1ldGVycxJK", - "ChZIZWFkQ2xlYW5pbmdQYXJhbWV0ZXJzGBAgASgLMiouVGFuZ28uUE1SLlBy", - "aW50aW5nLkhlYWRDbGVhbmluZ1BhcmFtZXRlcnNCHgocY29tLnR3aW5lLnRh", - "bmdvLnBtci5wcmludGluZ2IGcHJvdG8z")); + "aW5nUGFyYW1ldGVycy5wcm90bxoUQnRzclBhcmFtZXRlcnMucHJvdG8itQUK", + "CUpvYlRpY2tldBIMCgRHdWlkGAEgASgJEgwKBE5hbWUYAiABKAkSGgoSRW5h", + "YmxlSW50ZXJTZWdtZW50GAMgASgIEhoKEkludGVyU2VnbWVudExlbmd0aBgE", + "IAEoARIOCgZMZW5ndGgYBSABKAESQAoRUHJvY2Vzc1BhcmFtZXRlcnMYBiAB", + "KAsyJS5UYW5nby5QTVIuUHJpbnRpbmcuUHJvY2Vzc1BhcmFtZXRlcnMSOwoN", + "V2luZGluZ01ldGhvZBgHIAEoDjIkLlRhbmdvLlBNUi5QcmludGluZy5Kb2JX", + "aW5kaW5nTWV0aG9kEisKBVNwb29sGAggASgLMhwuVGFuZ28uUE1SLlByaW50", + "aW5nLkpvYlNwb29sEjAKCFNlZ21lbnRzGAkgAygLMh4uVGFuZ28uUE1SLlBy", + "aW50aW5nLkpvYlNlZ21lbnQSPQoOVXBsb2FkU3RyYXRlZ3kYCiABKA4yJS5U", + "YW5nby5QTVIuUHJpbnRpbmcuSm9iVXBsb2FkU3RyYXRlZ3kSGgoSSm9iRGVz", + "Y3JpcHRpb25GaWxlGAsgASgJEhkKEUVuYWJsZUx1YnJpY2F0aW9uGAwgASgI", + "EhUKDU51bWJlck9mVW5pdHMYDSABKA0SFQoNU2FtcGxlV2luZGluZxgOIAEo", + "CBI+ChBUaHJlYWRQYXJhbWV0ZXJzGA8gASgLMiQuVGFuZ28uUE1SLlByaW50", + "aW5nLlRocmVhZFBhcmFtZXRlcnMSSgoWSGVhZENsZWFuaW5nUGFyYW1ldGVy", + "cxgQIAEoCzIqLlRhbmdvLlBNUi5QcmludGluZy5IZWFkQ2xlYW5pbmdQYXJh", + "bWV0ZXJzEjYKDkJ0c3JQYXJhbWV0ZXJzGBEgASgLMh4uVGFuZ28uUE1SLkJU", + "U1IuQnRzclBhcmFtZXRlcnNCHgocY29tLnR3aW5lLnRhbmdvLnBtci5wcmlu", + "dGluZ2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::Tango.PMR.Printing.JobSegmentReflection.Descriptor, global::Tango.PMR.Printing.ProcessParametersReflection.Descriptor, global::Tango.PMR.Printing.JobWindingMethodReflection.Descriptor, global::Tango.PMR.Printing.JobSpoolReflection.Descriptor, global::Tango.PMR.Printing.JobUploadStrategyReflection.Descriptor, global::Tango.PMR.Printing.ThreadParametersReflection.Descriptor, global::Tango.PMR.Printing.HeadCleaningParametersReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::Tango.PMR.Printing.JobSegmentReflection.Descriptor, global::Tango.PMR.Printing.ProcessParametersReflection.Descriptor, global::Tango.PMR.Printing.JobWindingMethodReflection.Descriptor, global::Tango.PMR.Printing.JobSpoolReflection.Descriptor, global::Tango.PMR.Printing.JobUploadStrategyReflection.Descriptor, global::Tango.PMR.Printing.ThreadParametersReflection.Descriptor, global::Tango.PMR.Printing.HeadCleaningParametersReflection.Descriptor, global::Tango.PMR.BTSR.BtsrParametersReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.JobTicket), global::Tango.PMR.Printing.JobTicket.Parser, new[]{ "Guid", "Name", "EnableInterSegment", "InterSegmentLength", "Length", "ProcessParameters", "WindingMethod", "Spool", "Segments", "UploadStrategy", "JobDescriptionFile", "EnableLubrication", "NumberOfUnits", "SampleWinding", "ThreadParameters", "HeadCleaningParameters" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.JobTicket), global::Tango.PMR.Printing.JobTicket.Parser, new[]{ "Guid", "Name", "EnableInterSegment", "InterSegmentLength", "Length", "ProcessParameters", "WindingMethod", "Spool", "Segments", "UploadStrategy", "JobDescriptionFile", "EnableLubrication", "NumberOfUnits", "SampleWinding", "ThreadParameters", "HeadCleaningParameters", "BtsrParameters" }, null, null, null) })); } #endregion @@ -92,6 +94,7 @@ namespace Tango.PMR.Printing { sampleWinding_ = other.sampleWinding_; ThreadParameters = other.threadParameters_ != null ? other.ThreadParameters.Clone() : null; HeadCleaningParameters = other.headCleaningParameters_ != null ? other.HeadCleaningParameters.Clone() : null; + BtsrParameters = other.btsrParameters_ != null ? other.BtsrParameters.Clone() : null; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -277,6 +280,17 @@ namespace Tango.PMR.Printing { } } + /// Field number for the "BtsrParameters" field. + public const int BtsrParametersFieldNumber = 17; + private global::Tango.PMR.BTSR.BtsrParameters btsrParameters_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public global::Tango.PMR.BTSR.BtsrParameters BtsrParameters { + get { return btsrParameters_; } + set { + btsrParameters_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as JobTicket); @@ -306,6 +320,7 @@ namespace Tango.PMR.Printing { if (SampleWinding != other.SampleWinding) return false; if (!object.Equals(ThreadParameters, other.ThreadParameters)) return false; if (!object.Equals(HeadCleaningParameters, other.HeadCleaningParameters)) return false; + if (!object.Equals(BtsrParameters, other.BtsrParameters)) return false; return true; } @@ -328,6 +343,7 @@ namespace Tango.PMR.Printing { if (SampleWinding != false) hash ^= SampleWinding.GetHashCode(); if (threadParameters_ != null) hash ^= ThreadParameters.GetHashCode(); if (headCleaningParameters_ != null) hash ^= HeadCleaningParameters.GetHashCode(); + if (btsrParameters_ != null) hash ^= BtsrParameters.GetHashCode(); return hash; } @@ -399,6 +415,10 @@ namespace Tango.PMR.Printing { output.WriteRawTag(130, 1); output.WriteMessage(HeadCleaningParameters); } + if (btsrParameters_ != null) { + output.WriteRawTag(138, 1); + output.WriteMessage(BtsrParameters); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -450,6 +470,9 @@ namespace Tango.PMR.Printing { if (headCleaningParameters_ != null) { size += 2 + pb::CodedOutputStream.ComputeMessageSize(HeadCleaningParameters); } + if (btsrParameters_ != null) { + size += 2 + pb::CodedOutputStream.ComputeMessageSize(BtsrParameters); + } return size; } @@ -516,6 +539,12 @@ namespace Tango.PMR.Printing { } HeadCleaningParameters.MergeFrom(other.HeadCleaningParameters); } + if (other.btsrParameters_ != null) { + if (btsrParameters_ == null) { + btsrParameters_ = new global::Tango.PMR.BTSR.BtsrParameters(); + } + BtsrParameters.MergeFrom(other.BtsrParameters); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -602,6 +631,13 @@ namespace Tango.PMR.Printing { input.ReadMessage(headCleaningParameters_); break; } + case 138: { + if (btsrParameters_ == null) { + btsrParameters_ = new global::Tango.PMR.BTSR.BtsrParameters(); + } + input.ReadMessage(btsrParameters_); + break; + } } } } diff --git a/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs b/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs index b0c29288f..0a92c27e3 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", - "ItIFChFQcm9jZXNzUGFyYW1ldGVycxITCgtEeWVpbmdTcGVlZBgBIAEoARIU", + "IqcGChFQcm9jZXNzUGFyYW1ldGVycxITCgtEeWVpbmdTcGVlZBgBIAEoARIU", "CgxNaW5JbmtVcHRha2UYAiABKAESFAoMTWF4SW5rVXB0YWtlGAMgASgBEhUK", "DUZlZWRlclRlbnNpb24YBCABKAESFQoNUHVsbGVyVGVuc2lvbhgFIAEoARIV", "Cg1XaW5kZXJUZW5zaW9uGAYgASgBEhEKCU1peGVyVGVtcBgHIAEoARIVCg1I", @@ -39,11 +39,13 @@ namespace Tango.PMR.Printing { "cBgZIAEoARIWCg5IZWFkWm9uZTEyVGVtcBgaIAEoARITCgtSQmxvd2VyRmxv", "dxgbIAEoARITCgtSQmxvd2VyVGVtcBgcIAEoARITCgtMQmxvd2VyRmxvdxgd", "IAEoARITCgtMQmxvd2VyVGVtcBgeIAEoARIXCg9QcmVzc3VyZUJ1aWxkVXAY", - "HyABKAFCHgocY29tLnR3aW5lLnRhbmdvLnBtci5wcmludGluZ2IGcHJvdG8z")); + "HyABKAESGgoSQnRzckZlZWRpbmdUZW5zaW9uGCAgASgBEhcKD0J0c3JFeGl0", + "VGVuc2lvbhghIAEoARIeChZCdHNyVGhyZWFkTGVuZ3RoT2Zmc2V0GCIgASgB", + "Qh4KHGNvbS50d2luZS50YW5nby5wbXIucHJpbnRpbmdiBnByb3RvMw==")); 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" }, 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", "BtsrFeedingTension", "BtsrExitTension", "BtsrThreadLengthOffset" }, null, null, null) })); } #endregion @@ -105,6 +107,9 @@ namespace Tango.PMR.Printing { lBlowerFlow_ = other.lBlowerFlow_; lBlowerTemp_ = other.lBlowerTemp_; pressureBuildUp_ = other.pressureBuildUp_; + btsrFeedingTension_ = other.btsrFeedingTension_; + btsrExitTension_ = other.btsrExitTension_; + btsrThreadLengthOffset_ = other.btsrThreadLengthOffset_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -453,6 +458,39 @@ namespace Tango.PMR.Printing { } } + /// Field number for the "BtsrFeedingTension" field. + public const int BtsrFeedingTensionFieldNumber = 32; + private double btsrFeedingTension_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double BtsrFeedingTension { + get { return btsrFeedingTension_; } + set { + btsrFeedingTension_ = value; + } + } + + /// Field number for the "BtsrExitTension" field. + public const int BtsrExitTensionFieldNumber = 33; + private double btsrExitTension_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double BtsrExitTension { + get { return btsrExitTension_; } + set { + btsrExitTension_ = value; + } + } + + /// Field number for the "BtsrThreadLengthOffset" field. + public const int BtsrThreadLengthOffsetFieldNumber = 34; + private double btsrThreadLengthOffset_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double BtsrThreadLengthOffset { + get { return btsrThreadLengthOffset_; } + set { + btsrThreadLengthOffset_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as ProcessParameters); @@ -497,6 +535,9 @@ namespace Tango.PMR.Printing { if (LBlowerFlow != other.LBlowerFlow) return false; if (LBlowerTemp != other.LBlowerTemp) return false; if (PressureBuildUp != other.PressureBuildUp) return false; + if (BtsrFeedingTension != other.BtsrFeedingTension) return false; + if (BtsrExitTension != other.BtsrExitTension) return false; + if (BtsrThreadLengthOffset != other.BtsrThreadLengthOffset) return false; return true; } @@ -534,6 +575,9 @@ namespace Tango.PMR.Printing { if (LBlowerFlow != 0D) hash ^= LBlowerFlow.GetHashCode(); if (LBlowerTemp != 0D) hash ^= LBlowerTemp.GetHashCode(); if (PressureBuildUp != 0D) hash ^= PressureBuildUp.GetHashCode(); + if (BtsrFeedingTension != 0D) hash ^= BtsrFeedingTension.GetHashCode(); + if (BtsrExitTension != 0D) hash ^= BtsrExitTension.GetHashCode(); + if (BtsrThreadLengthOffset != 0D) hash ^= BtsrThreadLengthOffset.GetHashCode(); return hash; } @@ -668,6 +712,18 @@ namespace Tango.PMR.Printing { output.WriteRawTag(249, 1); output.WriteDouble(PressureBuildUp); } + if (BtsrFeedingTension != 0D) { + output.WriteRawTag(129, 2); + output.WriteDouble(BtsrFeedingTension); + } + if (BtsrExitTension != 0D) { + output.WriteRawTag(137, 2); + output.WriteDouble(BtsrExitTension); + } + if (BtsrThreadLengthOffset != 0D) { + output.WriteRawTag(145, 2); + output.WriteDouble(BtsrThreadLengthOffset); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -766,6 +822,15 @@ namespace Tango.PMR.Printing { if (PressureBuildUp != 0D) { size += 2 + 8; } + if (BtsrFeedingTension != 0D) { + size += 2 + 8; + } + if (BtsrExitTension != 0D) { + size += 2 + 8; + } + if (BtsrThreadLengthOffset != 0D) { + size += 2 + 8; + } return size; } @@ -867,6 +932,15 @@ namespace Tango.PMR.Printing { if (other.PressureBuildUp != 0D) { PressureBuildUp = other.PressureBuildUp; } + if (other.BtsrFeedingTension != 0D) { + BtsrFeedingTension = other.BtsrFeedingTension; + } + if (other.BtsrExitTension != 0D) { + BtsrExitTension = other.BtsrExitTension; + } + if (other.BtsrThreadLengthOffset != 0D) { + BtsrThreadLengthOffset = other.BtsrThreadLengthOffset; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -1001,6 +1075,18 @@ namespace Tango.PMR.Printing { PressureBuildUp = input.ReadDouble(); break; } + case 257: { + BtsrFeedingTension = input.ReadDouble(); + break; + } + case 265: { + BtsrExitTension = input.ReadDouble(); + break; + } + case 273: { + BtsrThreadLengthOffset = input.ReadDouble(); + break; + } } } } diff --git a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs index a86454e26..b2ddc9c7d 100644 --- a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs +++ b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs @@ -59,6 +59,8 @@ namespace Tango.PMRGenerator.CLI GenerateInsightsMonitors(db, pmrFolder); GenerateEventTypes(db, pmrFolder); GenerateInterfaceIOs(db, pmrFolder); + GenerateBtsrApplicationTypes(db, pmrFolder); + GenerateBtsrYarnTypes(db, pmrFolder); } Console.WriteLine("Done"); @@ -793,5 +795,61 @@ namespace Tango.PMRGenerator.CLI return null; } + + private static void GenerateBtsrApplicationTypes(ObservablesContext db, String pmrFolder) + { + Console.WriteLine("Generating BTSR Application Types..."); + + ProtoEnumFile enumFile = new ProtoEnumFile(); + enumFile.Name = "BtsrApplicationType"; + enumFile.Package = "Tango.PMR.BTSR"; + + enumFile.Fields.Add(new EnumerationField() + { + Name = "UNDEFINED_APPLICATION", + Value = 0, + }); + + foreach (var field in db.BtsrApplicationTypes.ToList().OrderBy(x => x.Code)) + { + enumFile.Fields.Add(new EnumerationField() + { + Name = field.Name.Replace(" ", ""), + Value = field.Code, + }); + } + + String enumString = enumFile.GenerateCode(); + + File.WriteAllText(Path.Combine(pmrFolder, "BTSR", enumFile.Name + ".proto"), enumString); + } + + private static void GenerateBtsrYarnTypes(ObservablesContext db, String pmrFolder) + { + Console.WriteLine("Generating BTSR Yarn Types..."); + + ProtoEnumFile enumFile = new ProtoEnumFile(); + enumFile.Name = "BtsrYarnType"; + enumFile.Package = "Tango.PMR.BTSR"; + + enumFile.Fields.Add(new EnumerationField() + { + Name = "UNDEFINED_YARN", + Value = 0, + }); + + foreach (var field in db.BtsrYarnTypes.ToList().OrderBy(x => x.Code)) + { + enumFile.Fields.Add(new EnumerationField() + { + Name = field.Name.Replace(" ", ""), + Value = field.Code, + }); + } + + String enumString = enumFile.GenerateCode(); + + File.WriteAllText(Path.Combine(pmrFolder, "BTSR", enumFile.Name + ".proto"), enumString); + } } } -- cgit v1.3.1