From 2741c56a22d7e957a4164ed665e0ef893c959cbd Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 18 Jun 2020 17:01:26 +0200 Subject: [PATCH 1/3] commented actual visible/enabled for recipe for UI --- Thermo.Active.NC/NcAdapter.cs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Thermo.Active.NC/NcAdapter.cs b/Thermo.Active.NC/NcAdapter.cs index cff15cb2..d05d8525 100644 --- a/Thermo.Active.NC/NcAdapter.cs +++ b/Thermo.Active.NC/NcAdapter.cs @@ -1399,12 +1399,24 @@ namespace Thermo.Active.NC Min = paramPLC.ValMin / item.ScaleFactor, Max = paramPLC.ValMax / item.ScaleFactor }; + + // FIXME TODO impostato a true in debug x testing UI +#if DEBUG + currStatus = new RPStatus() + { + Visible = true, + Enabled = true, + HasError = paramPLC.HasError + }; + +#else currStatus = new RPStatus() { Visible = paramPLC.Visible, Enabled = paramPLC.Enabled, HasError = paramPLC.HasError }; +#endif // calcolo intero oggetto currParam = new DTORecipeParam() { From bbc5d131ad28cff4731492228e8df3efdf4ea9cd Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 18 Jun 2020 17:02:05 +0200 Subject: [PATCH 2/3] New risk data (actual) from Marco Carissoni, new version --- Thermo.Active.Config/Config/risk2007.xml | 1191 +++++----------------- Thermo.Active/Properties/AssemblyInfo.cs | 2 +- 2 files changed, 264 insertions(+), 929 deletions(-) diff --git a/Thermo.Active.Config/Config/risk2007.xml b/Thermo.Active.Config/Config/risk2007.xml index 61a34c58..eb701d6f 100644 --- a/Thermo.Active.Config/Config/risk2007.xml +++ b/Thermo.Active.Config/Config/risk2007.xml @@ -1,933 +1,268 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 2 diff --git a/Thermo.Active/Properties/AssemblyInfo.cs b/Thermo.Active/Properties/AssemblyInfo.cs index 935536ba..fcb83848 100644 --- a/Thermo.Active/Properties/AssemblyInfo.cs +++ b/Thermo.Active/Properties/AssemblyInfo.cs @@ -31,4 +31,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.3")] +[assembly: AssemblyVersion("0.9.4")] From 62b0a6d481c4b6af9b58c27ac349b6f47fbe7f6b Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 18 Jun 2020 17:14:24 +0200 Subject: [PATCH 3/3] forced recipe param error false in debug for UI --- Thermo.Active.NC/NcAdapter.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Thermo.Active.NC/NcAdapter.cs b/Thermo.Active.NC/NcAdapter.cs index d05d8525..93730913 100644 --- a/Thermo.Active.NC/NcAdapter.cs +++ b/Thermo.Active.NC/NcAdapter.cs @@ -1406,7 +1406,7 @@ namespace Thermo.Active.NC { Visible = true, Enabled = true, - HasError = paramPLC.HasError + HasError = false }; #else