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

Results screen fixed for compound meters, ver.2.7.285

Browse Source
This commit is contained in:
Milan Hanajik
2016-05-19 13:12:31 +02:00
parent be76fb4001
commit cd43aa2f42
1 changed files with 49 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/Screens/ResultsTabPageCtrl.cs
+46 -35
View File
@@ -250,7 +250,9 @@ namespace TBF.Screens
foreach (var mtr in wMtr.MeterTestRslts) foreach (var mtr in wMtr.MeterTestRslts)
{ {
if (mtr.TestDone && (mtr.Publish() != Config.Entities.Publish.Never) if ( (mtr.CompoundMeterId == (byte)CompoundMeterId.Single || mtr.CompoundMeterId == (byte)CompoundMeterId.Compound)
&& mtr.TestDone
&& (mtr.Publish() != Config.Entities.Publish.Never)
&& (mtr.Publish() != Config.Entities.Publish.Internal)) && (mtr.Publish() != Config.Entities.Publish.Internal))
{ {
testNames.Add(mtr.Name()); testNames.Add(mtr.Name());
@@ -290,7 +292,9 @@ namespace TBF.Screens
int ix = 0; int ix = 0;
foreach (var mtr in wMtr.MeterTestRslts) foreach (var mtr in wMtr.MeterTestRslts)
{ {
if (mtr.TestDone && (mtr.Publish() != Config.Entities.Publish.Never) if ((mtr.CompoundMeterId == (byte)CompoundMeterId.Single || mtr.CompoundMeterId == (byte)CompoundMeterId.Compound)
&& mtr.TestDone
&& (mtr.Publish() != Config.Entities.Publish.Never)
&& (mtr.Publish() != Config.Entities.Publish.Internal)) && (mtr.Publish() != Config.Entities.Publish.Internal))
{ {
ListViewItem lvi = new ListViewItem(testNames[ix++]); ListViewItem lvi = new ListViewItem(testNames[ix++]);
@@ -298,15 +302,15 @@ namespace TBF.Screens
foreach (var item in items) foreach (var item in items)
{ {
string str; string str;
/// TODO: Reimplement if (compound)
//if (compound) {
//{ var main = wMtr.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundMain);
// str = item.CanPrintCombined ? item.PrintCombined(testRslt.Meters[2 * mtr - 2], var aux = wMtr.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundAux);
// testRslt.Meters[2 * mtr - 1], str = (item.CanPrintCombined && main != null && aux != null)
// testRslt.CombinedMeters[mtr - 1]) ? item.PrintCombined(main, aux, mtr)
// : string.Empty; : string.Empty;
//} }
//else else
{ {
str = item.CanPrintSingle ? item.Print(mtr) : string.Empty; str = item.CanPrintSingle ? item.Print(mtr) : string.Empty;
} }
@@ -366,30 +370,37 @@ namespace TBF.Screens
ListViewItem lvi = new ListViewItem(item.ClmnHeaderText); ListViewItem lvi = new ListViewItem(item.ClmnHeaderText);
if (compound) if (compound)
{ {
/// TODO: Reimplement foreach (var mtr in wMtr.MeterTestRslts)
//foreach (var mtr in wMtr.MeterTestRslts) {
//{ if (mtr.CompoundMeterId == (byte)CompoundMeterId.Compound && mtr.TestDone
// string str = (!item.CanPrintCombined || (tr == null) || (2 * mtr > tr.Meters.Count) || (mtr > tr.CombinedMeters.Count)) && (mtr.Publish() != Config.Entities.Publish.Never)
// ? string.Empty : item.PrintCombined(tr.Meters[2 * mtr - 2], && (mtr.Publish() != Config.Entities.Publish.Internal))
// tr.Meters[2 * mtr - 1], {
// tr.CombinedMeters[mtr - 1]); var main = wMtr.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundMain);
// string[] texts = str.Split(new char[] { '|' }); var aux = wMtr.GetMeterTestRslt(mtr.Name(), CompoundMeterId.CompoundAux);
// if (texts.Length == 1)
// { string str = (item.CanPrintCombined && main != null && aux != null)
// lvi.SubItems.Add(str); ? item.PrintCombined(main, aux, mtr)
// } : string.Empty;
// else if (texts.Length == 2)
// { string[] texts = str.Split(new char[] { '|' });
// Color color = texts[1].Equals("Green") ? Color.Green : (texts[1].Equals("Red") ? Color.Red : Color.White); if (texts.Length == 1)
// lvi.UseItemStyleForSubItems = false; {
// lvi.SubItems.Add(texts[0]); lvi.SubItems.Add(str);
// lvi.SubItems[lvi.SubItems.Count - 1].BackColor = color; }
// } else if (texts.Length == 2)
// else {
// { Color color = texts[1].Equals("Green") ? Color.Green : (texts[1].Equals("Red") ? Color.Red : Color.White);
// lvi.SubItems.Add(string.Empty); lvi.UseItemStyleForSubItems = false;
// } lvi.SubItems.Add(texts[0]);
//} lvi.SubItems[lvi.SubItems.Count - 1].BackColor = color;
}
else
{
lvi.SubItems.Add(string.Empty);
}
}
}
} }
else else
{ {