From 11bdb1b2f1339715937ff7e1992bfcdf34679b63 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Thu, 15 Jan 2015 05:03:46 +0100 Subject: [PATCH] Bugfix in MainSeq (opening EntryForm instead of closing) --- .../BenchControl/DataEntry/Munich3/EntryForm.cs | 4 ++-- TestBenchFramework/BenchControl/Sequences/MainSeq.cs | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs index 997d391c9..0366464a3 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs @@ -171,8 +171,8 @@ namespace TBF.BenchControl.DataEntry.Munich3 { if (test.MetersKind != Entities.MetersKind.Single) continue; - int count = Math.Max(waterMeters.Count, test.Meters.Count); - for (int i = 0; i < count; i++) + int nrMtrsToUpdate = Math.Max(waterMeters.Count, test.Meters.Count); + for (int i = 0; i < nrMtrsToUpdate; i++) { test.Meters[i].SerialNr = waterMeters[i].SerialNr; test.Meters[i].EndState = waterMeters[i].EndState; diff --git a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs index e6a068623..1765cebcd 100644 --- a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs +++ b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs @@ -277,7 +277,7 @@ namespace TBF.BenchControl.Sequences if (!beginningDlgClosed) { beginningDlgClosed = true; - if (OpenDataEntryBeginning()) goto stop; + if (CloseDataEntryBeginning()) goto stop; } if (e.Contains(Event.Error)) goto error; @@ -316,7 +316,7 @@ namespace TBF.BenchControl.Sequences if (!beginningDlgClosed) { beginningDlgClosed = true; - if (OpenDataEntryBeginning()) goto stop; + if (CloseDataEntryBeginning()) goto stop; } if (e.Contains(Event.Error)) goto error; @@ -748,6 +748,8 @@ namespace TBF.BenchControl.Sequences .EnterState(); e = StateMachine.WaitRunDevsRunOps(); if (e.Contains(Event.UiCmdStop)) return true; + + dataEntryCmpnt.UpdateTestResults(WaterMeters, results); } return false; }