(1) E9,E10,E15,E16 implemented, (2)Zapiska: Each WM is in one table row, (3) TableRowNr,TableColumnNr,WMRemark added to RsltItems

This commit is contained in:
Milan Hanajik
2017-09-25 22:25:09 +02:00
parent 2e1d497aad
commit 3fb487b67b
20 changed files with 874 additions and 653 deletions
@@ -34,6 +34,9 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
Event retVal = Event.Done;
checkUiOp = new Operations.CheckUIOp(true); /// Runs in more then one state
int switchTimeStart = 1;
int switchTimeEnd = 1;
LtrPerRefPulse = outPath.FlowMeter.LtrPerPulse; /// [ltr/pulse], nominal flow in [m3/h]
/// Notes:
@@ -219,6 +222,9 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
ClearAllStatistics(StateMachine.Time);
/// Read the diverter switch time
switchTimeStart = (int)cBrd.DivTime;
/// Measurement loop - begin
while (true)
{
@@ -264,6 +270,9 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
}
while (!e.Contains(Event.TimerExpired));
/// Read the diverter switch time
switchTimeEnd = (int)cBrd.DivTime;
//------------------------------------------------
Bridge.OnActivity(this, Strings.Measuring_the_weight);
//------------------------------------------------
@@ -332,7 +341,7 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
tstRslt.FlowMax = (float)RefFlowStat.Max;
tstRslt.ErrorFlagsMd = (ErrorFlagsComp != null) ? (sbyte)ErrorFlagsComp.Mode : (sbyte)0;
tstRslt.ErrorFlags = (ErrorFlagsComp != null) ? ErrorFlagsComp.GetErrorFlags(test, tstRslt.TestTime) : 0;
tstRslt.ErrorFlags = (ErrorFlagsComp != null) ? ErrorFlagsComp.GetErrorFlags(tstRslt, true, false, switchTimeStart, switchTimeEnd) : 0;
/// Update flowmeter constant with the measured one
if (outPath.FlowMeter.Idx1 > 0 && outPath.FlowMeter.Idx1 <= ReferenceFlowmetersCount)