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/ProcessTabPageCtrl48.cs
+19 -18
View File
@@ -6,6 +6,7 @@ using System;
using System.Drawing;
using System.Windows.Forms;
using log4net;
using Config.Entities;
using TBF.UiBridge;
using TBF.Resources;
@@ -17,7 +18,7 @@ namespace TBF.Screens
{
static readonly ILog log = LogManager.GetLogger(typeof(ProcessTabPageCtrl48));
Entities.MetersKind currentMetersKind;
MetersKind currentMetersKind;
int textBoxesCount;
@@ -37,7 +38,7 @@ namespace TBF.Screens
/// </summary>
public ProcessTabPageCtrl48()
{
currentMetersKind = Entities.MetersKind.Single;
currentMetersKind = MetersKind.Single;
InitializeComponent();
@@ -112,7 +113,7 @@ namespace TBF.Screens
passed31Label, passed32Label, passed33Label, passed34Label, passed35Label,
passed36Label, passed37Label, passed38Label, passed39Label, passed40Label,
};
ShuffleLabels(Program.WMsCount, Program.LineSize);
ShuffleLabels(Config.Data.WMsCount, Config.Data.LineSize);
Bridge.ProcedureSelectedHandler += delegate(object sndr, ProcedureSelectedEventArgs args)
{
@@ -204,11 +205,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;
@@ -219,9 +220,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);
}
@@ -252,7 +253,7 @@ namespace TBF.Screens
scaleCmpntLabel.Text = "---";
if (currentMetersKind == Entities.MetersKind.Single)
if (currentMetersKind == MetersKind.Single)
{
watermeterPictureBox1.Visible = true;
watermeterPictureBox2.Visible = true;
@@ -276,7 +277,7 @@ namespace TBF.Screens
sensor[i].Text = "---";
}
}
else if (currentMetersKind == Entities.MetersKind.Combined)
else if (currentMetersKind == MetersKind.Combined)
{
watermeterPictureBox1.Visible = false;
watermeterPictureBox2.Visible = true;
@@ -335,7 +336,7 @@ namespace TBF.Screens
error1Label.Text = "---";
passed1Label.Text = "---";
if (currentMetersKind == Entities.MetersKind.Single)
if (currentMetersKind == MetersKind.Single)
{
for (int i = 0; i < textBoxesCount; i++)
{
@@ -346,7 +347,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++)
{
@@ -425,7 +426,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++)
{
@@ -435,7 +436,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++)
{
@@ -475,7 +476,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");
@@ -497,7 +498,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++)
{
@@ -508,7 +509,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");