Bug-fixes in FlyingStart and FlyingStartMassCollection heat meters, T ref warm and T ref cold statistics, ver. 2.10.362

This commit is contained in:
Milan Hanajik
2016-10-12 01:23:38 +02:00
parent 2057cc6b73
commit dddfc4bed5
8 changed files with 209 additions and 49 deletions
@@ -82,6 +82,8 @@ namespace TBF.BenchControl.Sequences
public static Statistics PressureDownStat = new Statistics();
public static Statistics RefFlowStat = new Statistics();
public static Statistics TempRefWarmStat = new Statistics();
public static Statistics TempRefColdStat = new Statistics();
public static Statistics Energy = new Statistics();
public static Statistics VolumeForEnergy = new Statistics();
public static int lastEnergyUpdateTime;
@@ -98,6 +100,8 @@ namespace TBF.BenchControl.Sequences
PressureDownStat.Clear();
RefFlowStat.Clear();
TempRefWarmStat.Clear();
TempRefColdStat.Clear();
Energy.Clear();
VolumeForEnergy.Clear();
lastEnergyUpdateTime = 0;
@@ -114,6 +118,12 @@ namespace TBF.BenchControl.Sequences
PressureUpStat.Update(PressureUp);
PressureDownStat.Update(PressureDown);
RefFlowStat.Update(RefFlow);
if (BatchRslts.Batch.HeatMeter)
{
TempRefWarmStat.Update((TempRefWarm1.Val + TempRefWarm2.Val) / 2);
TempRefColdStat.Update((TempRefCold1.Val + TempRefCold2.Val) / 2);
}
}
}
}
@@ -109,7 +109,14 @@ namespace TBF.BenchControl.Sequences
protected Event EmptyTheTank(IValve emptyTankValve, IBalance balance)
{
return EmptyTheTank(emptyTankValve, balance, null);
return EmptyTheTank(emptyTankValve, balance, new List<IOperation>());
}
protected Event EmptyTheTank(IValve emptyTankValve, IBalance balance, IOperation extraOperation)
{
IList<IOperation> extraOperations = new List<IOperation>();
extraOperations.Add(extraOperation);
return EmptyTheTank(emptyTankValve, balance, extraOperations);
}
/// <summary>
@@ -118,7 +125,7 @@ namespace TBF.BenchControl.Sequences
/// <param name="emptyTankValve">Valve to empty the tank</param>
/// <param name="balance">Balance underneath the tank</param>
/// <returns>Event.Done or Event.Error</returns>
protected Event EmptyTheTank(IValve emptyTankValve, IBalance balance, IOperation extraOperation)
protected Event EmptyTheTank(IValve emptyTankValve, IBalance balance, IList<IOperation> extraOperations)
{
bool stopped = false;
@@ -129,23 +136,26 @@ namespace TBF.BenchControl.Sequences
IList<Event> e;
Bridge.Bench2UI(ButtonsEtc.StopBtnEn);
State.Create("SequenceBase : Opening the emptying valve")
.AddOperation(checkUiOp)
.AddOperation(StateMachine.ControlBoard.SetValvesOp(emptyTankValve, null))
.AddOperation(extraOperation)
.EnterState();
do { e = StateMachine.WaitRunDevsRunOps(); }
State state = State.Create("SequenceBase : Opening the emptying valve")
.AddOperation(checkUiOp)
.AddOperation(StateMachine.ControlBoard.SetValvesOp(emptyTankValve, null));
foreach (var op in extraOperations) state.AddOperation(op);
state.EnterState();
do
{
e = StateMachine.WaitRunDevsRunOps();
}
while (!e.Contains(Event.ValvesSet));
do
{
//--------------------------------
State.Create("SequenceBase : Emptying the tank")
.AddOperation(checkUiOp)
.AddOperation(balance.ReadMassOp(ref Mass))
.AddOperation(StateMachine.ControlBoard.UpdateTankWeightOp())
.AddOperation(extraOperation)
.EnterState();
state = State.Create("SequenceBase : Emptying the tank")
.AddOperation(checkUiOp)
.AddOperation(balance.ReadMassOp(ref Mass))
.AddOperation(StateMachine.ControlBoard.UpdateTankWeightOp());
foreach (var op in extraOperations) state.AddOperation(op);
state.EnterState();
do
{
e = StateMachine.WaitRunDevsRunOps();
@@ -159,6 +169,7 @@ namespace TBF.BenchControl.Sequences
}
while (!e.Contains(Event.BalanceDone));
if (stopped) break;
}
while (!balance.IsEmpty(Mass.Val));
@@ -166,13 +177,13 @@ namespace TBF.BenchControl.Sequences
//
// Quit emptying
//
State.Create("SequenceBase : Closing the emptying valve")
.AddOperation(checkUiOp)
.AddOperation(balance.ReadMassOp(ref Mass))
.AddOperation(StateMachine.ControlBoard.UpdateTankWeightOp())
.AddOperation(StateMachine.ControlBoard.SetValvesOp(null, emptyTankValve))
.AddOperation(extraOperation)
.EnterState();
state = State.Create("SequenceBase : Closing the emptying valve")
.AddOperation(checkUiOp)
.AddOperation(balance.ReadMassOp(ref Mass))
.AddOperation(StateMachine.ControlBoard.UpdateTankWeightOp())
.AddOperation(StateMachine.ControlBoard.SetValvesOp(null, emptyTankValve));
foreach (var op in extraOperations) state.AddOperation(op);
state.EnterState();
do
{
e = StateMachine.WaitRunDevsRunOps();
@@ -181,13 +192,14 @@ namespace TBF.BenchControl.Sequences
}
while (!e.Contains(Event.ValvesSet) || !e.Contains(Event.BalanceDone));
State.Create("SequenceBase : Updating the weight")
.AddOperation(checkUiOp)
.AddOperation(balance.ReadMassOp(ref Mass))
.AddOperation(new Operations.TimerOp(5))
.AddOperation(StateMachine.ControlBoard.UpdateTankWeightOp())
.AddOperation(extraOperation)
.EnterState();
state = State.Create("SequenceBase : Updating the weight")
.AddOperation(checkUiOp)
.AddOperation(balance.ReadMassOp(ref Mass))
.AddOperation(new Operations.TimerOp(5))
.AddOperation(StateMachine.ControlBoard.UpdateTankWeightOp());
foreach (var op in extraOperations) state.AddOperation(op);
state.EnterState();
do
{
e = StateMachine.WaitRunDevsRunOps();
@@ -196,6 +208,7 @@ namespace TBF.BenchControl.Sequences
}
while (!e.Contains(Event.BalanceDone) || !e.Contains(Event.TimerExpired));
if (stopped)
return Event.UiCmdStop;
else
@@ -735,7 +748,7 @@ namespace TBF.BenchControl.Sequences
{
if (ProcessData.BatchRslts.WaterMeters[i] != null)
{
if (!ProcessData.BatchRslts.WaterMeters[i].Compound())
if (!ProcessData.BatchRslts.WaterMeters[i].Compound() && !ProcessData.BatchRslts.WaterMeters[i].HeatMeter())
{
Results.Entities.MeterTestRslt mtrRslt = ProcessData.BatchRslts.GetMeterTestRslt(tstRslt.Name(), i, CompoundMeterId.Single);
@@ -767,7 +780,7 @@ namespace TBF.BenchControl.Sequences
sb.Append(";"); sb.Append(mtrRslt.TimestampEnd); /// WM Time_end - ' ' -
}
}
else
else if (ProcessData.BatchRslts.WaterMeters[i].Compound())
{
for (byte b = (byte)CompoundMeterId.CompoundMain; b <= (byte)CompoundMeterId.Compound; b++)
{
@@ -775,7 +788,7 @@ namespace TBF.BenchControl.Sequences
if (mtrRslt != null)
{
sb.Append(";");
sb.Append(";");
switch ((CompoundMeterId)b)
{
case CompoundMeterId.CompoundMain:
@@ -806,6 +819,67 @@ namespace TBF.BenchControl.Sequences
}
}
}
else /// if (ProcessData.BatchRslts.WaterMeters[i].HeatMeter())
{
Results.Entities.MeterTestRslt volumeMtr = ProcessData.BatchRslts.GetMeterTestRslt(tstRslt.Name(), i, CompoundMeterId.HeatMeterVolume);
Results.Entities.MeterTestRslt energyMtr = ProcessData.BatchRslts.GetMeterTestRslt(tstRslt.Name(), i, CompoundMeterId.HeatMeterEnergy);
if (volumeMtr != null)
{
sb.Append(";"); sb.Append(ProcessData.BatchRslts.WaterMeters[i].SerialNr); /// WM Ser.No.
sb.Append(";"); sb.Append(volumeMtr.VolumeStart); /// WM Vstart - pociatocny stav pri pevnom starte alebo zachyteny pri data streame
sb.Append(";"); sb.Append(volumeMtr.VolumeEnd); /// WM Vend - konecny stav pri pevnom starte alebo zachyteny pri data streame
sb.Append(";"); sb.Append(volumeMtr.VolumeMeter); /// WM Vmer - objem namerany vodomerom
sb.Append(";"); sb.Append(volumeMtr.VolumeRef); /// WM Vref - objem namerany stanicou
sb.Append(";"); sb.Append(volumeMtr.Error); /// WM Emt - chyba vodomerom nameraneho objemu
#if IPERLST || IPERLST_SPECIAL
sb.Append(";"); sb.Append(ProcessData.BatchRslts.WaterMeters[i].CalibFactor); /// iPerl calibration factor used during the test / ...
#else
sb.Append(";"); sb.Append(" "); /// nechat prazdne
#endif
sb.Append(";"); sb.Append(volumeMtr.PulsesMeter); /// WM Np met - pocet impulzov zo skusaneho meradla
sb.Append(";"); sb.Append(volumeMtr.PulsesMaster); /// WM Np elm - pocet impulzov etalonu pocas merania pre prislusny vodomer
sb.Append(";"); sb.Append(volumeMtr.TestTime); /// WM Tmet - cas merania (obmedzany pri synchro skuske)
sb.Append(";"); sb.Append(volumeMtr.Passed ? "OK" : "NOK"); /// WM Vysledok (t.j. ci je v hraniciach chyb) - OK/NOK
#if IPERLST || IPERLST_SPECIAL
sb.Append(";"); sb.Append(mtrRslt.WaterMeter.Q2Correction.ToString("F1")); /// iPerl Q2 correction factor used during the test / AN value - hodnota z analogoveho prevodnika
#else
sb.Append(";"); sb.Append(" "); /// nechat prazdne
#endif
sb.Append(";"); sb.Append(volumeMtr.VolumeStart); /// WM Volume_start - pri datastreamovych hodnotach (alebo kamera)
sb.Append(";"); sb.Append(volumeMtr.TimestampStart); /// WM Time_start - ' ' -
sb.Append(";"); sb.Append(volumeMtr.VolumeEnd); /// WM Volume_end - ' ' -
sb.Append(";"); sb.Append(volumeMtr.TimestampEnd); /// WM Time_end - ' ' -
}
if (energyMtr != null)
{
sb.Append(";"); sb.Append(ProcessData.BatchRslts.WaterMeters[i].SerialNr); /// WM Ser.No.
sb.Append(";"); sb.Append(energyMtr.VolumeStart); /// WM Vstart - pociatocny stav pri pevnom starte alebo zachyteny pri data streame
sb.Append(";"); sb.Append(energyMtr.VolumeEnd); /// WM Vend - konecny stav pri pevnom starte alebo zachyteny pri data streame
sb.Append(";"); sb.Append(energyMtr.VolumeMeter); /// WM Vmer - objem namerany vodomerom
sb.Append(";"); sb.Append(energyMtr.VolumeRef); /// WM Vref - objem namerany stanicou
sb.Append(";"); sb.Append(energyMtr.Error); /// WM Emt - chyba vodomerom nameraneho objemu
#if IPERLST || IPERLST_SPECIAL
sb.Append(";"); sb.Append(ProcessData.BatchRslts.WaterMeters[i].CalibFactor); /// iPerl calibration factor used during the test / ...
#else
sb.Append(";"); sb.Append(" "); /// nechat prazdne
#endif
sb.Append(";"); sb.Append(energyMtr.PulsesMeter); /// WM Np met - pocet impulzov zo skusaneho meradla
sb.Append(";"); sb.Append(energyMtr.PulsesMaster); /// WM Np elm - pocet impulzov etalonu pocas merania pre prislusny vodomer
sb.Append(";"); sb.Append(energyMtr.TestTime); /// WM Tmet - cas merania (obmedzany pri synchro skuske)
sb.Append(";"); sb.Append(energyMtr.Passed ? "OK" : "NOK"); /// WM Vysledok (t.j. ci je v hraniciach chyb) - OK/NOK
#if IPERLST || IPERLST_SPECIAL
sb.Append(";"); sb.Append(mtrRslt.WaterMeter.Q2Correction.ToString("F1")); /// iPerl Q2 correction factor used during the test / AN value - hodnota z analogoveho prevodnika
#else
sb.Append(";"); sb.Append(" "); /// nechat prazdne
#endif
sb.Append(";"); sb.Append(energyMtr.VolumeStart); /// WM Volume_start - pri datastreamovych hodnotach (alebo kamera)
sb.Append(";"); sb.Append(energyMtr.TimestampStart); /// WM Time_start - ' ' -
sb.Append(";"); sb.Append(energyMtr.VolumeEnd); /// WM Volume_end - ' ' -
sb.Append(";"); sb.Append(energyMtr.TimestampEnd); /// WM Time_end - ' ' -
}
}
}
}
sb.Append(";");
@@ -32,8 +32,8 @@ namespace TBF.BenchControl.Sequences
public void Clear()
{
sum = 0;
min = float.MaxValue;
max = float.MinValue;
min = double.MaxValue;
max = double.MinValue;
first = 0;
last = 0;
count = 0;