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

Bug fix for the case of combined WM test and odd total nr. of watermeters (Munich)

Browse Source
This commit is contained in:
Milan Hanajik 2015-02-18 14:26:33 +01:00
parent fbdd937302
commit 1dbbe31eae
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TestBenchFramework/BenchControl/Sequences/SequenceBase.cs
View File

@ -698,7 +698,8 @@ namespace TBF.BenchControl.Sequences
float refPulsesPerLtr = 1.0f / outPath.FlowMeter.LtrPerPulseCorrected(refFlow.Val); /// [pulse/ltr]
data.Volume = new FloatBox() { Name = "Volume", Format = "F1", Val = Formulas.VolumeFromPulses(data.RefPulses, refPulsesPerLtr) };
for (int i = 0; i < Program.WMsCount; i++)
int count = Math.Min(Program.WMsCount, data.TestResult.Meters.Count);
for (int i = 0; i < count; i++)
{
if (sensPath.RegisterReaders[i] != null)
{

3
TestBenchFramework/BenchControl/StateMachine.cs
View File

@ -408,7 +408,8 @@ namespace TBF.BenchControl
}
if (pmtrs != null)
{
for (int i = 0; i < Program.WMsCount; i++)
int count = Math.Min(Program.WMsCount, pmtrs.RegisterReaders.Length);
for (int i = 0; i < count; i++)
{
if ((pmtrs.RegisterReaders[i] != null) &&
(pmtrs.RegisterReaders[i].Cfg.DebugLevel == Entities.DebugMode.DetectedOff))

2
TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs
View File

@ -261,7 +261,7 @@ namespace TBF.BenchControl.TestMethods.CombinedMeters
string logstr = string.Format("E={0} f={1} q={2}", cBrd.EtPulses(0), cBrd.ReferenceFreq,
cBrd.ReferenceFlow * outPath.FlowMeter.NominalFlow);
for (int i = 0; i < Program.WMsCount; i++)
for (int i = 0; i < (Program.WMsCount / 2) * 2; i++)
{
logstr += string.Format(" M{0}=({1},{2})", i + 1, WMRefPulses[i], WMPulses[i]);
}

2
TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
View File

@ -459,7 +459,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
string logstr = string.Format("E={0} f={1} q={2}", cBrd.EtPulses(0), cBrd.ReferenceFreq,
cBrd.ReferenceFlow * outPath.FlowMeter.NominalFlow);
for (int i = 0; i < Program.WMsCount; i++)
for (int i = 0; i < (Program.WMsCount / 2) * 2; i++)
{
logstr += string.Format(" M{0}=({1},{2})", i + 1, WMRefPulses[i], WMPulses[i]);
}

3
TestBenchFramework/Screens/MeasurementTabPageCtrl.cs
View File

@ -148,7 +148,8 @@ namespace TBF.Screens
{
if (data.TestResult != null)
{
for (int i = 0; i < Program.WMsCount; i++)
int count = Math.Min(Program.WMsCount, data.TestResult.Meters.Count);
for (int i = 0; i < count; i++)
{
measurementTbl1Col2.SetData(i, data.TestResult.Meters[i].VolumeMeter.ToString("F1"));
measurementTbl1Col3.SetData(i, data.TestResult.Meters[i].VolumeErrorPct.ToString("F1"));