From d2e728abf57c60328a5bc1f484641cfaadaf6092 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 21 Jul 2020 17:32:17 +0200 Subject: [PATCH 1/4] Modifica XML/XSD per gesiotne NUOVA info softkeys --- Thermo.Active.Config/Config/userSoftKeyConfig.xml | 4 ++++ .../Config/userSoftKeyConfigValidator.xsd | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/Thermo.Active.Config/Config/userSoftKeyConfig.xml b/Thermo.Active.Config/Config/userSoftKeyConfig.xml index 40f439ec..95899983 100644 --- a/Thermo.Active.Config/Config/userSoftKeyConfig.xml +++ b/Thermo.Active.Config/Config/userSoftKeyConfig.xml @@ -24,6 +24,10 @@ true true + + general_sizes_sheet_dim_x + + diff --git a/Thermo.Active.Config/Config/userSoftKeyConfigValidator.xsd b/Thermo.Active.Config/Config/userSoftKeyConfigValidator.xsd index 5f4dd886..a2f5d180 100644 --- a/Thermo.Active.Config/Config/userSoftKeyConfigValidator.xsd +++ b/Thermo.Active.Config/Config/userSoftKeyConfigValidator.xsd @@ -24,6 +24,14 @@ + + + + + + + + @@ -31,6 +39,7 @@ + @@ -66,6 +75,7 @@ + @@ -86,6 +96,7 @@ + From 0f23124a1794dbb5e0711f9a8fb9474a3f49866f Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 21 Jul 2020 17:32:28 +0200 Subject: [PATCH 2/4] traduzione nuova label --- Thermo.Active/Dict/Labels_italian.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Thermo.Active/Dict/Labels_italian.txt b/Thermo.Active/Dict/Labels_italian.txt index 599345a0..942c5251 100644 --- a/Thermo.Active/Dict/Labels_italian.txt +++ b/Thermo.Active/Dict/Labels_italian.txt @@ -45,6 +45,7 @@ general_sizes_mould_min_height,Altezza minima stampo general_sizes_mould_base_height,Altezza base stampo general_sizes_sheet_material,Materiale general_sizes_sheet_dim_x,Larghezza lastra +general_sizes_sheet_dim_x_button,Muovi general_sizes_sheet_dim_y,Profondità lastra general_sizes_sheet_thickness,Spessore lastra general_sizes_plate_type,Piastrafinestra From fa9a477a885b51ee7152297eb8afdd6e2e2ff568 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 21 Jul 2020 17:46:03 +0200 Subject: [PATCH 3/4] Fix decoding of softkey new data --- Thermo.Active.Config/ServerConfigController.cs | 4 +++- .../ConfigModels/UserSoftKeyConfigModel.cs | 2 ++ Thermo.Active.Model/DTOModels/DTOUserSoftKeyModel.cs | 7 +++++++ Thermo.Active.NC/NcAdapter.cs | 8 ++++++++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Thermo.Active.Config/ServerConfigController.cs b/Thermo.Active.Config/ServerConfigController.cs index 46f00ac0..fbce0ebe 100644 --- a/Thermo.Active.Config/ServerConfigController.cs +++ b/Thermo.Active.Config/ServerConfigController.cs @@ -518,6 +518,8 @@ namespace Thermo.Active.Config IsActive = Convert.ToBoolean(x.Element("active").Value), IsVisible = Convert.ToBoolean(x.Element("visible").Value), IsStarred = x.Element("starred") != null ? Convert.ToBoolean(x.Element("starred").Value) : false, + RefCallParam = x.Element("refCallParam") != null ? x.Element("refCallParam").Value : "", + RefCallLabel = x.Element("refCallLabel") != null ? x.Element("refCallLabel").Value : "", Category = Convert.ToInt32(x.Element("category").Value), LocalizedNames = x.Element("localizedNames").Elements().ToDictionary( // Read localized names and convert into a dictionary y => y.Attribute("langKey").Value, y => y.Value @@ -760,7 +762,7 @@ namespace Thermo.Active.Config SetpointThermo = 0, MaxPower = riferimento.Potenza, NumResist = 1, - CalcIchMin = riferimento.Modello.Contains("Quarzo") || riferimento.Modello.Contains("Alogena") + CalcIchMin = riferimento.Modello.Contains("Quarzo") || riferimento.Modello.Contains("Alogena") }); } else diff --git a/Thermo.Active.Model/ConfigModels/UserSoftKeyConfigModel.cs b/Thermo.Active.Model/ConfigModels/UserSoftKeyConfigModel.cs index bf84c04b..a3cc51ed 100644 --- a/Thermo.Active.Model/ConfigModels/UserSoftKeyConfigModel.cs +++ b/Thermo.Active.Model/ConfigModels/UserSoftKeyConfigModel.cs @@ -11,6 +11,8 @@ namespace Thermo.Active.Model.ConfigModels public bool IsActive { get; set; } public bool IsVisible { get; set; } public bool IsStarred { get; set; } = false; + public string RefCallParam { get; set; } = ""; + public string RefCallLabel { get; set; } = ""; public bool OperatorConfirmationNeeded { get; set; } public List SubKeys { get; set; } public int PlcId { get; set; } diff --git a/Thermo.Active.Model/DTOModels/DTOUserSoftKeyModel.cs b/Thermo.Active.Model/DTOModels/DTOUserSoftKeyModel.cs index 3348e440..7bbcfc07 100644 --- a/Thermo.Active.Model/DTOModels/DTOUserSoftKeyModel.cs +++ b/Thermo.Active.Model/DTOModels/DTOUserSoftKeyModel.cs @@ -20,6 +20,8 @@ namespace Thermo.Active.Model.DTOModels public bool Visible { get; set; } public bool Starred { get; set; } = false; public bool Value { get; set; } + public string RefCallParam { get; set; } = ""; + public string RefCallLabel { get; set; } = ""; public override bool Equals(object obj) { @@ -34,6 +36,10 @@ namespace Thermo.Active.Model.DTOModels return false; if (Value != item.Value) return false; + if (RefCallParam != item.RefCallParam) + return false; + if (RefCallLabel != item.RefCallLabel) + return false; return true; } @@ -43,4 +49,5 @@ namespace Thermo.Active.Model.DTOModels return base.GetHashCode(); } } + } diff --git a/Thermo.Active.NC/NcAdapter.cs b/Thermo.Active.NC/NcAdapter.cs index 04237fa0..30ced3fe 100644 --- a/Thermo.Active.NC/NcAdapter.cs +++ b/Thermo.Active.NC/NcAdapter.cs @@ -1011,6 +1011,8 @@ namespace Thermo.Active.NC Id = subkey.Id, Active = plcSoftKey.Active, Starred = softKey.IsStarred, + RefCallParam = softKey.RefCallParam, + RefCallLabel = softKey.RefCallLabel, Category = softKey.Category, Value = plcSoftKey.Value }); @@ -1032,6 +1034,8 @@ namespace Thermo.Active.NC Id = softKey.Id, Active = plcSoftKey.Active, Starred = softKey.IsStarred, + RefCallParam = softKey.RefCallParam, + RefCallLabel = softKey.RefCallLabel, Category = softKey.Category, Visible = softKey.IsVisible, Value = plcSoftKey.Value @@ -1071,6 +1075,8 @@ namespace Thermo.Active.NC Id = subkey.Id, Active = plcSoftKey.Active, Starred = softKey.IsStarred, + RefCallParam = softKey.RefCallParam, + RefCallLabel = softKey.RefCallLabel, Category = softKey.Category, Value = plcSoftKey.Value }); @@ -1098,6 +1104,8 @@ namespace Thermo.Active.NC Id = softKey.Id, Active = plcSoftKey.Active, Starred = softKey.IsStarred, + RefCallParam = softKey.RefCallParam, + RefCallLabel = softKey.RefCallLabel, Category = softKey.Category, Visible = softKey.IsVisible, Value = plcSoftKey.Value From 35d0e05908a63fe3d05eed44bc7270c52c0555de Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 22 Jul 2020 09:01:56 +0200 Subject: [PATCH 4/4] start new release cycle --- Thermo.Active/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Thermo.Active/Properties/AssemblyInfo.cs b/Thermo.Active/Properties/AssemblyInfo.cs index 20b5d28a..c5f59279 100644 --- a/Thermo.Active/Properties/AssemblyInfo.cs +++ b/Thermo.Active/Properties/AssemblyInfo.cs @@ -30,4 +30,4 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("0.9.47")] \ No newline at end of file +[assembly: AssemblyVersion("0.9.48")] \ No newline at end of file