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

(1) CycleNr renamed to BatchNr (no DB change) and added to results/logs

Browse Source 
(2) Safer result items
This commit is contained in:
Milan Hanajik
2015-02-02 18:10:52 +01:00
parent 3e48e4c50c
commit 9bd5fba6dc
17 changed files with 158 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/Screens/ResultsTabPageCtrl.cs
+9 -8
View File
@@ -269,13 +269,14 @@ namespace TBF.Screens
string str;
if (combined)
{
str = (item.PrintCombined == null) ? string.Empty : item.PrintCombined(testRslt.Meters[2 * mtr - 2],
testRslt.Meters[2 * mtr - 1],
testRslt.CombinedMeters[mtr - 1]);
str = item.CanPrintCombined ? item.PrintCombined(testRslt.Meters[2 * mtr - 2],
testRslt.Meters[2 * mtr - 1],
testRslt.CombinedMeters[mtr - 1])
: string.Empty;
}
else
{
str = (item.Print == null) ? string.Empty : item.Print(testRslt.Meters[mtr - 1]);
str = item.CanPrintSingle ? item.Print(testRslt.Meters[mtr - 1]) : string.Empty;
}
string[] texts = str.Split(new char[] { '|' });
@@ -346,9 +347,9 @@ namespace TBF.Screens
{
foreach (var tr in trs)
{
string str = (item.PrintCombined == null || 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) ? 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)
{
@@ -371,7 +372,7 @@ namespace TBF.Screens
{
foreach (var tr in trs)
{
string str = (item.Print == null || tr == null) ? string.Empty : item.Print(tr.Meters[mtr - 1]);
string str = (!item.CanPrintSingle || tr == null) ? string.Empty : item.Print(tr.Meters[mtr - 1]);
string[] texts = str.Split(new char[] { '|' });
if (texts.Length == 1)