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

Bug fix: WMTypeId and WMTypeRev in Results.Entities.WaterMeterData were not initialized.

Browse Source
This commit is contained in:
Milan Hanajik 2016-01-10 13:02:26 +01:00
parent 6d47789708
commit d1ef582349
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Results/Entities/WaterMeterData.cs
View File

@ -47,7 +47,10 @@ namespace Results.Entities
if (Q2_Qt != wmd.Q2_Qt) return false;
if (Q1_Qmin != wmd.Q1_Qmin) return false;
if (Compound != wmd.Compound) return false;
#if IPERLST
if (WMTypeId != wmd.WMTypeId) return false;
if (WMTypeRev != wmd.WMTypeRev) return false;
#endif
return true;
}

10
TestBenchFramework/BenchControl/Sequences/MainSeq.cs
View File

@ -254,7 +254,15 @@ namespace TBF.BenchControl.Sequences
Qn = WaterMeters[i].Qn,
Compound = compound,
};
}
#if IPERLST
BenchControl.WaterMeters.iPerl.WaterMeter iPerl = WaterMeters[i] as BenchControl.WaterMeters.iPerl.WaterMeter;
if (iPerl != null)
{
waterMeterData[i].WMTypeId = iPerl.WMType_ID;
waterMeterData[i].WMTypeRev = iPerl.WMType_Rev;
}
#endif
}
/// Prepare empty results
BatchRslts = Results.BatchResults.NewFromProcedure(Program.LocalSettings.BatchNr, BenchInfo.TestBenchId,