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/ProcessTabPageCtrl24.cs
+19 -18
View File
@@ -5,6 +5,7 @@ using System;
using System.Drawing;
using System.Windows.Forms;
using log4net;
using Config.Entities;
using TBF.UiBridge;
using TBF.Resources;
@@ -16,7 +17,7 @@ namespace TBF.Screens
{
static readonly ILog log = LogManager.GetLogger(typeof(ProcessTabPageCtrl24));
Entities.MetersKind currentMetersKind;
MetersKind currentMetersKind;
int textBoxesCount;
@@ -36,7 +37,7 @@ namespace TBF.Screens
/// </summary>
public ProcessTabPageCtrl24()
{
currentMetersKind = Entities.MetersKind.Single;
currentMetersKind = MetersKind.Single;
InitializeComponent();
@@ -83,7 +84,7 @@ namespace TBF.Screens
passed13Label, passed14Label, passed15Label, passed16Label, passed17Label, passed18Label,
passed19Label, passed20Label, passed21Label, passed22Label, passed23Label, passed24Label,
};
ShuffleLabels(Program.WMsCount, Program.LineSize);
ShuffleLabels(Config.Data.WMsCount, Config.Data.LineSize);
Bridge.ProcedureSelectedHandler += delegate(object sndr, ProcedureSelectedEventArgs args)
{
@@ -175,11 +176,11 @@ namespace TBF.Screens
}
void UpdateVisibility(Entities.MetersKind metersKind)
void UpdateVisibility(MetersKind metersKind)
{
bool visible = (metersKind == Entities.MetersKind.Single);
bool visible = (metersKind == MetersKind.Single);
for (int i = 2 * Program.CompoundWMsCount; i < textBoxesCount; i++)
for (int i = 2 * Config.Data.CompoundWMsCount; i < textBoxesCount; i++)
{
meter[i].Visible = visible;
sensor[i].Visible = visible;
@@ -190,9 +191,9 @@ namespace TBF.Screens
passed[i].Visible = visible;
}
groupBox1z.Visible = (metersKind == Entities.MetersKind.Combined) && (Program.CompoundWMsCount >= 1);
groupBox2z.Visible = (metersKind == Entities.MetersKind.Combined) && (Program.CompoundWMsCount >= 2);
groupBox3z.Visible = (metersKind == Entities.MetersKind.Combined) && (Program.CompoundWMsCount >= 3);
groupBox1z.Visible = (metersKind == MetersKind.Combined) && (Config.Data.CompoundWMsCount >= 1);
groupBox2z.Visible = (metersKind == MetersKind.Combined) && (Config.Data.CompoundWMsCount >= 2);
groupBox3z.Visible = (metersKind == MetersKind.Combined) && (Config.Data.CompoundWMsCount >= 3);
}
@@ -223,7 +224,7 @@ namespace TBF.Screens
scaleCmpntLabel.Text = "---";
if (currentMetersKind == Entities.MetersKind.Single)
if (currentMetersKind == MetersKind.Single)
{
watermeterPictureBox1.Visible = true;
watermeterPictureBox2.Visible = true;
@@ -247,7 +248,7 @@ namespace TBF.Screens
sensor[i].Text = "---";
}
}
else if (currentMetersKind == Entities.MetersKind.Combined)
else if (currentMetersKind == MetersKind.Combined)
{
watermeterPictureBox1.Visible = false;
watermeterPictureBox2.Visible = true;
@@ -306,7 +307,7 @@ namespace TBF.Screens
error1Label.Text = "---";
passed1Label.Text = "---";
if (currentMetersKind == Entities.MetersKind.Single)
if (currentMetersKind == MetersKind.Single)
{
for (int i = 0; i < textBoxesCount; i++)
{
@@ -317,7 +318,7 @@ namespace TBF.Screens
passed[i].Text = "---";
}
}
else if (currentMetersKind == Entities.MetersKind.Combined)
else if (currentMetersKind == MetersKind.Combined)
{
for (int i = 0; i < 2; i++)
{
@@ -396,7 +397,7 @@ namespace TBF.Screens
tDivLabel.Text = args.Tdiv.ToString();
/// Bottom part
if (currentMetersKind == Entities.MetersKind.Single)
if (currentMetersKind == MetersKind.Single)
{
for (int i = 0; i < textBoxesCount; i++)
{
@@ -406,7 +407,7 @@ namespace TBF.Screens
error[i].Text = args.TestResult.Meters[i].VolumeErrorPct.ToString("F2");
}
}
else if (currentMetersKind == Entities.MetersKind.Combined)
else if (currentMetersKind == MetersKind.Combined)
{
for (int i = 0; i < 2; i++)
{
@@ -446,7 +447,7 @@ namespace TBF.Screens
void OnTestCompleted(object sender, TestCompletedEventArgs args)
{
Entities.TestResult tRes = args.TestResult;
TestResult tRes = args.TestResult;
tInLabel.Text = tRes.TempInAvrg.ToString("F2");
tOutLabel.Text = tRes.TempOutAvrg.ToString("F2");
@@ -468,7 +469,7 @@ namespace TBF.Screens
volumeCtvLabel.Text = args.TestResult.VolumeCTV.ToString("F1");
refErrorLabel.Text = (tRes.ErrorMaster == 0) ? "---" : tRes.ErrorMaster.ToString("F3");
if (tRes.MetersKind == Entities.MetersKind.Single)
if (tRes.MetersKind == MetersKind.Single)
{
for (int i = 0; i < textBoxesCount; i++)
{
@@ -479,7 +480,7 @@ namespace TBF.Screens
passed[i].Text = tRes.Meters[i].Passed ? Strings.Passed : Strings.Failed;
}
}
else if (tRes.MetersKind == Entities.MetersKind.Combined)
else if (tRes.MetersKind == MetersKind.Combined)
{
pulses1Label.Text = tRes.Meters[0].PulsesMeter.ToString("F0");
pulses2Label.Text = tRes.Meters[1].PulsesMeter.ToString("F0");