diff --git a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs index 677902091..930610ae1 100644 --- a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs +++ b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs @@ -361,13 +361,18 @@ namespace TBF.BenchControl.Sequences Bridge.Bench2UI(ButtonsEtc.StopBtnEn); // Hide the most of buttons - //-------------------------------- + if (cycleBeginFormOpened) + { + cycleBeginFormOpened = false; + if (CloseCycleBeginForm()) goto stop; + } + Bridge.OnActivity(this, "Enter protocol data"); + + //-------------------------------- string protocolTitle = string.Empty; GenericDevices.IDataEntry dataEntryCmpnt = TbfComponents.FindComponent(StateMachine.Procedure.DataEntry) as GenericDevices.IDataEntry; if (dataEntryCmpnt != null) { - Bridge.OnActivity(this, "Enter protocol data"); - if (dataEntryCmpnt is IHasCycleEndForm) { /// Open the modeless form for the end of the cycle diff --git a/TestBenchFramework/Screens/ResultsTabPageCtrl.cs b/TestBenchFramework/Screens/ResultsTabPageCtrl.cs index 0dd7b5432..ef511c89b 100644 --- a/TestBenchFramework/Screens/ResultsTabPageCtrl.cs +++ b/TestBenchFramework/Screens/ResultsTabPageCtrl.cs @@ -347,9 +347,10 @@ namespace TBF.Screens { foreach (var tr in trs) { - string str = (!item.CanPrintCombined || tr == null) ? string.Empty : item.PrintCombined(tr.Meters[2 * mtr - 2], - tr.Meters[2 * mtr - 1], - tr.CombinedMeters[mtr - 1]); + string str = (!item.CanPrintCombined || (tr == null) || (2 * mtr > tr.Meters.Count) || (mtr > tr.CombinedMeters.Count)) + ? string.Empty : item.PrintCombined(tr.Meters[2 * mtr - 2], + tr.Meters[2 * mtr - 1], + tr.CombinedMeters[mtr - 1]); string[] texts = str.Split(new char[] { '|' }); if (texts.Length == 1) { @@ -372,7 +373,7 @@ namespace TBF.Screens { foreach (var tr in trs) { - string str = (!item.CanPrintSingle || tr == null) ? string.Empty : item.Print(tr.Meters[mtr - 1]); + string str = (!item.CanPrintSingle || (tr == null) || (mtr > tr.Meters.Count)) ? string.Empty : item.Print(tr.Meters[mtr - 1]); string[] texts = str.Split(new char[] { '|' }); if (texts.Length == 1)