diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2020-02-24 17:03:47 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2020-02-24 17:03:47 +0200 |
| commit | 63d5bdc9362c2d28b5ea804dc15aa86a02402530 (patch) | |
| tree | dc347733bb00c1d3b6d61fc3a09f09fe94740deb /Software/Visual_Studio | |
| parent | efde98a69746f41c1055858142b1935955d82fb0 (diff) | |
| download | Tango-63d5bdc9362c2d28b5ea804dc15aa86a02402530.tar.gz Tango-63d5bdc9362c2d28b5ea804dc15aa86a02402530.zip | |
Added new values to process parameters.
Added head type for machine and RML.
Added RML display name, qualification and spools calibration string.
All on DB, BL and PMR.
Diffstat (limited to 'Software/Visual_Studio')
12 files changed, 712 insertions, 82 deletions
diff --git a/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs index fa82ce992..fe8aa35d3 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs @@ -261,5 +261,13 @@ namespace Tango.BL.DTO get; set; } + /// <summary> + /// head type + /// </summary> + public Int32 HeadType + { + get; set; + } + } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs index 155da6cdd..060aa8889 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs @@ -261,5 +261,37 @@ namespace Tango.BL.DTO get; set; } + /// <summary> + /// r blower flow + /// </summary> + public Double RBlowerFlow + { + get; set; + } + + /// <summary> + /// r blower temp + /// </summary> + public Double RBlowerTemp + { + get; set; + } + + /// <summary> + /// l blower flow + /// </summary> + public Double LBlowerFlow + { + get; set; + } + + /// <summary> + /// l blower temp + /// </summary> + public Double LBlowerTemp + { + get; set; + } + } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs index 84f7890ea..0c5c0480d 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs @@ -30,6 +30,14 @@ namespace Tango.BL.DTO } /// <summary> + /// display name + /// </summary> + public String DisplayName + { + get; set; + } + + /// <summary> /// manufacturer /// </summary> public String Manufacturer @@ -229,5 +237,37 @@ namespace Tango.BL.DTO get; set; } + /// <summary> + /// head type + /// </summary> + public Int32 HeadType + { + get; set; + } + + /// <summary> + /// qualification level + /// </summary> + public Int32 QualificationLevel + { + get; set; + } + + /// <summary> + /// qualification date + /// </summary> + public Nullable<DateTime> QualificationDate + { + get; set; + } + + /// <summary> + /// spools calibrations string + /// </summary> + public String SpoolsCalibrationsString + { + get; set; + } + } } diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs index b1fd12a53..56e6ebe24 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs @@ -71,6 +71,8 @@ namespace Tango.BL.Entities public event EventHandler<String> DeviceNameChanged; + public event EventHandler<Int32> HeadTypeChanged; + public event EventHandler<SynchronizedObservableCollection<Cat>> CatsChanged; public event EventHandler<ColorSpace> DefaultColorSpaceChanged; @@ -891,6 +893,33 @@ namespace Tango.BL.Entities } } + protected Int32 _headtype; + + /// <summary> + /// Gets or sets the machinebase head type. + /// </summary> + + [Column("HEAD_TYPE")] + + public Int32 HeadType + { + get + { + return _headtype; + } + + set + { + if (_headtype != value) + { + _headtype = value; + + OnHeadTypeChanged(value); + + } + } + } + protected SynchronizedObservableCollection<Cat> _cats; /// <summary> @@ -1382,6 +1411,15 @@ namespace Tango.BL.Entities } /// <summary> + /// Called when the HeadType has changed. + /// </summary> + protected virtual void OnHeadTypeChanged(Int32 headtype) + { + HeadTypeChanged?.Invoke(this, headtype); + RaisePropertyChanged(nameof(HeadType)); + } + + /// <summary> /// Called when the Cats has changed. /// </summary> protected virtual void OnCatsChanged(SynchronizedObservableCollection<Cat> cats) diff --git a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs index 8682b5b5a..1d70aee98 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs @@ -85,6 +85,14 @@ namespace Tango.BL.Entities public event EventHandler<Double> StSpZone2TempChanged; + public event EventHandler<Double> RBlowerFlowChanged; + + public event EventHandler<Double> RBlowerTempChanged; + + public event EventHandler<Double> LBlowerFlowChanged; + + public event EventHandler<Double> LBlowerTempChanged; + public event EventHandler<ProcessParametersTablesGroup> ProcessParametersTablesGroupChanged; protected String _name; @@ -1008,6 +1016,130 @@ namespace Tango.BL.Entities } } + protected Double _rblowerflow; + + /// <summary> + /// Gets or sets the processparameterstablebase r blower flow. + /// </summary> + + [Column("R_BLOWER_FLOW")] + + [StringFormat("0.0")] + + [PropertyIndex(22)] + + public Double RBlowerFlow + { + get + { + return _rblowerflow; + } + + set + { + if (_rblowerflow != value) + { + _rblowerflow = value; + + OnRBlowerFlowChanged(value); + + } + } + } + + protected Double _rblowertemp; + + /// <summary> + /// Gets or sets the processparameterstablebase r blower temp. + /// </summary> + + [Column("R_BLOWER_TEMP")] + + [StringFormat("0.0")] + + [PropertyIndex(22)] + + public Double RBlowerTemp + { + get + { + return _rblowertemp; + } + + set + { + if (_rblowertemp != value) + { + _rblowertemp = value; + + OnRBlowerTempChanged(value); + + } + } + } + + protected Double _lblowerflow; + + /// <summary> + /// Gets or sets the processparameterstablebase l blower flow. + /// </summary> + + [Column("L_BLOWER_FLOW")] + + [StringFormat("0.0")] + + [PropertyIndex(22)] + + public Double LBlowerFlow + { + get + { + return _lblowerflow; + } + + set + { + if (_lblowerflow != value) + { + _lblowerflow = value; + + OnLBlowerFlowChanged(value); + + } + } + } + + protected Double _lblowertemp; + + /// <summary> + /// Gets or sets the processparameterstablebase l blower temp. + /// </summary> + + [Column("L_BLOWER_TEMP")] + + [StringFormat("0.0")] + + [PropertyIndex(22)] + + public Double LBlowerTemp + { + get + { + return _lblowertemp; + } + + set + { + if (_lblowertemp != value) + { + _lblowertemp = value; + + OnLBlowerTempChanged(value); + + } + } + } + protected ProcessParametersTablesGroup _processparameterstablesgroup; /// <summary> @@ -1302,6 +1434,42 @@ namespace Tango.BL.Entities } /// <summary> + /// Called when the RBlowerFlow has changed. + /// </summary> + protected virtual void OnRBlowerFlowChanged(Double rblowerflow) + { + RBlowerFlowChanged?.Invoke(this, rblowerflow); + RaisePropertyChanged(nameof(RBlowerFlow)); + } + + /// <summary> + /// Called when the RBlowerTemp has changed. + /// </summary> + protected virtual void OnRBlowerTempChanged(Double rblowertemp) + { + RBlowerTempChanged?.Invoke(this, rblowertemp); + RaisePropertyChanged(nameof(RBlowerTemp)); + } + + /// <summary> + /// Called when the LBlowerFlow has changed. + /// </summary> + protected virtual void OnLBlowerFlowChanged(Double lblowerflow) + { + LBlowerFlowChanged?.Invoke(this, lblowerflow); + RaisePropertyChanged(nameof(LBlowerFlow)); + } + + /// <summary> + /// Called when the LBlowerTemp has changed. + /// </summary> + protected virtual void OnLBlowerTempChanged(Double lblowertemp) + { + LBlowerTempChanged?.Invoke(this, lblowertemp); + RaisePropertyChanged(nameof(LBlowerTemp)); + } + + /// <summary> /// Called when the ProcessParametersTablesGroup has changed. /// </summary> protected virtual void OnProcessParametersTablesGroupChanged(ProcessParametersTablesGroup processparameterstablesgroup) diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs index 6901fb973..41ae660ee 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs @@ -29,6 +29,8 @@ namespace Tango.BL.Entities public event EventHandler<String> NameChanged; + public event EventHandler<String> DisplayNameChanged; + public event EventHandler<String> ManufacturerChanged; public event EventHandler<Int32> CodeChanged; @@ -65,6 +67,14 @@ namespace Tango.BL.Entities public event EventHandler<Int32> ColorConversionVersionChanged; + public event EventHandler<Int32> HeadTypeChanged; + + public event EventHandler<Int32> QualificationLevelChanged; + + public event EventHandler<Nullable<DateTime>> QualificationDateChanged; + + public event EventHandler<String> SpoolsCalibrationsStringChanged; + public event EventHandler<SynchronizedObservableCollection<Cat>> CatsChanged; public event EventHandler<Cct> CctChanged; @@ -120,6 +130,33 @@ namespace Tango.BL.Entities } } + protected String _displayname; + + /// <summary> + /// Gets or sets the rmlbase display name. + /// </summary> + + [Column("DISPLAY_NAME")] + + public String DisplayName + { + get + { + return _displayname; + } + + set + { + if (_displayname != value) + { + _displayname = value; + + OnDisplayNameChanged(value); + + } + } + } + protected String _manufacturer; /// <summary> @@ -788,6 +825,114 @@ namespace Tango.BL.Entities } } + protected Int32 _headtype; + + /// <summary> + /// Gets or sets the rmlbase head type. + /// </summary> + + [Column("HEAD_TYPE")] + + public Int32 HeadType + { + get + { + return _headtype; + } + + set + { + if (_headtype != value) + { + _headtype = value; + + OnHeadTypeChanged(value); + + } + } + } + + protected Int32 _qualificationlevel; + + /// <summary> + /// Gets or sets the rmlbase qualification level. + /// </summary> + + [Column("QUALIFICATION_LEVEL")] + + public Int32 QualificationLevel + { + get + { + return _qualificationlevel; + } + + set + { + if (_qualificationlevel != value) + { + _qualificationlevel = value; + + OnQualificationLevelChanged(value); + + } + } + } + + protected Nullable<DateTime> _qualificationdate; + + /// <summary> + /// Gets or sets the rmlbase qualification date. + /// </summary> + + [Column("QUALIFICATION_DATE")] + + public Nullable<DateTime> QualificationDate + { + get + { + return _qualificationdate; + } + + set + { + if (_qualificationdate != value) + { + _qualificationdate = value; + + OnQualificationDateChanged(value); + + } + } + } + + protected String _spoolscalibrationsstring; + + /// <summary> + /// Gets or sets the rmlbase spools calibrations string. + /// </summary> + + [Column("SPOOLS_CALIBRATIONS_STRING")] + + public String SpoolsCalibrationsString + { + get + { + return _spoolscalibrationsstring; + } + + set + { + if (_spoolscalibrationsstring != value) + { + _spoolscalibrationsstring = value; + + OnSpoolsCalibrationsStringChanged(value); + + } + } + } + protected SynchronizedObservableCollection<Cat> _cats; /// <summary> @@ -1197,6 +1342,15 @@ namespace Tango.BL.Entities } /// <summary> + /// Called when the DisplayName has changed. + /// </summary> + protected virtual void OnDisplayNameChanged(String displayname) + { + DisplayNameChanged?.Invoke(this, displayname); + RaisePropertyChanged(nameof(DisplayName)); + } + + /// <summary> /// Called when the Manufacturer has changed. /// </summary> protected virtual void OnManufacturerChanged(String manufacturer) @@ -1359,6 +1513,42 @@ namespace Tango.BL.Entities } /// <summary> + /// Called when the HeadType has changed. + /// </summary> + protected virtual void OnHeadTypeChanged(Int32 headtype) + { + HeadTypeChanged?.Invoke(this, headtype); + RaisePropertyChanged(nameof(HeadType)); + } + + /// <summary> + /// Called when the QualificationLevel has changed. + /// </summary> + protected virtual void OnQualificationLevelChanged(Int32 qualificationlevel) + { + QualificationLevelChanged?.Invoke(this, qualificationlevel); + RaisePropertyChanged(nameof(QualificationLevel)); + } + + /// <summary> + /// Called when the QualificationDate has changed. + /// </summary> + protected virtual void OnQualificationDateChanged(Nullable<DateTime> qualificationdate) + { + QualificationDateChanged?.Invoke(this, qualificationdate); + RaisePropertyChanged(nameof(QualificationDate)); + } + + /// <summary> + /// Called when the SpoolsCalibrationsString has changed. + /// </summary> + protected virtual void OnSpoolsCalibrationsStringChanged(String spoolscalibrationsstring) + { + SpoolsCalibrationsStringChanged?.Invoke(this, spoolscalibrationsstring); + RaisePropertyChanged(nameof(SpoolsCalibrationsString)); + } + + /// <summary> /// Called when the Cats has changed. /// </summary> protected virtual void OnCatsChanged(SynchronizedObservableCollection<Cat> cats) diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs index 0508fc99e..7f4aa62a9 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs @@ -56,6 +56,7 @@ namespace Tango.DAL.Remote.DB public bool IS_DEVICE_REGISTERED { get; set; } public string DEVICE_ID { get; set; } public string DEVICE_NAME { get; set; } + public int HEAD_TYPE { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection<CAT> CATS { 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 773852ba1..bfa6bbe58 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 @@ -47,6 +47,10 @@ namespace Tango.DAL.Remote.DB public double HEAD_ZONE12_TEMP { get; set; } public double ST_SP_ZONE1_TEMP { get; set; } public double ST_SP_ZONE2_TEMP { get; set; } + public double R_BLOWER_FLOW { get; set; } + public double R_BLOWER_TEMP { get; set; } + public double L_BLOWER_FLOW { get; set; } + public double L_BLOWER_TEMP { 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 15c59c062..2c0ac2a33 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs @@ -30,6 +30,7 @@ namespace Tango.DAL.Remote.DB public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } public string NAME { get; set; } + public string DISPLAY_NAME { get; set; } public string MANUFACTURER { get; set; } public int CODE { get; set; } public double WHITE_POINT_L { get; set; } @@ -55,6 +56,10 @@ namespace Tango.DAL.Remote.DB public byte[] THUMBNAIL { get; set; } public string CCT_GUID { get; set; } public int COLOR_CONVERSION_VERSION { get; set; } + public int HEAD_TYPE { get; set; } + public int QUALIFICATION_LEVEL { get; set; } + public Nullable<System.DateTime> QUALIFICATION_DATE { get; set; } + public string SPOOLS_CALIBRATIONS_STRING { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection<CAT> CATS { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx index 6abd8dbb4..bed5ba7eb 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -763,6 +763,7 @@ <Property Name="IS_DEVICE_REGISTERED" Type="bit" Nullable="false" /> <Property Name="DEVICE_ID" Type="nvarchar(max)" /> <Property Name="DEVICE_NAME" Type="nvarchar" MaxLength="200" /> + <Property Name="HEAD_TYPE" Type="int" Nullable="false" /> </EntityType> <EntityType Name="MACHINES_EVENTS"> <Key> @@ -879,6 +880,10 @@ <Property Name="HEAD_ZONE12_TEMP" Type="float" Nullable="false" /> <Property Name="ST_SP_ZONE1_TEMP" Type="float" Nullable="false" /> <Property Name="ST_SP_ZONE2_TEMP" Type="float" Nullable="false" /> + <Property Name="R_BLOWER_FLOW" Type="float" Nullable="false" /> + <Property Name="R_BLOWER_TEMP" Type="float" Nullable="false" /> + <Property Name="L_BLOWER_FLOW" Type="float" Nullable="false" /> + <Property Name="L_BLOWER_TEMP" Type="float" Nullable="false" /> </EntityType> <EntityType Name="PROCESS_PARAMETERS_TABLES_GROUPS"> <Key> @@ -900,6 +905,7 @@ <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" /> <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" /> <Property Name="NAME" Type="nvarchar" MaxLength="50" Nullable="false" /> + <Property Name="DISPLAY_NAME" Type="nvarchar" MaxLength="200" /> <Property Name="MANUFACTURER" Type="nvarchar" MaxLength="50" Nullable="false" /> <Property Name="CODE" Type="int" Nullable="false" /> <Property Name="WHITE_POINT_L" Type="float" Nullable="false" /> @@ -925,6 +931,10 @@ <Property Name="THUMBNAIL" Type="image" /> <Property Name="CCT_GUID" Type="varchar" MaxLength="36" /> <Property Name="COLOR_CONVERSION_VERSION" Type="int" Nullable="false" /> + <Property Name="HEAD_TYPE" Type="int" Nullable="false" /> + <Property Name="QUALIFICATION_LEVEL" Type="int" Nullable="false" /> + <Property Name="QUALIFICATION_DATE" Type="datetime2" Precision="3" /> + <Property Name="SPOOLS_CALIBRATIONS_STRING" Type="nvarchar(max)" /> </EntityType> <EntityType Name="ROLES"> <Key> @@ -4050,6 +4060,7 @@ <Property Name="IS_DEVICE_REGISTERED" Type="Boolean" Nullable="false" /> <Property Name="DEVICE_ID" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" /> <Property Name="DEVICE_NAME" Type="String" MaxLength="200" FixedLength="false" Unicode="true" /> + <Property Name="HEAD_TYPE" Type="Int32" Nullable="false" /> <NavigationProperty Name="CATS" Relationship="RemoteModel.FK_CATS_MACHINES" FromRole="MACHINE" ToRole="CAT" /> <NavigationProperty Name="COLOR_SPACES" Relationship="RemoteModel.FK_MACHINES_COLOR_SPACES" FromRole="MACHINE" ToRole="COLOR_SPACES" /> <NavigationProperty Name="CONFIGURATION" Relationship="RemoteModel.FK_MACHINES_CONFIGURATIONS" FromRole="MACHINE" ToRole="CONFIGURATION" /> @@ -4190,6 +4201,10 @@ <Property Name="HEAD_ZONE12_TEMP" Type="Double" Nullable="false" /> <Property Name="ST_SP_ZONE1_TEMP" Type="Double" Nullable="false" /> <Property Name="ST_SP_ZONE2_TEMP" Type="Double" Nullable="false" /> + <Property Name="R_BLOWER_FLOW" Type="Double" Nullable="false" /> + <Property Name="R_BLOWER_TEMP" Type="Double" Nullable="false" /> + <Property Name="L_BLOWER_FLOW" Type="Double" Nullable="false" /> + <Property Name="L_BLOWER_TEMP" Type="Double" Nullable="false" /> <NavigationProperty Name="PROCESS_PARAMETERS_TABLES_GROUPS" Relationship="RemoteModel.FK_PROCESS_PARAMETERS_TABLES_PROCESS_PARAMETERS_TABLES_GROUPS" FromRole="PROCESS_PARAMETERS_TABLES" ToRole="PROCESS_PARAMETERS_TABLES_GROUPS" /> </EntityType> <EntityType Name="PROCESS_PARAMETERS_TABLES_GROUPS"> @@ -4214,6 +4229,7 @@ <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" /> + <Property Name="DISPLAY_NAME" Type="String" MaxLength="200" FixedLength="false" Unicode="true" /> <Property Name="MANUFACTURER" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" /> <Property Name="CODE" Type="Int32" Nullable="false" /> <Property Name="WHITE_POINT_L" Type="Double" Nullable="false" /> @@ -4239,6 +4255,10 @@ <Property Name="THUMBNAIL" Type="Binary" MaxLength="Max" FixedLength="false" /> <Property Name="CCT_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" /> <Property Name="COLOR_CONVERSION_VERSION" Type="Int32" Nullable="false" /> + <Property Name="HEAD_TYPE" Type="Int32" Nullable="false" /> + <Property Name="QUALIFICATION_LEVEL" Type="Int32" Nullable="false" /> + <Property Name="QUALIFICATION_DATE" Type="DateTime" Precision="3" /> + <Property Name="SPOOLS_CALIBRATIONS_STRING" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" /> <NavigationProperty Name="CATS" Relationship="RemoteModel.FK_CATS_RMLS" FromRole="RML" ToRole="CAT" /> <NavigationProperty Name="CCT" Relationship="RemoteModel.FK_RMLS_CCTS" FromRole="RML" ToRole="CCT" /> <NavigationProperty Name="COLOR_CATALOGS_ITEMS_RECIPES" Relationship="RemoteModel.FK_COLOR_CATALOGS_ITEMS_RECIPES_RMLS" FromRole="RML" ToRole="COLOR_CATALOGS_ITEMS_RECIPES" /> @@ -6459,6 +6479,7 @@ <EntitySetMapping Name="MACHINES"> <EntityTypeMapping TypeName="RemoteModel.MACHINE"> <MappingFragment StoreEntitySet="MACHINES"> + <ScalarProperty Name="HEAD_TYPE" ColumnName="HEAD_TYPE" /> <ScalarProperty Name="DEVICE_NAME" ColumnName="DEVICE_NAME" /> <ScalarProperty Name="DEVICE_ID" ColumnName="DEVICE_ID" /> <ScalarProperty Name="IS_DEVICE_REGISTERED" ColumnName="IS_DEVICE_REGISTERED" /> @@ -6583,6 +6604,10 @@ <EntitySetMapping Name="PROCESS_PARAMETERS_TABLES"> <EntityTypeMapping TypeName="RemoteModel.PROCESS_PARAMETERS_TABLES"> <MappingFragment StoreEntitySet="PROCESS_PARAMETERS_TABLES"> + <ScalarProperty Name="L_BLOWER_TEMP" ColumnName="L_BLOWER_TEMP" /> + <ScalarProperty Name="L_BLOWER_FLOW" ColumnName="L_BLOWER_FLOW" /> + <ScalarProperty Name="R_BLOWER_TEMP" ColumnName="R_BLOWER_TEMP" /> + <ScalarProperty Name="R_BLOWER_FLOW" ColumnName="R_BLOWER_FLOW" /> <ScalarProperty Name="ST_SP_ZONE2_TEMP" ColumnName="ST_SP_ZONE2_TEMP" /> <ScalarProperty Name="ST_SP_ZONE1_TEMP" ColumnName="ST_SP_ZONE1_TEMP" /> <ScalarProperty Name="HEAD_ZONE12_TEMP" ColumnName="HEAD_ZONE12_TEMP" /> @@ -6635,6 +6660,10 @@ <EntitySetMapping Name="RMLS"> <EntityTypeMapping TypeName="RemoteModel.RML"> <MappingFragment StoreEntitySet="RMLS"> + <ScalarProperty Name="SPOOLS_CALIBRATIONS_STRING" ColumnName="SPOOLS_CALIBRATIONS_STRING" /> + <ScalarProperty Name="QUALIFICATION_DATE" ColumnName="QUALIFICATION_DATE" /> + <ScalarProperty Name="QUALIFICATION_LEVEL" ColumnName="QUALIFICATION_LEVEL" /> + <ScalarProperty Name="HEAD_TYPE" ColumnName="HEAD_TYPE" /> <ScalarProperty Name="COLOR_CONVERSION_VERSION" ColumnName="COLOR_CONVERSION_VERSION" /> <ScalarProperty Name="CCT_GUID" ColumnName="CCT_GUID" /> <ScalarProperty Name="THUMBNAIL" ColumnName="THUMBNAIL" /> @@ -6660,6 +6689,7 @@ <ScalarProperty Name="WHITE_POINT_L" ColumnName="WHITE_POINT_L" /> <ScalarProperty Name="CODE" ColumnName="CODE" /> <ScalarProperty Name="MANUFACTURER" ColumnName="MANUFACTURER" /> + <ScalarProperty Name="DISPLAY_NAME" ColumnName="DISPLAY_NAME" /> <ScalarProperty Name="NAME" ColumnName="NAME" /> <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> <ScalarProperty Name="GUID" ColumnName="GUID" /> 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 0afb45835..b7e5e116a 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -5,84 +5,84 @@ <!-- Diagram content (shape and connector positions) --> <edmx:Diagrams> <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1"> - <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="13.5" PointY="12.375" /> - <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="3.75" PointY="70" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="3.75" PointY="46.375" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="3.75" PointY="39.125" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="3.75" PointY="49.25" /> - <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="20.875" /> - <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="6" PointY="12.75" /> - <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="19.75" /> - <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="33.5" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="4.625" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="0.75" PointY="11.125" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="3" PointY="9.875" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="23.75" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="6" PointY="16" /> - <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="6" PointY="44.625" /> - <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="3.75" PointY="66.125" /> - <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="27.625" /> - <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="3.75" PointY="4.375" /> - <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="6" PointY="3.875" /> - <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="3.75" PointY="52.125" /> - <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="11.25" PointY="32.125" /> - <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="19.75" /> - <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="16.75" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="11.75" PointY="52.625" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="14" PointY="36.25" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="3.75" PointY="35.625" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="6" PointY="40.375" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="3.75" PointY="55.625" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="6" PointY="49.625" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="6.75" PointY="72.5" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="9" PointY="39.375" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="9.75" PointY="56.625" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="12" PointY="40.75" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="6.75" PointY="79.625" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="9" PointY="49.375" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="3.75" PointY="42" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="9.75" PointY="60.625" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="12" PointY="48.375" /> - <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="6" PointY="76.125" /> - <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="8.25" PointY="34.125" /> - <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="8.75" PointY="1.625" /> - <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="20.375" /> - <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="27.625" /> - <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="15.75" /> - <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="24" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="13.5" PointY="8.75" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="6" PointY="35.875" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="8.25" PointY="13.75" /> - <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="13.5" PointY="16.625" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="30.5" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="36.75" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="24.25" /> - <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="6" PointY="8.75" /> - <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="6" PointY="68" /> - <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="14.25" PointY="0.75" /> - <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="57" /> - <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="59.375" /> - <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="20.75" /> - <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="14.25" PointY="4.625" /> - <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="16.5" PointY="4.75" /> - <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="24" /> - <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="31" /> - <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="8.25" PointY="10" /> - <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="28.125" /> - <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="6" PointY="31.75" /> - <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="10.5" PointY="15.75" /> - <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="0.75" PointY="1.625" /> - <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="10.75" PointY="1.625" /> - <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="18.5" PointY="22.25" /> - <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="15.75" PointY="14.625" /> - <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="16.75" PointY="1.625" /> - <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="17.75" PointY="14.625" /> - <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="17.75" PointY="17.625" /> - <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="18.75" PointY="1.625" /> - <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="18.75" PointY="6.625" /> - <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="11.25" PointY="9.5" /> - <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="16.5" PointY="10.75" /> - <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="30.75" /> + <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="13.5" PointY="67.625" /> + <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="6.75" PointY="10.875" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="6.75" PointY="48" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="37.875" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="6.75" PointY="34.875" /> + <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="18" PointY="20.5" /> + <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="12" PointY="53.125" /> + <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="23.375" /> + <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="36" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="5.25" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="0.75" PointY="11.75" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="3" PointY="10.5" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="19.375" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="27.875" /> + <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="9" PointY="40.5" /> + <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="6.75" PointY="15" /> + <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="11.25" PointY="30.5" /> + <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="9.75" PointY="8.375" /> + <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="12" PointY="7.75" /> + <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="45" /> + <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="14.25" PointY="15" /> + <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="27.25" /> + <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="33.125" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="11.75" PointY="49.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="14" PointY="37" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="9.75" PointY="53.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="12" PointY="41" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="12.75" PointY="60.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="15" PointY="41.25" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="15.75" PointY="47.25" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="18" PointY="38" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="6.75" PointY="51.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="9" PointY="45.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="9.75" PointY="57.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="12" PointY="45" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="40.75" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="6.75" PointY="31.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="9" PointY="36.125" /> + <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="12" PointY="56.125" /> + <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="14.25" PointY="31" /> + <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="8.75" PointY="0.75" /> + <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="13.5" PointY="20" /> + <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="23.875" /> + <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="5.875" /> + <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="23.625" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="13.5" PointY="64.125" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="9" PointY="31.625" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="11.25" PointY="20.25" /> + <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="16.5" PointY="16.25" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="16.375" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="30.125" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="19.375" /> + <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="12" PointY="13" /> + <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="9" PointY="12.75" /> + <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="14.25" PointY="54.875" /> + <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="56.5" /> + <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="59.25" /> + <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="19.875" /> + <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="14.25" PointY="50.875" /> + <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="16.5" PointY="50.875" /> + <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="15.75" PointY="23.625" /> + <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="31.625" /> + <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="14.25" PointY="11.625" /> + <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="27.75" /> + <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="17.875" /> + <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="16.5" PointY="30.375" /> + <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="0.75" PointY="0.75" /> + <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="2.75" PointY="0.75" /> + <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="19.5" PointY="33.375" /> + <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="4.75" PointY="0.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="10.75" PointY="0.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="10.75" PointY="3.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="12.75" PointY="0.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="14.75" PointY="0.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="14.75" PointY="5.75" /> + <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="11.25" PointY="33.625" /> + <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="16.5" PointY="34.875" /> + <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="11.25" PointY="16.5" /> <AssociationConnector Association="RemoteModel.FK_ACTION_LOGS_USERS" /> <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" /> <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" /> diff --git a/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs b/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs index ff18a73ae..33521d40b 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", - "IpMFChFQcm9jZXNzUGFyYW1ldGVycxITCgtEeWVpbmdTcGVlZBgBIAEoARIU", + "IucFChFQcm9jZXNzUGFyYW1ldGVycxITCgtEeWVpbmdTcGVlZBgBIAEoARIU", "CgxNaW5JbmtVcHRha2UYAiABKAESFAoMTWF4SW5rVXB0YWtlGAMgASgBEhUK", "DUZlZWRlclRlbnNpb24YBCABKAESFQoNUHVsbGVyVGVuc2lvbhgFIAEoARIV", "Cg1XaW5kZXJUZW5zaW9uGAYgASgBEhEKCU1peGVyVGVtcBgHIAEoARIVCg1I", @@ -37,12 +37,14 @@ namespace Tango.PMR.Printing { "ASgBEhUKDUhlYWRab25lOFRlbXAYFiABKAESFQoNSGVhZFpvbmU5VGVtcBgX", "IAEoARIWCg5IZWFkWm9uZTEwVGVtcBgYIAEoARIWCg5IZWFkWm9uZTExVGVt", "cBgZIAEoARIWCg5IZWFkWm9uZTEyVGVtcBgaIAEoARIVCg1TdFNwWm9uZTFU", - "ZW1wGBsgASgBEhUKDVN0U3Bab25lMlRlbXAYHCABKAFCHgocY29tLnR3aW5l", - "LnRhbmdvLnBtci5wcmludGluZ2IGcHJvdG8z")); + "ZW1wGBsgASgBEhUKDVN0U3Bab25lMlRlbXAYHCABKAESEwoLUkJsb3dlckZs", + "b3cYHSABKAESEwoLUkJsb3dlclRlbXAYHiABKAESEwoLTEJsb3dlckZsb3cY", + "HyABKAESEwoLTEJsb3dlclRlbXAYICABKAFCHgocY29tLnR3aW5lLnRhbmdv", + "LnBtci5wcmludGluZ2IGcHJvdG8z")); 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", "StSpZone1Temp", "StSpZone2Temp" }, 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", "StSpZone1Temp", "StSpZone2Temp", "RBlowerFlow", "RBlowerTemp", "LBlowerFlow", "LBlowerTemp" }, null, null, null) })); } #endregion @@ -101,6 +103,10 @@ namespace Tango.PMR.Printing { headZone12Temp_ = other.headZone12Temp_; stSpZone1Temp_ = other.stSpZone1Temp_; stSpZone2Temp_ = other.stSpZone2Temp_; + rBlowerFlow_ = other.rBlowerFlow_; + rBlowerTemp_ = other.rBlowerTemp_; + lBlowerFlow_ = other.lBlowerFlow_; + lBlowerTemp_ = other.lBlowerTemp_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -416,6 +422,50 @@ namespace Tango.PMR.Printing { } } + /// <summary>Field number for the "RBlowerFlow" field.</summary> + public const int RBlowerFlowFieldNumber = 29; + private double rBlowerFlow_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double RBlowerFlow { + get { return rBlowerFlow_; } + set { + rBlowerFlow_ = value; + } + } + + /// <summary>Field number for the "RBlowerTemp" field.</summary> + public const int RBlowerTempFieldNumber = 30; + private double rBlowerTemp_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double RBlowerTemp { + get { return rBlowerTemp_; } + set { + rBlowerTemp_ = value; + } + } + + /// <summary>Field number for the "LBlowerFlow" field.</summary> + public const int LBlowerFlowFieldNumber = 31; + private double lBlowerFlow_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double LBlowerFlow { + get { return lBlowerFlow_; } + set { + lBlowerFlow_ = value; + } + } + + /// <summary>Field number for the "LBlowerTemp" field.</summary> + public const int LBlowerTempFieldNumber = 32; + private double lBlowerTemp_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double LBlowerTemp { + get { return lBlowerTemp_; } + set { + lBlowerTemp_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as ProcessParameters); @@ -457,6 +507,10 @@ namespace Tango.PMR.Printing { if (HeadZone12Temp != other.HeadZone12Temp) return false; if (StSpZone1Temp != other.StSpZone1Temp) return false; if (StSpZone2Temp != other.StSpZone2Temp) return false; + if (RBlowerFlow != other.RBlowerFlow) return false; + if (RBlowerTemp != other.RBlowerTemp) return false; + if (LBlowerFlow != other.LBlowerFlow) return false; + if (LBlowerTemp != other.LBlowerTemp) return false; return true; } @@ -491,6 +545,10 @@ namespace Tango.PMR.Printing { if (HeadZone12Temp != 0D) hash ^= HeadZone12Temp.GetHashCode(); if (StSpZone1Temp != 0D) hash ^= StSpZone1Temp.GetHashCode(); if (StSpZone2Temp != 0D) hash ^= StSpZone2Temp.GetHashCode(); + if (RBlowerFlow != 0D) hash ^= RBlowerFlow.GetHashCode(); + if (RBlowerTemp != 0D) hash ^= RBlowerTemp.GetHashCode(); + if (LBlowerFlow != 0D) hash ^= LBlowerFlow.GetHashCode(); + if (LBlowerTemp != 0D) hash ^= LBlowerTemp.GetHashCode(); return hash; } @@ -613,6 +671,22 @@ namespace Tango.PMR.Printing { output.WriteRawTag(225, 1); output.WriteDouble(StSpZone2Temp); } + if (RBlowerFlow != 0D) { + output.WriteRawTag(233, 1); + output.WriteDouble(RBlowerFlow); + } + if (RBlowerTemp != 0D) { + output.WriteRawTag(241, 1); + output.WriteDouble(RBlowerTemp); + } + if (LBlowerFlow != 0D) { + output.WriteRawTag(249, 1); + output.WriteDouble(LBlowerFlow); + } + if (LBlowerTemp != 0D) { + output.WriteRawTag(129, 2); + output.WriteDouble(LBlowerTemp); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -702,6 +776,18 @@ namespace Tango.PMR.Printing { if (StSpZone2Temp != 0D) { size += 2 + 8; } + if (RBlowerFlow != 0D) { + size += 2 + 8; + } + if (RBlowerTemp != 0D) { + size += 2 + 8; + } + if (LBlowerFlow != 0D) { + size += 2 + 8; + } + if (LBlowerTemp != 0D) { + size += 2 + 8; + } return size; } @@ -794,6 +880,18 @@ namespace Tango.PMR.Printing { if (other.StSpZone2Temp != 0D) { StSpZone2Temp = other.StSpZone2Temp; } + if (other.RBlowerFlow != 0D) { + RBlowerFlow = other.RBlowerFlow; + } + if (other.RBlowerTemp != 0D) { + RBlowerTemp = other.RBlowerTemp; + } + if (other.LBlowerFlow != 0D) { + LBlowerFlow = other.LBlowerFlow; + } + if (other.LBlowerTemp != 0D) { + LBlowerTemp = other.LBlowerTemp; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -916,6 +1014,22 @@ namespace Tango.PMR.Printing { StSpZone2Temp = input.ReadDouble(); break; } + case 233: { + RBlowerFlow = input.ReadDouble(); + break; + } + case 241: { + RBlowerTemp = input.ReadDouble(); + break; + } + case 249: { + LBlowerFlow = input.ReadDouble(); + break; + } + case 257: { + LBlowerTemp = input.ReadDouble(); + break; + } } } } |
