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

'Config', 'Results' projects added, includes iPerl opto logging bug-fixes, builds OK, cannot open DB, version 2.0.158.

Browse Source
This commit is contained in:
Milan Hanajik
2015-12-05 14:18:36 +01:00
parent 29ece2f91c
commit f6cec9d769
360 changed files with 6406 additions and 4091 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/Screens/ResultsTabPageCtrl.cs
+21 -21
View File
@@ -8,6 +8,7 @@ using System.Linq;
using System.Text;
using System.Windows.Forms;
using log4net;
using Config.Entities;
using TBF.Resources;
using TBF.UiBridge;
@@ -17,8 +18,8 @@ namespace TBF.Screens
{
static readonly ILog log = LogManager.GetLogger(typeof(ResultsTabPageCtrl));
public TBF.Forms.ResultsConfig.Meters MetersArrangement;
public TBF.Forms.ResultsConfig.TestsAre TestsArrangement;
public MetersArrangement MetersArrangement;
public TestsArrangement TestsArrangement;
public int NrMetersInOneGroup;
public IList<TBF.Forms.ResultItemSpec> RsltItems_Screen_SingleWM;
@@ -28,8 +29,8 @@ namespace TBF.Screens
public IList<TBF.Forms.ResultItemSpec> RsltItems_Disk_SingleWM;
public IList<TBF.Forms.ResultItemSpec> RsltItems_Disk_CombinedWM;
Entities.Procedure procedure;
IList<Entities.TestResult> testResults;
Procedure procedure;
IList<TestResult> testResults;
bool combined;
ListView firstListView;
@@ -144,19 +145,19 @@ namespace TBF.Screens
///
combined = ((testResults != null) &&
(testResults.Count > 0) &&
(testResults[0].MetersKind == Entities.MetersKind.Combined));
(testResults[0].MetersKind == MetersKind.Combined));
/// Determine how many water meters were enabled for result evaluation and printing
int enabledWMsCount = 0;
bool[] wmIsEnabled = new bool[Program.WMsCount];
bool[] wmIsEnabled = new bool[Config.Data.WMsCount];
if (combined)
{
enabledWMsCount = Program.CompoundWMsCount;
enabledWMsCount = Config.Data.CompoundWMsCount;
}
else
{
for (int mtr0 = 0; mtr0 < Program.WMsCount; mtr0++)
for (int mtr0 = 0; mtr0 < Config.Data.WMsCount; mtr0++)
{
if (testResults != null)
{
@@ -176,7 +177,7 @@ namespace TBF.Screens
int metersInOneGroup = Math.Max(1, Math.Min(enabledWMsCount, NrMetersInOneGroup));
int nrGroups = Math.Max(1, (enabledWMsCount + NrMetersInOneGroup - 1) / metersInOneGroup);
if (MetersArrangement == Forms.ResultsConfig.Meters.Horizontally)
if (MetersArrangement == MetersArrangement.Horizontally)
{
flowLayoutPanel.FlowDirection = FlowDirection.LeftToRight;
lvWidth = flowLayoutPanel.Width / metersInOneGroup - 6;
@@ -193,11 +194,11 @@ namespace TBF.Screens
flowLayoutPanel.AutoScroll = true;
bool first = true;
for (int mtr = 1; mtr <= (combined ? Program.CompoundWMsCount : Program.WMsCount); mtr++)
for (int mtr = 1; mtr <= (combined ? Config.Data.CompoundWMsCount : Config.Data.WMsCount); mtr++)
{
if (combined || (testResults != null && testResults.Count > 0 && wmIsEnabled[mtr - 1]))
{
if (TestsArrangement == Forms.ResultsConfig.TestsAre.Rows)
if (TestsArrangement == TestsArrangement.Rows)
{
ListView lview = GetResultsTestsAreRows(mtr, mtr);
if (first) { firstListView = lview; first = false; }
@@ -249,7 +250,7 @@ namespace TBF.Screens
/// Get decorated test names for the specified watermeter
/// The parameter meterNr is used in the same way as the parameter meterNr of Utils.GetSortedTestResults
/// </summary>
/// <param name="meterPartNr">Water meter nr (1-based): 1 .. Program.WMsCount</param>
/// <param name="meterPartNr">Water meter nr (1-based): 1 .. Config.Data.WMsCount</param>
/// <returns>A list of strings</returns>
IList<string> GetAllDecoratedTestNames(int meterPartNr)
{
@@ -260,7 +261,7 @@ namespace TBF.Screens
BenchControl.GenericDevices.ITestMethod method =
BenchControl.TbfComponents.FindComponent(test.Method) as BenchControl.GenericDevices.ITestMethod;
if ((method != null) && method.Publish(test) && ((test.Part == 0) || (meterPartNr == 0) || (test.Part == meterPartNr)))
if ((method != null) && method.Publish(test) && ((test.Part == 0) || (meterPartNr == 0) || (test.Part == meterPartNr)))
{
if (test.Repeats == 1)
{
@@ -279,7 +280,7 @@ namespace TBF.Screens
/// <summary>
/// Get a ListView control filled with results of the meter 'mtr'
/// </summary>
/// <param name="mtr">Water meter number (1-based): 1 .. Program.WMsCount</param>
/// <param name="mtr">Water meter number (1-based): 1 .. Config.Data.WMsCount</param>
/// <returns>ListView object</returns>
ListView GetResultsTestsAreRows(int mtr, int printedWMNr)
{
@@ -313,7 +314,7 @@ namespace TBF.Screens
int meterPartNr = Utils.PartNr(mtr, combined);
IList<string> testNames = GetAllDecoratedTestNames(meterPartNr);
IList<Entities.TestResult> sortedResults = Utils.GetSortedTestResults(procedure, testResults, meterPartNr);
IList<TestResult> sortedResults = Utils.GetSortedTestResults(procedure, testResults, meterPartNr);
int ix = 0;
foreach (var testRslt in sortedResults)
{
@@ -362,7 +363,7 @@ namespace TBF.Screens
/// <summary>
/// Get a ListView control filled with results of the meter 'mtr'
/// </summary>
/// <param name="mtr">Water meter number (1-based): 1 .. Program.WMsCount</param>
/// <param name="mtr">Water meter number (1-based): 1 .. Config.Data.WMsCount</param>
/// <returns>ListView object</returns>
ListView GetResultsTestsAreColumns(int mtr, int printedWMNr)
{
@@ -394,7 +395,7 @@ namespace TBF.Screens
}
}
IList<Entities.TestResult> trs = Utils.GetSortedTestResults(procedure, testResults, Utils.PartNr(mtr, combined));
IList<TestResult> trs = Utils.GetSortedTestResults(procedure, testResults, Utils.PartNr(mtr, combined));
foreach (var item in items)
{
@@ -460,7 +461,7 @@ namespace TBF.Screens
void OnProcedureSelected(object sender, ProcedureSelectedEventArgs args)
{
procedure = args.Procedure;
testResults = new List<Entities.TestResult>();
testResults = new List<TestResult>();
RedrawAll();
}
@@ -471,9 +472,8 @@ namespace TBF.Screens
/// Delete an existing testResults with the same test name and repetition number
try
{
Entities.TestResult tr = testResults
.First<Entities.TestResult>(x => (x.TestId == args.TestResult.TestId) &&
(x.RepetitionNr == args.TestResult.RepetitionNr));
TestResult tr = testResults
.First<TestResult>(x => (x.TestId == args.TestResult.TestId) && (x.RepetitionNr == args.TestResult.RepetitionNr));
testResults.Remove(tr);
}
catch { };