Bug fix: Procedure parameters were not loaded early enough.

This commit is contained in:
Milan Hanajik
2016-01-10 13:15:14 +01:00
parent d1ef582349
commit 8cd3b6a7b0
@@ -234,9 +234,12 @@ namespace TBF.BenchControl.Sequences
///
/// Procedure selected at this point, a new batch was started
///
StateMachine.LoadProcedureParams(StateMachine.Procedure);
/// Prepare new water meters
bool compound = (StateMachine.Procedure.MetersKind == MetersKind.Combined);
foreach (var wm in WaterMeters) wm.ClearData(); /// Clean water meter data
bool compound = (StateMachine.Procedure.MetersKind == MetersKind.Combined);
int nrWMs = Math.Min(WaterMeters.Count, compound ? Config.Data.CompoundWMsCount : Config.Data.WMsCount);
///
Results.Entities.WaterMeterData[] waterMeterData = new Results.Entities.WaterMeterData[nrWMs];
@@ -269,10 +272,8 @@ namespace TBF.BenchControl.Sequences
User.CurrentUser.Name, Program.Version,
StateMachine.Procedure, waterMeterData, waterMeterParts);
StateMachine.CycleStartTimeStamp = BatchRslts.Batch.StartTime;
foreach (var wm in WaterMeters) wm.ClearData(); /// Clean water meter data
StateMachine.CycleStartTimeStamp = BatchRslts.Batch.StartTime;
StateMachine.LoadProcedureParams(StateMachine.Procedure);
Bridge.OnProcedureSelected(this, new ProcedureSelectedEventArgs(StateMachine.Procedure));
/// Display 'Cycle Begin Form'