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

E15 and E16 implementation in progress.

Browse Source
This commit is contained in:
Milan Hanajik
2017-09-27 09:11:06 +02:00
parent 4f06438371
commit d9fc5482db
4 changed files with 63 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Results/Entities/WaterMeter.cs
+13 -1
View File
@@ -50,7 +50,9 @@ namespace Results.Entities
public virtual string EndStateAux { get; set; } /// End state of the auxiliary water meter
public virtual double QRise { get; set; } /// [m3/h] detected Q_rise of a composed meter
public virtual double QFall { get; set; } /// [m3/h] detected Q_fall of a composed meter
public virtual bool Passed { get; set; }
//public virtual int ErrorFlags { get; set; } /// bitfield : bit14=E15, bit15=E16
//public virtual sbyte ErrorFlagsMd { get; set; } /// 0=off, 1=info, 2=on (evaluated in MeterTestRslt.Passed)
public virtual bool Passed { get; set; }
public virtual int ResultCode { get; set; }
public virtual string ArchivePath { get; set; }
public virtual string Remark { get; set; }
@@ -109,6 +111,16 @@ namespace Results.Entities
public virtual MeterTestRslt LastMeterTestRslts() { return lastMeterTestRslts; }
//public virtual int ErrorFlagsFromTestsAndWM()
//{
// int errorFlags = TBF.BenchControl.Sequences.ProcessData.ErrorFlagsComp.ErrorFlags;
// foreach (var mtr in MeterTestRslts)
// {
// if (mtr.TestDone) errorFlags |= mtr.TestRslt.ErrorFlags;
// }
// return errorFlags;
//}
public virtual bool PassedFromTests()
{
bool passed = true;