michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ErrorFlags and FlyingStartMassCollProlong : English units supported.

Browse Source
This commit is contained in:
Milan Hanajik 2022-06-01 13:47:13 +02:00
parent e12a3eecba
commit 38b8184dfb
2 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
TBF/Rig/TestMethods/FlyingStartMassCollProlonged/Single/TestParams.cs
View File

@ -1,5 +1,5 @@
///
/// Copyright (c) 2018 Sensus Slovensko a.s.
/// Copyright (c) 2018-2022 Sensus Slovensko a.s.
///
using System;
using System.IO;
@ -8,6 +8,7 @@ using System.Xml.Serialization;
using Common;
using Config.Entities;
using TBF.Rig.Generic;
using TBF.Rig.Sequences;
using TBF.Resources;
namespace TBF.Rig.TestMethods.FlyingStartMassCollProlonged.Single
@ -27,7 +28,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollProlonged.Single
string[] paramNames = new string[]
{
string.Format("{0} [l]", Strings.Volume_to_tank),
string.Format("{0} [{1}]", Strings.Volume_to_tank, ProcessData.VolumeUnit.ToDescription()),
};
public override string ParamName(int i) { return paramNames[i]; }
public override int ParamsCount() { return paramNames.Length; }
@ -36,17 +37,20 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollProlonged.Single
{
switch (i)
{
case 0: return VolumeToTank.ToString();
case 0: return Units.ConvertTo(ProcessData.VolumeUnit, VolumeToTank).ToString();
default: return string.Empty;
}
}
public CfgUpdateFlags UpdateParam(int i, string strValue)
public CfgUpdateFlags UpdateParam(int i, string str)
{
switch (i)
{
case 0: VolumeToTank = Utils.ParseUFloat(strValue); return CfgUpdateFlags.None;
default: return CfgUpdateFlags.None;
case 0:
VolumeToTank = Units.ConvertFrom(ProcessData.VolumeUnit, Utils.ParseUFloat(str));
return CfgUpdateFlags.None;
default:
return CfgUpdateFlags.None;
}
}
@ -58,7 +62,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollProlonged.Single
switch (i)
{
case 0:
if (Utils.TryParseUFloat(strValue, out volumeToTank) && volumeToTank >= 0.1f) return true;
if (Utils.TryParseUFloat(strValue, out volumeToTank) && volumeToTank > float.Epsilon) return true;
break;
default:
message = "Invalid index";

39
TBF/Rig/Various/ErrorFlags/TestParams.cs
View File

@ -1,11 +1,12 @@
///
/// Copyright (c) 2017-2020 Sensus Slovensko a.s.
/// Copyright (c) 2017-2022 Sensus Slovensko a.s.
///
using System.IO;
using System.Xml.Serialization;
using Common;
using Config.Entities;
using TBF.Rig.Generic;
using TBF.Rig.Sequences;
using TBF.Resources;
namespace TBF.Rig.Various.ErrorFlags
@ -149,14 +150,14 @@ namespace TBF.Rig.Various.ErrorFlags
"E36",
"Delta Q [%]",
"Delta T [°C]",
"max. Abs(Tup - Tdn) [°C]",
string.Format("Delta T [{0}]", ProcessData.TempUnit.ToDescription()),
string.Format("max. Abs(Tup - Tdn) [{0}]", ProcessData.TempUnit.ToDescription()),
string.Format("min. {0}", Strings.Test_time_s_chdr),
string.Format("max. {0}", Strings.Test_time_s_chdr),
string.Format("min. {0} [°C]", Strings.Air_temperature),
string.Format("max. {0} [°C]", Strings.Air_temperature),
string.Format("min. {0} [bar]", Strings.Pressure),
string.Format("max. {0} [bar]", Strings.Pressure),
string.Format("min. {0} [{1}]", Strings.Air_temperature, ProcessData.TempUnit.ToDescription()),
string.Format("max. {0} [{1}]", Strings.Air_temperature, ProcessData.TempUnit.ToDescription()),
string.Format("min. {0} [{1}]", Strings.Pressure, ProcessData.PressUnit.ToDescription()),
string.Format("max. {0} [{1}]", Strings.Pressure, ProcessData.PressUnit.ToDescription()),
"min. conductivity [uS/cm]",
"max. conductivity [uS/cm]",
@ -200,14 +201,14 @@ namespace TBF.Rig.Various.ErrorFlags
case 17: return ((ErrorFlagsMode)E36).ToDescription();
case 18: return Delta_Q_pct.ToString();
case 19: return Delta_T.ToString();
case 20: return Delta_Tup_Tdn.ToString();
case 19: return Units.ConvertTo(ProcessData.TempUnit, Delta_T).ToString();
case 20: return Units.ConvertTo(ProcessData.TempUnit, Delta_Tup_Tdn).ToString();
case 21: return TestTime_min.ToString();
case 22: return TestTime_max.ToString();
case 23: return AmbTemp_min.ToString();
case 24: return AmbTemp_max.ToString();
case 25: return Pressure_min.ToString();
case 26: return Pressure_max.ToString();
case 23: return Units.ConvertTo(ProcessData.TempUnit, AmbTemp_min).ToString();
case 24: return Units.ConvertTo(ProcessData.TempUnit, AmbTemp_max).ToString();
case 25: return Units.ConvertTo(ProcessData.PressUnit, Pressure_min).ToString();
case 26: return Units.ConvertTo(ProcessData.PressUnit, Pressure_max).ToString();
case 27: return Conductivity_min.ToString();
case 28: return Conductivity_max.ToString();
case 29: return Coef_E9.ToString();
@ -251,14 +252,14 @@ namespace TBF.Rig.Various.ErrorFlags
case 17: for (ErrorFlagsMode m = 0; m < ErrorFlagsMode.Count; m++) if (m.ToDescription() == sVal) { E36 = (sbyte)m; break; }; break;
case 18: Delta_Q_pct = Utils.ParseUDouble(sVal); return CfgUpdateFlags.None;
case 19: Delta_T = Utils.ParseUDouble(sVal); return CfgUpdateFlags.None;
case 20: Delta_Tup_Tdn = Utils.ParseUDouble(sVal); return CfgUpdateFlags.None;
case 19: Delta_T = Units.ConvertFrom(ProcessData.TempUnit, Utils.ParseUDouble(sVal)); return CfgUpdateFlags.None;
case 20: Delta_Tup_Tdn = Units.ConvertFrom(ProcessData.TempUnit, Utils.ParseUDouble(sVal)); return CfgUpdateFlags.None;
case 21: TestTime_min = Utils.ParseUDouble(sVal); return CfgUpdateFlags.None;
case 22: TestTime_max = Utils.ParseUDouble(sVal); return CfgUpdateFlags.None;
case 23: AmbTemp_min = Utils.ParseUDouble(sVal); return CfgUpdateFlags.None;
case 24: AmbTemp_max = Utils.ParseUDouble(sVal); return CfgUpdateFlags.None;
case 25: Pressure_min = Utils.ParseUDouble(sVal); return CfgUpdateFlags.None;
case 26: Pressure_max = Utils.ParseUDouble(sVal); return CfgUpdateFlags.None;
case 23: AmbTemp_min = Units.ConvertFrom(ProcessData.TempUnit, Utils.ParseUDouble(sVal)); return CfgUpdateFlags.None;
case 24: AmbTemp_max = Units.ConvertFrom(ProcessData.TempUnit, Utils.ParseUDouble(sVal)); return CfgUpdateFlags.None;
case 25: Pressure_min = Units.ConvertFrom(ProcessData.PressUnit, Utils.ParseUDouble(sVal)); return CfgUpdateFlags.None;
case 26: Pressure_max = Units.ConvertFrom(ProcessData.PressUnit, Utils.ParseUDouble(sVal)); return CfgUpdateFlags.None;
case 27: Conductivity_min = Utils.ParseUDouble(sVal); return CfgUpdateFlags.None;
case 28: Conductivity_max = Utils.ParseUDouble(sVal); return CfgUpdateFlags.None;
case 29: Coef_E9 = Utils.ParseUDouble(sVal); return CfgUpdateFlags.None;