Merge branch 'develop' into feature/add/ProdInfo

This commit is contained in:
Samuele Locatelli
2020-06-18 17:14:37 +02:00
3 changed files with 276 additions and 929 deletions
File diff suppressed because it is too large Load Diff
+12
View File
@@ -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 = false
};
#else
currStatus = new RPStatus()
{
Visible = paramPLC.Visible,
Enabled = paramPLC.Enabled,
HasError = paramPLC.HasError
};
#endif
// calcolo intero oggetto
currParam = new DTORecipeParam()
{
+1 -1
View File
@@ -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")]