michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bugs:

Browse Source 
- when there is a configuration error in a test and Data entry form for s/n-s was not closed yet
- when showing results with a combination of different tests
This commit is contained in:
Milan Hanajik
2015-02-21 20:03:33 +01:00
parent 82a72670a6
commit 9fa72109da
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/Sequences/MainSeq.cs
+8 -3
View File
@@ -361,13 +361,18 @@ namespace TBF.BenchControl.Sequences
Bridge.Bench2UI(ButtonsEtc.StopBtnEn); // Hide the most of buttons 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; string protocolTitle = string.Empty;
GenericDevices.IDataEntry dataEntryCmpnt = TbfComponents.FindComponent(StateMachine.Procedure.DataEntry) as GenericDevices.IDataEntry; GenericDevices.IDataEntry dataEntryCmpnt = TbfComponents.FindComponent(StateMachine.Procedure.DataEntry) as GenericDevices.IDataEntry;
if (dataEntryCmpnt != null) if (dataEntryCmpnt != null)
{ {
Bridge.OnActivity(this, "Enter protocol data");
if (dataEntryCmpnt is IHasCycleEndForm) if (dataEntryCmpnt is IHasCycleEndForm)
{ {
/// Open the modeless form for the end of the cycle /// Open the modeless form for the end of the cycle
TestBenchFramework/Screens/ResultsTabPageCtrl.cs
+5 -4
View File
@@ -347,9 +347,10 @@ namespace TBF.Screens
{ {
foreach (var tr in trs) foreach (var tr in trs)
{ {
string str = (!item.CanPrintCombined || tr == null) ? string.Empty : item.PrintCombined(tr.Meters[2 * mtr - 2], string str = (!item.CanPrintCombined || (tr == null) || (2 * mtr > tr.Meters.Count) || (mtr > tr.CombinedMeters.Count))
tr.Meters[2 * mtr - 1], ? string.Empty : item.PrintCombined(tr.Meters[2 * mtr - 2],
tr.CombinedMeters[mtr - 1]); tr.Meters[2 * mtr - 1],
tr.CombinedMeters[mtr - 1]);
string[] texts = str.Split(new char[] { '|' }); string[] texts = str.Split(new char[] { '|' });
if (texts.Length == 1) if (texts.Length == 1)
{ {
@@ -372,7 +373,7 @@ namespace TBF.Screens
{ {
foreach (var tr in trs) 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[] { '|' }); string[] texts = str.Split(new char[] { '|' });
if (texts.Length == 1) if (texts.Length == 1)