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

- German translations

Browse Source 
- IBox, FloatBox, IntBox related changes
This commit is contained in:
Milan Hanajik 2014-07-31 22:17:38 +02:00
parent 66feec63de
commit 836daaa5a1
20 changed files with 2169 additions and 2105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
TestBenchFramework/BenchControl/Sequences/SequenceBase.cs
View File

@ -115,14 +115,16 @@ namespace TBF.BenchControl.Sequences
#region Temperature_Pressure_Humidity
protected FloatBox tempIn = new FloatBox(20.0f);
protected FloatBox tempOut = new FloatBox(20.0f);
protected FloatBox tempDiv = new FloatBox(20.0f);
protected FloatBox pressIn = new FloatBox();
protected FloatBox pressOut = new FloatBox();
protected FloatBox airTemperature = new FloatBox(20.0f);
protected FloatBox airPressure = new FloatBox(1.0f);
protected FloatBox airHumidity = new FloatBox(40.0f);
protected FloatBox tempIn = new FloatBox() { Name = "Temperature In", Format = "F1" };
protected FloatBox tempOut = new FloatBox() { Name = "Temperature Out", Format = "F1" };
protected FloatBox tempDiv = new FloatBox() { Name = "Temperature Div", Format = "F1" };
protected FloatBox pressIn = new FloatBox() { Name = "Pressure In", Format = "F1" };
protected FloatBox pressOut = new FloatBox() { Name = "Pressure Out", Format = "F1" };
protected FloatBox airTemperature = new FloatBox() { Name = "Ambient Temperature", Format = "F1" };
protected FloatBox airPressure = new FloatBox() { Name = "Ambient Pressure", Format = "F1" };
protected FloatBox airHumidity = new FloatBox() { Name = "Ambient Humidity", Format = "F1" };
///
protected float tempInSum;
protected float tempOutSum;
@ -181,11 +183,6 @@ namespace TBF.BenchControl.Sequences
#endregion
protected FloatBox measuredFlow = new FloatBox();
protected FloatBox mass = new FloatBox();
protected FloatBox stableMass = new FloatBox();
protected bool ticTac = false;
protected int[] WMPulses = new int[Program.WMsCount];
protected int[] WMRefPulses = new int[Program.WMsCount];
@ -197,6 +194,28 @@ namespace TBF.BenchControl.Sequences
protected IOperation queryEnd2;
protected IOperation checkUiOp;
protected IntBox refCount = new IntBox() { Name = "RefCount" };
protected FloatBox refFreq = new FloatBox() { Name = "RefFreq", Format = "F2" };
protected FloatBox refFlow = new FloatBox() { Name = "RefFlow", Format = "F2" };
protected FloatBox mass = new FloatBox() { Name = "Mass", Format = "F1" };
protected FloatBox startMass = new FloatBox() { Name = "Start Mass", Format = "F1" };
protected FloatBox endMass = new FloatBox() { Name = "End Mass", Format = "F1" };
/// <summary>
/// To clear process values at the beginning of each test
/// </summary>
protected void ClearProcessValues()
{
refCount.Clear();
refFreq.Clear();
refFlow.Clear();
mass.Clear();
startMass.Clear();
endMass.Clear();
}
/// <summary>
/// Empties the tank: opens the emptying valve and measures the weight.
/// </summary>
@ -430,7 +449,7 @@ namespace TBF.BenchControl.Sequences
float refPulsesPerLtr = 7200.0f / outPath.FlowMeter.NominalFlow; /// [pulse/ltr]
data.RefPulses = currentRefPulses;
data.Flow = measuredFlow.Val;
data.Flow = refFlow.Val;
data.Volume = Formulas.VolumeFromPulses(currentRefPulses, refPulsesPerLtr);
data.Time = time;
data.Mass = mass.Val;

4
TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs
View File

@ -92,7 +92,7 @@ namespace TBF.BenchControl.TestMethods.CameraRoiDetection
//--------------------------------
State.Create("RoiDetection : Setting the flow")
.AddOperation(checkUiOp)
.AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, measuredFlow, 600)) /// timeout = 10 min.
.AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, refFlow, 600)) /// timeout = 10 min.
.EnterState();
do
{
@ -105,7 +105,7 @@ namespace TBF.BenchControl.TestMethods.CameraRoiDetection
flow_set:
int time = StateMachine.CurrentTime;
float currentFlow = measuredFlow.Val;
float currentFlow = refFlow.Val;
//------------------------------------------------
Bridge.OnActivity(this, Strings.ROI_Detection_in_Progress);

14
TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs
View File

@ -142,7 +142,7 @@ namespace TBF.BenchControl.TestMethods.CombinedMeters
//--------------------------------
State.Create("CombinedMeters : Setting the flow")
.AddOperation(checkUiOp)
.AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, measuredFlow, 600)) /// timeout = 10 min.
.AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, refFlow, 600)) /// timeout = 10 min.
.EnterState();
do
{
@ -153,7 +153,7 @@ namespace TBF.BenchControl.TestMethods.CombinedMeters
while (!e.Contains(Event.FlowReached));
int time = StateMachine.CurrentTime;
float currentFlow = measuredFlow.Val;
float currentFlow = refFlow.Val;
/// Extract cameras from the current sensors path, add operations to the detection state
IList<IOperation> measureOperations = new List<IOperation>();
@ -169,7 +169,7 @@ namespace TBF.BenchControl.TestMethods.CombinedMeters
State.Create("CombinedMeters : Measuring the start mass")
.AddOperation(checkUiOp)
.AddOperations(measureOperations)
.AddOperation(outPath.Balance.ReadStableMassOp(ref stableMass, 5))
.AddOperation(outPath.Balance.ReadStableMassOp(ref startMass, 5))
.EnterState();
do
{
@ -180,8 +180,8 @@ namespace TBF.BenchControl.TestMethods.CombinedMeters
while (!e.Contains(Event.BalanceDone));
tstRslt.TimeStart = DateTime.Now;
tstRslt.MassStartRaw = stableMass.Val;
mass.Val = stableMass.Val;
tstRslt.MassStartRaw = startMass.Val;
mass.Val = startMass.Val;
//------------------------------------------------
Bridge.OnActivity(this, Strings.Test_in_progress);
@ -264,7 +264,7 @@ namespace TBF.BenchControl.TestMethods.CombinedMeters
//------------------------------------------------
State.Create("CombinedMeters : Measuring the end mass")
.AddOperation(checkUiOp)
.AddOperation(outPath.Balance.ReadStableMassOp(ref stableMass, 5))
.AddOperation(outPath.Balance.ReadStableMassOp(ref endMass, 5))
.EnterState();
do
{
@ -274,7 +274,7 @@ namespace TBF.BenchControl.TestMethods.CombinedMeters
}
while (!e.Contains(Event.BalanceDone));
///
tstRslt.MassEndRaw = stableMass.Val;
tstRslt.MassEndRaw = endMass.Val;
tstRslt.TimeEnd = DateTime.Now;
//------------------------------------------------

18
TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
View File

@ -153,7 +153,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
State.Create("CombinedWithDetection : Set the initial flow")
.AddOperation(checkUiOp)
.AddOperations(measureOperations)
.AddOperation(outPath.RegulValve.SetFlowAndMeasureOp(outPath.FlowMeter, test.Qfrom, test.Qto, measuredFlow, 600, (float)test.TolerRed)) /// timeout = 10 min.
.AddOperation(outPath.RegulValve.SetFlowAndMeasureOp(outPath.FlowMeter, test.Qfrom, test.Qto, refFlow, 600, (float)test.TolerRed)) /// timeout = 10 min.
.EnterState();
do
{
@ -179,7 +179,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
float[] pulseFreqsForDetection = new float[DetectionBufferSize];
/// Current values
flowsForDetection[0] = measuredFlow.Val;
flowsForDetection[0] = refFlow.Val;
pulseFreqsForDetection[0] = 0.0f;
int startTime = StateMachine.CurrentTime;
int lastTime = StateMachine.CurrentTime;
@ -318,7 +318,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
State.Create("CombinedWithDetection : Switching flow detected, going back")
.AddOperation(checkUiOp)
.AddOperations(measureOperations)
.AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, measuredFlow, 600)) /// timeout = 10 min.
.AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, refFlow, 600)) /// timeout = 10 min.
.EnterState();
do
{
@ -333,7 +333,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
//State.Create("set_RV_position",
.AddOperation(checkUiOp)
.AddOperations(measureOperations)
.AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, qfrom_test, qto_test, measuredFlow, 600)) /// timeout = 10 sec.
.AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, qfrom_test, qto_test, refFlow, 600)) /// timeout = 10 sec.
//.AddOp(pOut.RegulValve.SetPositionOp(35.0f, 38.0f, uint.MaxValue))
.EnterState();
do
@ -353,7 +353,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
State.Create(Strings.Measure_the_mass)
.AddOperation(checkUiOp)
.AddOperations(measureOperations)
.AddOperation(outPath.Balance.ReadStableMassOp(ref stableMass, 5))
.AddOperation(outPath.Balance.ReadStableMassOp(ref startMass, 5))
.EnterState();
do
{
@ -364,8 +364,8 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
while (!e.Contains(Event.BalanceDone));
tstRslt.TimeStart = DateTime.Now;
tstRslt.MassStartRaw = stableMass.Val;
mass.Val = stableMass.Val;
tstRslt.MassStartRaw = startMass.Val;
mass.Val = startMass.Val;
//------------------------------------------------
Bridge.OnActivity(this, Strings.Test_in_progress);
@ -448,7 +448,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
//------------------------------------------------
State.Create(Strings.Measure_the_mass)
.AddOperation(checkUiOp)
.AddOperation(outPath.Balance.ReadStableMassOp(ref stableMass, 5))
.AddOperation(outPath.Balance.ReadStableMassOp(ref endMass, 5))
.EnterState();
do
{
@ -458,7 +458,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
}
while (!e.Contains(Event.BalanceDone));
///
tstRslt.MassEndRaw = stableMass.Val;
tstRslt.MassEndRaw = endMass.Val;
tstRslt.TimeEnd = DateTime.Now;
//------------------------------------------------

14
TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
View File

@ -133,7 +133,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
//--------------------------------
State.Create("FlyingStartCollectionMethod : Setting the flow")
.AddOperation(checkUiOp)
.AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, measuredFlow, 600)) /// timeout = 10 min.
.AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, refFlow, 600)) /// timeout = 10 min.
.EnterState();
do
{
@ -146,7 +146,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
flow_set:
int time = StateMachine.CurrentTime;
float currentFlow = measuredFlow.Val;
float currentFlow = refFlow.Val;
/// Extract cameras from the current sensors path, add operations to the detection state
IList<IOperation> measureOperations = new List<IOperation>();
@ -162,7 +162,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
State.Create("FlyingStartCollectionMethod : Measuring the start mass")
.AddOperation(checkUiOp)
.AddOperations(measureOperations)
.AddOperation(outPath.Balance.ReadStableMassOp(ref stableMass, 5))
.AddOperation(outPath.Balance.ReadStableMassOp(ref startMass, 5))
.EnterState();
do
{
@ -173,8 +173,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
while (!e.Contains(Event.BalanceDone));
tstRslt.TimeStart = DateTime.Now;
tstRslt.MassStartRaw = stableMass.Val;
mass.Val = stableMass.Val;
tstRslt.MassStartRaw = startMass.Val;
mass.Val = startMass.Val;
//------------------------------------------------
Bridge.OnActivity(this, Strings.Test_in_progress);
@ -257,7 +257,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
//------------------------------------------------
State.Create("FlyingStartCollectionMethod : Measuring the end mass")
.AddOperation(checkUiOp)
.AddOperation(outPath.Balance.ReadStableMassOp(ref stableMass, 5))
.AddOperation(outPath.Balance.ReadStableMassOp(ref endMass, 5))
.AddOperation(cBrd.UpdateTankWeightOp())
.EnterState();
do
@ -268,7 +268,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
}
while (!e.Contains(Event.BalanceDone));
///
tstRslt.MassEndRaw = stableMass.Val;
tstRslt.MassEndRaw = endMass.Val;
tstRslt.TimeEnd = DateTime.Now;
//------------------------------------------------

99
TestBenchFramework/Boxes/FloatBox.cs
View File

@ -11,10 +11,11 @@
}
/// Box name
private string name;
string name;
public string Name
{
get { return name; }
set { name = value; }
}
/// Validity flag: true = the box value is valid
@ -25,32 +26,15 @@
}
/// <summary> Parameterless constructor </summary>
public FloatBox() { }
public FloatBox()
{
}
/// <summary> Constructor that initializes the value </summary>
public FloatBox(float val) { this.Val = val; }
/// <summary> Constructor that initializes the format </summary>
public FloatBox(string format) { SetFormat(format); }
/// <summary> Constructor that initializes the complex format </summary>
public FloatBox(string name, string format, string formatInvalid, string formatEx)
{
SetFormat(name, format, formatInvalid, formatEx);
}
/// <summary> Constructor that initializes the value and the format </summary>
public FloatBox(float val, string format)
: this(val)
{
SetFormat(format);
}
/// <summary> Constructor that initializes the value and the complex format </summary>
public FloatBox(float val, string name, string format, string formatInvalid, string formatEx)
: this(val)
{
SetFormat(name, format, formatInvalid, formatEx);
}
public FloatBox(float val)
{
this.Val = val;
}
/// <summary>
/// Clear the box value and the valid flag
@ -61,27 +45,19 @@
valid = false;
}
///
/// Specifies a conversion to a string.
/// In the most complex case the conversion is:
/// string.Format(FormatEx, val.ToString(Format))
/// If the value is invalid, the conversion result is 'FormatInvalid'.
///
public string Format = null;
public string FormatEx = "{0}";
public string FormatInvalid = "---";
public float Factor = 1.0f;
public float LimitLo = float.MinValue;
public float LimitHi = float.MaxValue;
/// Specifies a conversion to a string. In the most complex case the conversion is:
/// string.Format(formatEx, val.ToString(format))
/// If the value is invalid, the conversion result is 'formatInvalid'.
string format = null;
string formatInvalid = "---";
string formatEx = "{0}";
/// <summary>
/// Set a basic format for the conversion to a string representation
/// </summary>
public void SetFormat(string format)
{
this.format = format;
}
public void SetFormat(string name, string format, string formatInvalid, string formatEx)
{
this.name = name;
this.format = format;
this.formatInvalid = formatInvalid;
this.formatEx = formatEx;
}
/// <summary>
/// Converts the box value to a string representation
/// </summary>
@ -89,19 +65,18 @@
{
if (!valid)
{
return formatInvalid;
return FormatInvalid;
}
else if (format == null)
else if (Format == null)
{
return string.Format(formatEx, Val);
return string.Format(FormatEx, Val * Factor);
}
else
{
return string.Format(formatEx, Val.ToString(format));
return string.Format(FormatEx, (Val * Factor).ToString(Format));
}
}
/// <summary>
/// Validate the string representation of the box value
/// </summary>
@ -110,8 +85,11 @@
public bool ValidateParam(string strVal)
{
float dummy;
return Utils.TryParseSFloat(strVal, out dummy);
return Utils.TryParseSFloat(strVal, out dummy) &&
((dummy / Factor) >= LimitLo) &&
((dummy / Factor) <= LimitHi);
}
/// <summary>
/// Update the parameter from a string
/// </summary>
@ -120,7 +98,7 @@
{
try
{
Val = Utils.ParseSFloat(strVal);
Val = Utils.ParseSFloat(strVal) / Factor;
}
catch { };
}
@ -128,14 +106,15 @@
public FloatBox Clone()
{
if (valid)
{
return new FloatBox(val, name, format, formatInvalid, formatEx);
}
else
{
return new FloatBox(name, format, formatInvalid, formatEx);
}
FloatBox newFloatBox = new FloatBox();
newFloatBox.name = name;
newFloatBox.val = val;
newFloatBox.valid = valid;
newFloatBox.Format = Format;
newFloatBox.FormatInvalid = FormatInvalid;
newFloatBox.FormatEx = FormatEx;
newFloatBox.Factor = Factor;
return newFloatBox;
}
}
}

13
TestBenchFramework/Boxes/IBox.cs
View File

@ -15,19 +15,6 @@ namespace TBF.Boxes
/// </summary>
bool Valid { get; }
/// <summary>
/// Set the name and the format for a conversion to a string.
/// In the most complex case the conversion is:
/// string.Format(formatEx, val.ToString(format))
/// If the value is invalid, the conversion result is 'formatInvalid'.
/// </summary>
void SetFormat(string name, string format, string formatInvalid, string formatEx);
/// <summary>
/// Set only the basic format. 'formatInvalid' is "---".
/// </summary>
void SetFormat(string format);
/// <summary>
/// Clear the box value and the valid flag
/// </summary>

96
TestBenchFramework/Boxes/IntBox.cs
View File

@ -17,7 +17,8 @@ namespace TBF.Boxes
public string Name
{
get { return name; }
}
set { name = value; }
}
/// Validity flag: true = the box value is valid
private bool valid = false;
@ -27,32 +28,15 @@ namespace TBF.Boxes
}
/// <summary> Parameterless constructor </summary>
public IntBox() { }
public IntBox()
{
}
/// <summary> Constructor that initializes the value </summary>
public IntBox(int val) { this.Val = val; }
/// <summary> Constructor that initializes the format </summary>
public IntBox(string format) { SetFormat(format); }
/// <summary> Constructor that initializes the complex format </summary>
public IntBox(string name, string format, string formatInvalid, string formatEx)
{
SetFormat(name, format, formatInvalid, formatEx);
}
/// <summary> Constructor that initializes the value and the format </summary>
public IntBox(int val, string format)
: this(val)
{
SetFormat(format);
}
/// <summary> Constructor that initializes the value and the complex format </summary>
public IntBox(int val, string name, string format, string formatInvalid, string formatEx)
: this(val)
{
SetFormat(name, format, formatInvalid, formatEx);
}
public IntBox(int val)
{
this.Val = val;
}
/// <summary>
/// Clear the box value and the valid flag
@ -63,46 +47,37 @@ namespace TBF.Boxes
valid = false;
}
///
/// Specifies a conversion to a string.
/// In the most complex case the conversion is:
/// string.Format(FormatEx, val.ToString(Format))
/// If the value is invalid, the conversion result is 'FormatInvalid'.
///
public string Format = null;
public string FormatEx = "{0}";
public string FormatInvalid = "---";
public float LimitLo = int.MinValue;
public float LimitHi = int.MaxValue;
/// Format for a conversion to a string. In the most complex case the conversion is:
/// string.Format(FormatEx, val.ToString(Format))
string format = null;
string formatInvalid = "---";
string formatEx = "{0}";
/// <summary>
/// Set a format for the conversion to a string representation
/// </summary>
public void SetFormat(string format)
{
this.format = format;
}
public void SetFormat(string name, string format, string formatInvalid, string formatEx)
{
this.name = name;
this.format = format;
this.formatInvalid = formatInvalid;
this.formatEx = formatEx;
}
/// <summary>
/// <summary>
/// Converts the box value to a string representation
/// </summary>
public override string ToString()
{
if (!valid)
{
return formatInvalid;
return FormatInvalid;
}
else if (format == null)
else if (Format == null)
{
return string.Format(formatEx, Val);
return string.Format(FormatEx, Val);
}
else
{
return string.Format(formatEx, Val.ToString(format));
return string.Format(FormatEx, Val.ToString(Format));
}
}
/// <summary>
/// Validates the string representation of the box value
/// </summary>
@ -111,8 +86,9 @@ namespace TBF.Boxes
public bool ValidateParam(string strVal)
{
int dummy;
return int.TryParse(strVal, out dummy);
return int.TryParse(strVal, out dummy) && (dummy >= LimitLo) && (dummy <= LimitHi);
}
/// <summary>
/// Update the parameter from a string
/// </summary>
@ -129,14 +105,14 @@ namespace TBF.Boxes
public IntBox Clone()
{
if (valid)
{
return new IntBox(val, name, format, formatInvalid, formatEx);
}
else
{
return new IntBox(name, format, formatInvalid, formatEx);
}
}
IntBox newFloatBox = new IntBox();
newFloatBox.name = name;
newFloatBox.val = val;
newFloatBox.valid = valid;
newFloatBox.Format = Format;
newFloatBox.FormatInvalid = FormatInvalid;
newFloatBox.FormatEx = FormatEx;
return newFloatBox;
}
}
}

145
TestBenchFramework/MainWnd.Designer.cs generated
View File

@ -37,12 +37,14 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainWnd));
this.verticalSplitContainer = new System.Windows.Forms.SplitContainer();
this.horizontalSplitContainer = new System.Windows.Forms.SplitContainer();
this.descriptionGroupBox = new System.Windows.Forms.GroupBox();
this.descriptionLabel = new System.Windows.Forms.Label();
this.progressGroupBox = new System.Windows.Forms.GroupBox();
this.mainProgressBar = new System.Windows.Forms.ProgressBar();
this.activityGroupBox = new System.Windows.Forms.GroupBox();
this.activityLabel = new System.Windows.Forms.Label();
this.procedureGroupBox = new System.Windows.Forms.GroupBox();
this.procedureComboBox = new System.Windows.Forms.ComboBox();
this.activityGroupBox = new System.Windows.Forms.GroupBox();
this.activityLabel = new System.Windows.Forms.Label();
this.mainTabControl = new System.Windows.Forms.TabControl();
this.homeTabPage = new System.Windows.Forms.TabPage();
this.ctrlBrdComponent = new ControlComponent3Munich.UserControl1();
@ -93,9 +95,10 @@
this.horizontalSplitContainer.Panel1.SuspendLayout();
this.horizontalSplitContainer.Panel2.SuspendLayout();
this.horizontalSplitContainer.SuspendLayout();
this.descriptionGroupBox.SuspendLayout();
this.progressGroupBox.SuspendLayout();
this.activityGroupBox.SuspendLayout();
this.procedureGroupBox.SuspendLayout();
this.activityGroupBox.SuspendLayout();
this.mainTabControl.SuspendLayout();
this.homeTabPage.SuspendLayout();
this.processTabPage.SuspendLayout();
@ -118,10 +121,12 @@
//
// verticalSplitContainer.Panel1
//
resources.ApplyResources(this.verticalSplitContainer.Panel1, "verticalSplitContainer.Panel1");
this.verticalSplitContainer.Panel1.Controls.Add(this.horizontalSplitContainer);
//
// verticalSplitContainer.Panel2
//
resources.ApplyResources(this.verticalSplitContainer.Panel2, "verticalSplitContainer.Panel2");
this.verticalSplitContainer.Panel2.Controls.Add(this.rightHorizSplitContainer);
//
// horizontalSplitContainer
@ -132,19 +137,34 @@
//
// horizontalSplitContainer.Panel1
//
resources.ApplyResources(this.horizontalSplitContainer.Panel1, "horizontalSplitContainer.Panel1");
this.horizontalSplitContainer.Panel1.BackColor = System.Drawing.SystemColors.Control;
this.horizontalSplitContainer.Panel1.Controls.Add(this.descriptionGroupBox);
this.horizontalSplitContainer.Panel1.Controls.Add(this.progressGroupBox);
this.horizontalSplitContainer.Panel1.Controls.Add(this.procedureGroupBox);
this.horizontalSplitContainer.Panel1.Controls.Add(this.activityGroupBox);
//
// horizontalSplitContainer.Panel2
//
resources.ApplyResources(this.horizontalSplitContainer.Panel2, "horizontalSplitContainer.Panel2");
this.horizontalSplitContainer.Panel2.Controls.Add(this.mainTabControl);
//
// descriptionGroupBox
//
resources.ApplyResources(this.descriptionGroupBox, "descriptionGroupBox");
this.descriptionGroupBox.Controls.Add(this.descriptionLabel);
this.descriptionGroupBox.Name = "descriptionGroupBox";
this.descriptionGroupBox.TabStop = false;
//
// descriptionLabel
//
resources.ApplyResources(this.descriptionLabel, "descriptionLabel");
this.descriptionLabel.Name = "descriptionLabel";
//
// progressGroupBox
//
this.progressGroupBox.Controls.Add(this.mainProgressBar);
resources.ApplyResources(this.progressGroupBox, "progressGroupBox");
this.progressGroupBox.Controls.Add(this.mainProgressBar);
this.progressGroupBox.Name = "progressGroupBox";
this.progressGroupBox.TabStop = false;
//
@ -153,22 +173,10 @@
resources.ApplyResources(this.mainProgressBar, "mainProgressBar");
this.mainProgressBar.Name = "mainProgressBar";
//
// activityGroupBox
//
this.activityGroupBox.Controls.Add(this.activityLabel);
resources.ApplyResources(this.activityGroupBox, "activityGroupBox");
this.activityGroupBox.Name = "activityGroupBox";
this.activityGroupBox.TabStop = false;
//
// activityLabel
//
resources.ApplyResources(this.activityLabel, "activityLabel");
this.activityLabel.Name = "activityLabel";
//
// procedureGroupBox
//
this.procedureGroupBox.Controls.Add(this.procedureComboBox);
resources.ApplyResources(this.procedureGroupBox, "procedureGroupBox");
this.procedureGroupBox.Controls.Add(this.procedureComboBox);
this.procedureGroupBox.Name = "procedureGroupBox";
this.procedureGroupBox.TabStop = false;
//
@ -179,8 +187,21 @@
this.procedureComboBox.Name = "procedureComboBox";
this.procedureComboBox.SelectedIndexChanged += new System.EventHandler(this.procedureComboBox_SelectedIndexChanged);
//
// activityGroupBox
//
resources.ApplyResources(this.activityGroupBox, "activityGroupBox");
this.activityGroupBox.Controls.Add(this.activityLabel);
this.activityGroupBox.Name = "activityGroupBox";
this.activityGroupBox.TabStop = false;
//
// activityLabel
//
resources.ApplyResources(this.activityLabel, "activityLabel");
this.activityLabel.Name = "activityLabel";
//
// mainTabControl
//
resources.ApplyResources(this.mainTabControl, "mainTabControl");
this.mainTabControl.Controls.Add(this.homeTabPage);
this.mainTabControl.Controls.Add(this.processTabPage);
this.mainTabControl.Controls.Add(this.measurementTabPage);
@ -188,93 +209,92 @@
this.mainTabControl.Controls.Add(this.picturesTabPage);
this.mainTabControl.Controls.Add(this.resultsTabPage);
this.mainTabControl.Controls.Add(this.logsTabPage);
resources.ApplyResources(this.mainTabControl, "mainTabControl");
this.mainTabControl.Name = "mainTabControl";
this.mainTabControl.SelectedIndex = 0;
this.mainTabControl.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
//
// homeTabPage
//
resources.ApplyResources(this.homeTabPage, "homeTabPage");
this.homeTabPage.BackColor = System.Drawing.SystemColors.Control;
this.homeTabPage.Controls.Add(this.ctrlBrdComponent);
resources.ApplyResources(this.homeTabPage, "homeTabPage");
this.homeTabPage.Name = "homeTabPage";
//
// ctrlBrdComponent
//
this.ctrlBrdComponent.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
resources.ApplyResources(this.ctrlBrdComponent, "ctrlBrdComponent");
this.ctrlBrdComponent.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.ctrlBrdComponent.Name = "ctrlBrdComponent";
//
// processTabPage
//
this.processTabPage.Controls.Add(this.processTabPageCtrl);
resources.ApplyResources(this.processTabPage, "processTabPage");
this.processTabPage.Controls.Add(this.processTabPageCtrl);
this.processTabPage.Name = "processTabPage";
this.processTabPage.UseVisualStyleBackColor = true;
//
// processTabPageCtrl
//
this.processTabPageCtrl.BackColor = System.Drawing.SystemColors.Control;
resources.ApplyResources(this.processTabPageCtrl, "processTabPageCtrl");
this.processTabPageCtrl.BackColor = System.Drawing.SystemColors.Control;
this.processTabPageCtrl.Name = "processTabPageCtrl";
//
// measurementTabPage
//
this.measurementTabPage.Controls.Add(this.MeasurementTabPageCtrl);
resources.ApplyResources(this.measurementTabPage, "measurementTabPage");
this.measurementTabPage.Controls.Add(this.MeasurementTabPageCtrl);
this.measurementTabPage.Name = "measurementTabPage";
this.measurementTabPage.UseVisualStyleBackColor = true;
//
// MeasurementTabPageCtrl
//
this.MeasurementTabPageCtrl.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(150)))), ((int)(((byte)(180)))), ((int)(((byte)(200)))));
resources.ApplyResources(this.MeasurementTabPageCtrl, "MeasurementTabPageCtrl");
this.MeasurementTabPageCtrl.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(150)))), ((int)(((byte)(180)))), ((int)(((byte)(200)))));
this.MeasurementTabPageCtrl.Name = "MeasurementTabPageCtrl";
//
// insertTabPage
//
this.insertTabPage.BackColor = System.Drawing.Color.Silver;
resources.ApplyResources(this.insertTabPage, "insertTabPage");
this.insertTabPage.BackColor = System.Drawing.Color.Silver;
this.insertTabPage.Name = "insertTabPage";
//
// picturesTabPage
//
this.picturesTabPage.Controls.Add(this.picturesTabPageCtrl1);
resources.ApplyResources(this.picturesTabPage, "picturesTabPage");
this.picturesTabPage.Controls.Add(this.picturesTabPageCtrl1);
this.picturesTabPage.Name = "picturesTabPage";
this.picturesTabPage.UseVisualStyleBackColor = true;
//
// picturesTabPageCtrl1
//
this.picturesTabPageCtrl1.BackColor = System.Drawing.Color.Silver;
resources.ApplyResources(this.picturesTabPageCtrl1, "picturesTabPageCtrl1");
this.picturesTabPageCtrl1.BackColor = System.Drawing.Color.Silver;
this.picturesTabPageCtrl1.Name = "picturesTabPageCtrl1";
//
// resultsTabPage
//
this.resultsTabPage.Controls.Add(this.resultsTabPageCtrl);
resources.ApplyResources(this.resultsTabPage, "resultsTabPage");
this.resultsTabPage.Controls.Add(this.resultsTabPageCtrl);
this.resultsTabPage.Name = "resultsTabPage";
this.resultsTabPage.UseVisualStyleBackColor = true;
//
// resultsTabPageCtrl
//
this.resultsTabPageCtrl.BackColor = System.Drawing.SystemColors.Control;
resources.ApplyResources(this.resultsTabPageCtrl, "resultsTabPageCtrl");
this.resultsTabPageCtrl.BackColor = System.Drawing.SystemColors.Control;
this.resultsTabPageCtrl.Name = "resultsTabPageCtrl";
//
// logsTabPage
//
this.logsTabPage.Controls.Add(this.logsTabPageCtrl);
resources.ApplyResources(this.logsTabPage, "logsTabPage");
this.logsTabPage.Controls.Add(this.logsTabPageCtrl);
this.logsTabPage.Name = "logsTabPage";
this.logsTabPage.UseVisualStyleBackColor = true;
//
// logsTabPageCtrl
//
this.logsTabPageCtrl.BackColor = System.Drawing.SystemColors.Control;
resources.ApplyResources(this.logsTabPageCtrl, "logsTabPageCtrl");
this.logsTabPageCtrl.BackColor = System.Drawing.SystemColors.Control;
this.logsTabPageCtrl.Name = "logsTabPageCtrl";
//
// rightHorizSplitContainer
@ -285,7 +305,12 @@
//
// rightHorizSplitContainer.Panel1
//
resources.ApplyResources(this.rightHorizSplitContainer.Panel1, "rightHorizSplitContainer.Panel1");
this.rightHorizSplitContainer.Panel1.Controls.Add(this.progressFlowLayoutPanel);
//
// rightHorizSplitContainer.Panel2
//
resources.ApplyResources(this.rightHorizSplitContainer.Panel2, "rightHorizSplitContainer.Panel2");
this.rightHorizSplitContainer.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.rightHorizSplitContainer_SplitterMoved);
//
// progressFlowLayoutPanel
@ -296,24 +321,25 @@
//
// statusStrip1
//
resources.ApplyResources(this.statusStrip1, "statusStrip1");
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.userInfoStatusLabel,
this.activityStatusLabel});
resources.ApplyResources(this.statusStrip1, "statusStrip1");
this.statusStrip1.Name = "statusStrip1";
//
// userInfoStatusLabel
//
this.userInfoStatusLabel.Name = "userInfoStatusLabel";
resources.ApplyResources(this.userInfoStatusLabel, "userInfoStatusLabel");
this.userInfoStatusLabel.Name = "userInfoStatusLabel";
//
// activityStatusLabel
//
this.activityStatusLabel.Name = "activityStatusLabel";
resources.ApplyResources(this.activityStatusLabel, "activityStatusLabel");
this.activityStatusLabel.Name = "activityStatusLabel";
//
// benchTSMenuItem
//
resources.ApplyResources(this.benchTSMenuItem, "benchTSMenuItem");
this.benchTSMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.benchComponentsTSMenuItem,
this.benchPathsTSMenuItem,
@ -322,114 +348,114 @@
this.toolStripSeparator1,
this.exitToolStripMenuItem});
this.benchTSMenuItem.Name = "benchTSMenuItem";
resources.ApplyResources(this.benchTSMenuItem, "benchTSMenuItem");
//
// benchComponentsTSMenuItem
//
this.benchComponentsTSMenuItem.Name = "benchComponentsTSMenuItem";
resources.ApplyResources(this.benchComponentsTSMenuItem, "benchComponentsTSMenuItem");
this.benchComponentsTSMenuItem.Name = "benchComponentsTSMenuItem";
this.benchComponentsTSMenuItem.Click += new System.EventHandler(this.benchComponentsTSMItem_Click);
//
// benchPathsTSMenuItem
//
this.benchPathsTSMenuItem.Name = "benchPathsTSMenuItem";
resources.ApplyResources(this.benchPathsTSMenuItem, "benchPathsTSMenuItem");
this.benchPathsTSMenuItem.Name = "benchPathsTSMenuItem";
this.benchPathsTSMenuItem.Click += new System.EventHandler(this.benchPathsTSMItem_Click);
//
// benchTransitionsToolStripMenuItem
//
this.benchTransitionsToolStripMenuItem.Name = "benchTransitionsToolStripMenuItem";
resources.ApplyResources(this.benchTransitionsToolStripMenuItem, "benchTransitionsToolStripMenuItem");
this.benchTransitionsToolStripMenuItem.Name = "benchTransitionsToolStripMenuItem";
this.benchTransitionsToolStripMenuItem.Click += new System.EventHandler(this.benchTransitionsTSMItem_Click);
//
// benchMetrologyTSMenuItem
//
this.benchMetrologyTSMenuItem.Name = "benchMetrologyTSMenuItem";
resources.ApplyResources(this.benchMetrologyTSMenuItem, "benchMetrologyTSMenuItem");
this.benchMetrologyTSMenuItem.Name = "benchMetrologyTSMenuItem";
this.benchMetrologyTSMenuItem.Click += new System.EventHandler(this.benchMetrologyTSMItem_Click);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1");
this.toolStripSeparator1.Name = "toolStripSeparator1";
//
// exitToolStripMenuItem
//
this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
resources.ApplyResources(this.exitToolStripMenuItem, "exitToolStripMenuItem");
this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
//
// homeTSMenuItem
//
this.homeTSMenuItem.Name = "homeTSMenuItem";
resources.ApplyResources(this.homeTSMenuItem, "homeTSMenuItem");
this.homeTSMenuItem.Name = "homeTSMenuItem";
this.homeTSMenuItem.Click += new System.EventHandler(this.homeTSMenuItem_Click);
//
// measurementTSMenuItem
//
this.measurementTSMenuItem.Name = "measurementTSMenuItem";
resources.ApplyResources(this.measurementTSMenuItem, "measurementTSMenuItem");
this.measurementTSMenuItem.Name = "measurementTSMenuItem";
this.measurementTSMenuItem.Click += new System.EventHandler(this.measurementTSMenuItem_Click);
//
// resultsTSMenuItem
//
this.resultsTSMenuItem.Name = "resultsTSMenuItem";
resources.ApplyResources(this.resultsTSMenuItem, "resultsTSMenuItem");
this.resultsTSMenuItem.Name = "resultsTSMenuItem";
//
// logsTSMenuItem
//
this.logsTSMenuItem.Name = "logsTSMenuItem";
resources.ApplyResources(this.logsTSMenuItem, "logsTSMenuItem");
this.logsTSMenuItem.Name = "logsTSMenuItem";
this.logsTSMenuItem.Click += new System.EventHandler(this.logsTSMenuItem_Click);
//
// editTSMenuItem
//
resources.ApplyResources(this.editTSMenuItem, "editTSMenuItem");
this.editTSMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.usersTSMenuItem,
this.localSettingsTSMenuItem,
this.databaseSettingsTSMenuItem,
this.passwortToolStripMenuItem});
this.editTSMenuItem.Name = "editTSMenuItem";
resources.ApplyResources(this.editTSMenuItem, "editTSMenuItem");
//
// usersTSMenuItem
//
this.usersTSMenuItem.Name = "usersTSMenuItem";
resources.ApplyResources(this.usersTSMenuItem, "usersTSMenuItem");
this.usersTSMenuItem.Name = "usersTSMenuItem";
this.usersTSMenuItem.Click += new System.EventHandler(this.usersTSMItem_Click);
//
// localSettingsTSMenuItem
//
this.localSettingsTSMenuItem.Name = "localSettingsTSMenuItem";
resources.ApplyResources(this.localSettingsTSMenuItem, "localSettingsTSMenuItem");
this.localSettingsTSMenuItem.Name = "localSettingsTSMenuItem";
this.localSettingsTSMenuItem.Click += new System.EventHandler(this.localSettingsTSMItem_Click);
//
// databaseSettingsTSMenuItem
//
this.databaseSettingsTSMenuItem.Name = "databaseSettingsTSMenuItem";
resources.ApplyResources(this.databaseSettingsTSMenuItem, "databaseSettingsTSMenuItem");
this.databaseSettingsTSMenuItem.Name = "databaseSettingsTSMenuItem";
this.databaseSettingsTSMenuItem.Click += new System.EventHandler(this.databaseSettingsTSMItem_Click);
//
// passwortToolStripMenuItem
//
this.passwortToolStripMenuItem.Name = "passwortToolStripMenuItem";
resources.ApplyResources(this.passwortToolStripMenuItem, "passwortToolStripMenuItem");
this.passwortToolStripMenuItem.Name = "passwortToolStripMenuItem";
//
// helpTSMenuItem
//
resources.ApplyResources(this.helpTSMenuItem, "helpTSMenuItem");
this.helpTSMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.aboutTSMenuItem});
this.helpTSMenuItem.Name = "helpTSMenuItem";
resources.ApplyResources(this.helpTSMenuItem, "helpTSMenuItem");
//
// aboutTSMenuItem
//
this.aboutTSMenuItem.Name = "aboutTSMenuItem";
resources.ApplyResources(this.aboutTSMenuItem, "aboutTSMenuItem");
this.aboutTSMenuItem.Name = "aboutTSMenuItem";
this.aboutTSMenuItem.Click += new System.EventHandler(this.aboutTSMItem_Click);
//
// mainMenuStrip
//
resources.ApplyResources(this.mainMenuStrip, "mainMenuStrip");
this.mainMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.benchTSMenuItem,
this.proceduresToolStripMenuItem,
@ -441,31 +467,30 @@
this.logsTSMenuItem,
this.editTSMenuItem,
this.helpTSMenuItem});
resources.ApplyResources(this.mainMenuStrip, "mainMenuStrip");
this.mainMenuStrip.Name = "mainMenuStrip";
//
// proceduresToolStripMenuItem
//
this.proceduresToolStripMenuItem.Name = "proceduresToolStripMenuItem";
resources.ApplyResources(this.proceduresToolStripMenuItem, "proceduresToolStripMenuItem");
this.proceduresToolStripMenuItem.Name = "proceduresToolStripMenuItem";
this.proceduresToolStripMenuItem.Click += new System.EventHandler(this.proceduresTSMItem_Click);
//
// processToolStripMenuItem
//
this.processToolStripMenuItem.Name = "processToolStripMenuItem";
resources.ApplyResources(this.processToolStripMenuItem, "processToolStripMenuItem");
this.processToolStripMenuItem.Name = "processToolStripMenuItem";
this.processToolStripMenuItem.Click += new System.EventHandler(this.processTSMenuItem_Click);
//
// picturesTSMItem
//
this.picturesTSMItem.Name = "picturesTSMItem";
resources.ApplyResources(this.picturesTSMItem, "picturesTSMItem");
this.picturesTSMItem.Name = "picturesTSMItem";
this.picturesTSMItem.Click += new System.EventHandler(this.picturesTSMItem_Click);
//
// resultsToolStripMenuItem
//
this.resultsToolStripMenuItem.Name = "resultsToolStripMenuItem";
resources.ApplyResources(this.resultsToolStripMenuItem, "resultsToolStripMenuItem");
this.resultsToolStripMenuItem.Name = "resultsToolStripMenuItem";
this.resultsToolStripMenuItem.Click += new System.EventHandler(this.resultsTSMenuItem_Click);
//
// MainWnd
@ -490,10 +515,12 @@
this.horizontalSplitContainer.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.horizontalSplitContainer)).EndInit();
this.horizontalSplitContainer.ResumeLayout(false);
this.descriptionGroupBox.ResumeLayout(false);
this.descriptionGroupBox.PerformLayout();
this.progressGroupBox.ResumeLayout(false);
this.procedureGroupBox.ResumeLayout(false);
this.activityGroupBox.ResumeLayout(false);
this.activityGroupBox.PerformLayout();
this.procedureGroupBox.ResumeLayout(false);
this.mainTabControl.ResumeLayout(false);
this.homeTabPage.ResumeLayout(false);
this.processTabPage.ResumeLayout(false);
@ -573,6 +600,8 @@
private Screens.PicturesTabPageCtrl picturesTabPageCtrl1;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem;
private System.Windows.Forms.GroupBox descriptionGroupBox;
private System.Windows.Forms.Label descriptionLabel;
}
}

4
TestBenchFramework/MainWnd.cs
View File

@ -338,6 +338,10 @@ namespace TBF
{
ProcedureName = procedureComboBox.Text;
BenchControlPanel.ReloadTests();
if (CurrentProcedure != null && CurrentProcedure.Description != null)
{
descriptionLabel.Text = CurrentProcedure.Description;
}
if (CurrentProcedure != null && testProgressControls != null)
{
testProgressControls.ProcedureSelectedInUI(this, new UiBridge.ProcedureSelectedEventArgs(CurrentProcedure));

53
TestBenchFramework/MainWnd.de.resx
View File

@ -119,7 +119,7 @@
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="mainTabControl.Size" type="System.Drawing.Size, System.Drawing">
<value>1020, 562</value>
<value>1020, 542</value>
</data>
<data name="horizontalSplitContainer.Size" type="System.Drawing.Size, System.Drawing">
<value>1020, 666</value>
@ -131,43 +131,43 @@
<value>1254, 666</value>
</data>
<data name="homeTabPage.Size" type="System.Drawing.Size, System.Drawing">
<value>1012, 553</value>
<value>1012, 533</value>
</data>
<data name="ctrlBrdComponent.Size" type="System.Drawing.Size, System.Drawing">
<value>1012, 553</value>
<value>1012, 533</value>
</data>
<data name="processTabPage.Size" type="System.Drawing.Size, System.Drawing">
<value>1012, 553</value>
<value>1012, 533</value>
</data>
<data name="processTabPageCtrl.Size" type="System.Drawing.Size, System.Drawing">
<value>1012, 553</value>
<value>1012, 533</value>
</data>
<data name="measurementTabPage.Size" type="System.Drawing.Size, System.Drawing">
<value>1012, 553</value>
<value>1012, 533</value>
</data>
<data name="MeasurementTabPageCtrl.Size" type="System.Drawing.Size, System.Drawing">
<value>1012, 553</value>
<value>1012, 533</value>
</data>
<data name="insertTabPage.Size" type="System.Drawing.Size, System.Drawing">
<value>1012, 553</value>
<value>1012, 533</value>
</data>
<data name="picturesTabPage.Size" type="System.Drawing.Size, System.Drawing">
<value>1012, 553</value>
<value>1012, 533</value>
</data>
<data name="picturesTabPageCtrl1.Size" type="System.Drawing.Size, System.Drawing">
<value>1012, 553</value>
<value>1012, 533</value>
</data>
<data name="resultsTabPage.Size" type="System.Drawing.Size, System.Drawing">
<value>1012, 553</value>
<value>1012, 533</value>
</data>
<data name="resultsTabPageCtrl.Size" type="System.Drawing.Size, System.Drawing">
<value>1012, 553</value>
<value>1012, 533</value>
</data>
<data name="logsTabPage.Size" type="System.Drawing.Size, System.Drawing">
<value>1012, 553</value>
<value>1012, 533</value>
</data>
<data name="logsTabPageCtrl.Size" type="System.Drawing.Size, System.Drawing">
<value>1012, 553</value>
<value>1012, 533</value>
</data>
<data name="statusStrip1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 690</value>
@ -195,34 +195,34 @@
<value>Prüfstand</value>
</data>
<data name="benchComponentsTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
<value>150, 22</value>
</data>
<data name="benchComponentsTSMenuItem.Text" xml:space="preserve">
<value>Komponenten</value>
</data>
<data name="benchPathsTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
<value>150, 22</value>
</data>
<data name="benchPathsTSMenuItem.Text" xml:space="preserve">
<value>Pfade</value>
</data>
<data name="benchTransitionsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
<value>150, 22</value>
</data>
<data name="benchTransitionsToolStripMenuItem.Text" xml:space="preserve">
<value>Übergänge</value>
</data>
<data name="benchMetrologyTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
<value>150, 22</value>
</data>
<data name="benchMetrologyTSMenuItem.Text" xml:space="preserve">
<value>Metrologie</value>
</data>
<data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
<value>149, 6</value>
<value>147, 6</value>
</data>
<data name="exitToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
<value>150, 22</value>
</data>
<data name="exitToolStripMenuItem.Text" xml:space="preserve">
<value>Beenden</value>
@ -296,6 +296,12 @@
<data name="proceduresToolStripMenuItem.Text" xml:space="preserve">
<value>Prüfungen</value>
</data>
<data name="processToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>58, 20</value>
</data>
<data name="processToolStripMenuItem.Text" xml:space="preserve">
<value>Prozess</value>
</data>
<data name="picturesTSMItem.Size" type="System.Drawing.Size, System.Drawing">
<value>49, 20</value>
</data>
@ -303,12 +309,15 @@
<value>Bilder</value>
</data>
<data name="resultsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>70, 20</value>
<value>75, 20</value>
</data>
<data name="resultsToolStripMenuItem.Text" xml:space="preserve">
<value>Ergebnise</value>
<value>Ergebnisse</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>1254, 712</value>
</data>
<data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>Inherit</value>
</data>
</root>

2047
TestBenchFramework/MainWnd.resx
View File

File diff suppressed because it is too large Load Diff

5
TestBenchFramework/ProcedureDlg.Designer.cs generated
View File

@ -139,7 +139,6 @@
this.generalTabPage.Controls.Add(this.label12);
this.generalTabPage.Controls.Add(this.procNameTextBox);
this.generalTabPage.Controls.Add(this.label1);
this.generalTabPage.ImageKey = global::TBF.Resources.Strings.String1;
this.generalTabPage.Name = "generalTabPage";
this.generalTabPage.ToolTipText = global::TBF.Resources.Strings.String1;
this.generalTabPage.UseVisualStyleBackColor = true;
@ -296,7 +295,6 @@
//
resources.ApplyResources(this.historyTabPage, "historyTabPage");
this.historyTabPage.Controls.Add(this.historyListViewEx);
this.historyTabPage.ImageKey = global::TBF.Resources.Strings.String1;
this.historyTabPage.Name = "historyTabPage";
this.historyTabPage.ToolTipText = global::TBF.Resources.Strings.String1;
this.historyTabPage.UseVisualStyleBackColor = true;
@ -332,7 +330,6 @@
//
resources.ApplyResources(this.metrology1TabPage, "metrology1TabPage");
this.metrology1TabPage.Controls.Add(this.metrology1ListViewEx);
this.metrology1TabPage.ImageKey = global::TBF.Resources.Strings.String1;
this.metrology1TabPage.Name = "metrology1TabPage";
this.metrology1TabPage.ToolTipText = global::TBF.Resources.Strings.String1;
this.metrology1TabPage.UseVisualStyleBackColor = true;
@ -353,7 +350,6 @@
//
resources.ApplyResources(this.metrology2TabPage, "metrology2TabPage");
this.metrology2TabPage.Controls.Add(this.metrology2ListViewEx);
this.metrology2TabPage.ImageKey = global::TBF.Resources.Strings.String1;
this.metrology2TabPage.Name = "metrology2TabPage";
this.metrology2TabPage.ToolTipText = global::TBF.Resources.Strings.String1;
this.metrology2TabPage.UseVisualStyleBackColor = true;
@ -374,7 +370,6 @@
//
resources.ApplyResources(this.processTabPage, "processTabPage");
this.processTabPage.Controls.Add(this.processListViewEx);
this.processTabPage.ImageKey = global::TBF.Resources.Strings.String1;
this.processTabPage.Name = "processTabPage";
this.processTabPage.ToolTipText = global::TBF.Resources.Strings.String1;
this.processTabPage.UseVisualStyleBackColor = true;

2
TestBenchFramework/ProcedureDlg.de.resx
View File

@ -320,7 +320,7 @@
<value>923, 371</value>
</data>
<data name="processTabPage.Text" xml:space="preserve">
<value> Prozess </value>
<value> Prüfstrecke </value>
</data>
<data name="tabControl.Size" type="System.Drawing.Size, System.Drawing">
<value>931, 409</value>

63
TestBenchFramework/ProcedureDlg.resx
View File

@ -134,22 +134,16 @@
<data name="label13.Location" type="System.Drawing.Point, System.Drawing">
<value>24, 90</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="metrology1ListViewEx.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;generalTabPage.Parent" xml:space="preserve">
<value>tabControl</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="metrology2ListViewEx.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="label16.TabIndex" type="System.Int32, mscorlib">
<value>10</value>
</data>
<data name="&gt;&gt;mainSplitContainer.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;resultsPrinterLabel.Parent" xml:space="preserve">
<value>generalTabPage</value>
</data>
@ -306,6 +300,9 @@
<data name="transitionStartComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>139, 283</value>
</data>
<data name="&gt;&gt;resultsWriterLabel.Parent" xml:space="preserve">
<value>generalTabPage</value>
</data>
<data name="&gt;&gt;transitionEndLabel.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
@ -351,6 +348,9 @@
<data name="changedByClmnHdr.Text" xml:space="preserve">
<value>Changed by</value>
</data>
<data name="metrology1TabPage.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="dataEntryLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>57, 13</value>
</data>
@ -387,6 +387,9 @@
<data name="&gt;&gt;metrology2ListViewEx.Type" xml:space="preserve">
<value>TBF.UiControls.ListViewEx, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;resultsPrinterComboBox.Name" xml:space="preserve">
<value>resultsPrinterComboBox</value>
</data>
<data name="metrology1ListViewEx.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
@ -423,6 +426,9 @@
<data name="&gt;&gt;metrology1TabPage.Parent" xml:space="preserve">
<value>tabControl</value>
</data>
<data name="label14.Location" type="System.Drawing.Point, System.Drawing">
<value>291, 90</value>
</data>
<data name="label15.TabIndex" type="System.Int32, mscorlib">
<value>12</value>
</data>
@ -444,9 +450,6 @@
<data name="&gt;&gt;createdOnTextBox.Name" xml:space="preserve">
<value>createdOnTextBox</value>
</data>
<data name="&gt;&gt;metrology1ListViewEx.Name" xml:space="preserve">
<value>metrology1ListViewEx</value>
</data>
<data name="notesTextBox.TabIndex" type="System.Int32, mscorlib">
<value>17</value>
</data>
@ -519,8 +522,8 @@
<data name="resultsPrinterComboBox.TabIndex" type="System.Int32, mscorlib">
<value>24</value>
</data>
<data name="label14.Location" type="System.Drawing.Point, System.Drawing">
<value>291, 90</value>
<data name="&gt;&gt;dataEntryLabel.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="mainSplitContainer.SplitterDistance" type="System.Int32, mscorlib">
<value>931</value>
@ -567,8 +570,8 @@
<data name="&gt;&gt;watermetersTextBox.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="historyListViewEx.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
<data name="&gt;&gt;metrology2ListViewEx.Parent" xml:space="preserve">
<value>metrology2TabPage</value>
</data>
<data name="label1.Text" xml:space="preserve">
<value>Procedure name</value>
@ -618,8 +621,8 @@
<data name="descriptionTextBox.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
</data>
<data name="&gt;&gt;resultsPrinterComboBox.Name" xml:space="preserve">
<value>resultsPrinterComboBox</value>
<data name="&gt;&gt;metrology1ListViewEx.Name" xml:space="preserve">
<value>metrology1ListViewEx</value>
</data>
<data name="createdOnTextBox.Size" type="System.Drawing.Size, System.Drawing">
<value>97, 20</value>
@ -711,8 +714,8 @@
<data name="processTabPage.Text" xml:space="preserve">
<value> Process </value>
</data>
<data name="metrology1TabPage.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
<data name="&gt;&gt;label16.ZOrder" xml:space="preserve">
<value>17</value>
</data>
<data name="&gt;&gt;watermetersLabel.Name" xml:space="preserve">
<value>watermetersLabel</value>
@ -747,8 +750,8 @@
<data name="&gt;&gt;resultsWriterComboBox.Name" xml:space="preserve">
<value>resultsWriterComboBox</value>
</data>
<data name="&gt;&gt;label16.ZOrder" xml:space="preserve">
<value>17</value>
<data name="&gt;&gt;mainSplitContainer.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="label15.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -834,6 +837,9 @@
<data name="&gt;&gt;lastChangedOnTextBox.Parent" xml:space="preserve">
<value>generalTabPage</value>
</data>
<data name="historyListViewEx.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="&gt;&gt;sharedButtons.Name" xml:space="preserve">
<value>sharedButtons</value>
</data>
@ -957,9 +963,6 @@
<data name="processTabPage.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="&gt;&gt;dataEntryLabel.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="dataEntryComboBox.Size" type="System.Drawing.Size, System.Drawing">
<value>121, 21</value>
</data>
@ -978,11 +981,8 @@
<data name="metrology2ListViewEx.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 3</value>
</data>
<data name="&gt;&gt;resultsWriterLabel.Parent" xml:space="preserve">
<value>generalTabPage</value>
</data>
<data name="processTabPage.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
<data name="metrology1ListViewEx.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;createdByTextBox.Parent" xml:space="preserve">
<value>generalTabPage</value>
@ -1005,8 +1005,8 @@
<data name="transitionEndLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>24, 318</value>
</data>
<data name="&gt;&gt;metrology2ListViewEx.Parent" xml:space="preserve">
<value>metrology2TabPage</value>
<data name="processTabPage.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="&gt;&gt;tabControl.Type" xml:space="preserve">
<value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@ -1173,7 +1173,4 @@
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>de</value>
</metadata>
</root>

31
TestBenchFramework/Resources/Strings.de.resx
View File

@ -544,10 +544,10 @@
<value>&lt;kein&gt;</value>
</data>
<data name="Sensors" xml:space="preserve">
<value>Messsensoren</value>
<value>Abtastung</value>
</data>
<data name="Test_Method" xml:space="preserve">
<value>Prüfenvahren</value>
<data name="Test_method" xml:space="preserve">
<value>Prüfart</value>
</data>
<data name="Clear_results" xml:space="preserve">
<value>Ergebnise leeren</value>
@ -592,7 +592,7 @@
<value>Wiegen</value>
</data>
<data name="Setting_the_flow" xml:space="preserve">
<value>Prüfdurchfluss anfahren</value>
<value>Prüfdurchfluss einstellen</value>
</data>
<data name="Test_completed" xml:space="preserve">
<value>Prüfpunkt fertiggestellt</value>
@ -634,7 +634,7 @@
<value>Hersteller</value>
</data>
<data name="Water_meters" xml:space="preserve">
<value>Zählers</value>
<value>Zählerdaten</value>
</data>
<data name="Printer" xml:space="preserve">
<value>Drucker</value>
@ -721,13 +721,13 @@
<value>Impulse pro Liter</value>
</data>
<data name="RateOfChangePct" xml:space="preserve">
<value>Änderungsrate [%]</value>
<value>Durchflussänderung [%]</value>
</data>
<data name="RelativeQfrom" xml:space="preserve">
<value>Relatives Q von</value>
<value>Relativer Q von</value>
</data>
<data name="RelativeQto" xml:space="preserve">
<value>Relatives Q bis</value>
<value>Relativer Q bis</value>
</data>
<data name="TransitionEnd_chdr" xml:space="preserve">
<value>Ubergang - Ende</value>
@ -735,4 +735,19 @@
<data name="TransitionStart_chdr" xml:space="preserve">
<value>Ubergang - Start</value>
</data>
<data name="Flow_selection" xml:space="preserve">
<value>Einstellung Durchfluss</value>
</data>
<data name="Method_selection" xml:space="preserve">
<value>Auswahl Prüfart</value>
</data>
<data name="String1" xml:space="preserve">
<value />
</data>
<data name="Test_method2" xml:space="preserve">
<value>Prüfart</value>
</data>
<data name="Volume_and_error_selection" xml:space="preserve">
<value>Volumen und Fehlergrenzen</value>
</data>
</root>

2
TestBenchFramework/TBF.csproj
View File

@ -935,6 +935,7 @@
<EmbeddedResource Include="Forms\TabNameDlg.resx">
<DependentUpon>TabNameDlg.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Resources\Strings.sk.resx" />
<EmbeddedResource Include="Screens\PicturesTabPageCtrl.resx">
<DependentUpon>PicturesTabPageCtrl.cs</DependentUpon>
</EmbeddedResource>
@ -1066,7 +1067,6 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Strings.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Resources\Strings.sk.resx" />
<EmbeddedResource Include="Screens\ProcessTabPageCtrl.resx">
<DependentUpon>ProcessTabPageCtrl.cs</DependentUpon>
</EmbeddedResource>

460
TestBenchFramework/UiControls/BenchControlPanel.Designer.cs generated
View File

@ -28,236 +28,236 @@
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BenchControlPanel));
this.stopBtn = new System.Windows.Forms.Button();
this.startTestBtn = new System.Windows.Forms.Button();
this.startCycleBtn = new System.Windows.Forms.Button();
this.purgeBeginBtn = new System.Windows.Forms.Button();
this.purgeEndBtn = new System.Windows.Forms.Button();
this.tryHeadsBtn = new System.Windows.Forms.Button();
this.resetResultsBtn = new System.Windows.Forms.Button();
this.calibrationBtn = new System.Windows.Forms.Button();
this.emptyTank1Btn = new System.Windows.Forms.Button();
this.sensitivityTestBtn = new System.Windows.Forms.Button();
this.emptyTank2Btn = new System.Windows.Forms.Button();
this.testGroupBox = new System.Windows.Forms.GroupBox();
this.startQ3Btn = new System.Windows.Forms.Button();
this.startQ2Btn = new System.Windows.Forms.Button();
this.startQ1Btn = new System.Windows.Forms.Button();
this.testComboBox = new System.Windows.Forms.ComboBox();
this.purgeGroupBox = new System.Windows.Forms.GroupBox();
this.emptyGroupBox = new System.Windows.Forms.GroupBox();
this.otherGroupBox = new System.Windows.Forms.GroupBox();
this.nextButton = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.acceptResultsBtn = new System.Windows.Forms.Button();
this.testGroupBox.SuspendLayout();
this.purgeGroupBox.SuspendLayout();
this.emptyGroupBox.SuspendLayout();
this.otherGroupBox.SuspendLayout();
this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// stopBtn
//
this.stopBtn.BackColor = System.Drawing.Color.Tomato;
resources.ApplyResources(this.stopBtn, "stopBtn");
this.stopBtn.Name = "stopBtn";
this.stopBtn.UseVisualStyleBackColor = false;
this.stopBtn.Click += new System.EventHandler(this.stopBtn_Click);
//
// startTestBtn
//
this.startTestBtn.BackColor = System.Drawing.Color.DarkSeaGreen;
resources.ApplyResources(this.startTestBtn, "startTestBtn");
this.startTestBtn.Name = "startTestBtn";
this.startTestBtn.UseVisualStyleBackColor = false;
this.startTestBtn.Click += new System.EventHandler(this.startTestBtn_Click);
//
// startCycleBtn
//
this.startCycleBtn.BackColor = System.Drawing.Color.LightSeaGreen;
resources.ApplyResources(this.startCycleBtn, "startCycleBtn");
this.startCycleBtn.Name = "startCycleBtn";
this.startCycleBtn.UseVisualStyleBackColor = false;
this.startCycleBtn.Click += new System.EventHandler(this.startCycleBtn_Click);
//
// purgeBeginBtn
//
this.purgeBeginBtn.BackColor = System.Drawing.Color.LightSteelBlue;
resources.ApplyResources(this.purgeBeginBtn, "purgeBeginBtn");
this.purgeBeginBtn.Name = "purgeBeginBtn";
this.purgeBeginBtn.UseVisualStyleBackColor = false;
this.purgeBeginBtn.Click += new System.EventHandler(this.purgeBeginBtn_Click);
//
// purgeEndBtn
//
this.purgeEndBtn.BackColor = System.Drawing.Color.LightSteelBlue;
resources.ApplyResources(this.purgeEndBtn, "purgeEndBtn");
this.purgeEndBtn.Name = "purgeEndBtn";
this.purgeEndBtn.UseVisualStyleBackColor = false;
this.purgeEndBtn.Click += new System.EventHandler(this.purgeEndBtn_Click);
//
// tryHeadsBtn
//
this.tryHeadsBtn.BackColor = System.Drawing.Color.DarkGray;
resources.ApplyResources(this.tryHeadsBtn, "tryHeadsBtn");
this.tryHeadsBtn.Name = "tryHeadsBtn";
this.tryHeadsBtn.UseVisualStyleBackColor = false;
this.tryHeadsBtn.Click += new System.EventHandler(this.tryHeadsBtn_Click);
//
// resetResultsBtn
//
this.resetResultsBtn.BackColor = System.Drawing.Color.Tomato;
resources.ApplyResources(this.resetResultsBtn, "resetResultsBtn");
this.resetResultsBtn.Name = "resetResultsBtn";
this.resetResultsBtn.UseVisualStyleBackColor = false;
this.resetResultsBtn.Click += new System.EventHandler(this.resetResultsBtn_Click);
//
// calibrationBtn
//
this.calibrationBtn.BackColor = System.Drawing.Color.DarkGray;
resources.ApplyResources(this.calibrationBtn, "calibrationBtn");
this.calibrationBtn.Name = "calibrationBtn";
this.calibrationBtn.UseVisualStyleBackColor = false;
this.calibrationBtn.Click += new System.EventHandler(this.calibrationBtn_Click);
//
// emptyTank1Btn
//
this.emptyTank1Btn.BackColor = System.Drawing.Color.LightSteelBlue;
resources.ApplyResources(this.emptyTank1Btn, "emptyTank1Btn");
this.emptyTank1Btn.Name = "emptyTank1Btn";
this.emptyTank1Btn.UseVisualStyleBackColor = false;
this.emptyTank1Btn.Click += new System.EventHandler(this.emptyTank1Btn_Click);
//
// sensitivityTestBtn
//
this.sensitivityTestBtn.BackColor = System.Drawing.Color.DarkGray;
resources.ApplyResources(this.sensitivityTestBtn, "sensitivityTestBtn");
this.sensitivityTestBtn.Name = "sensitivityTestBtn";
this.sensitivityTestBtn.UseVisualStyleBackColor = false;
this.sensitivityTestBtn.Click += new System.EventHandler(this.sensitivityTestBtn_Click);
//
// emptyTank2Btn
//
this.emptyTank2Btn.BackColor = System.Drawing.Color.LightSteelBlue;
resources.ApplyResources(this.emptyTank2Btn, "emptyTank2Btn");
this.emptyTank2Btn.Name = "emptyTank2Btn";
this.emptyTank2Btn.UseVisualStyleBackColor = false;
this.emptyTank2Btn.Click += new System.EventHandler(this.emptyTank2Btn_Click);
//
// testGroupBox
//
this.testGroupBox.Controls.Add(this.startQ3Btn);
this.testGroupBox.Controls.Add(this.startQ2Btn);
this.testGroupBox.Controls.Add(this.startQ1Btn);
this.testGroupBox.Controls.Add(this.testComboBox);
this.testGroupBox.Controls.Add(this.startTestBtn);
this.testGroupBox.Controls.Add(this.startCycleBtn);
this.testGroupBox.Controls.Add(this.stopBtn);
resources.ApplyResources(this.testGroupBox, "testGroupBox");
this.testGroupBox.Name = "testGroupBox";
this.testGroupBox.TabStop = false;
//
// startQ3Btn
//
this.startQ3Btn.BackColor = System.Drawing.Color.DarkSeaGreen;
resources.ApplyResources(this.startQ3Btn, "startQ3Btn");
this.startQ3Btn.Name = "startQ3Btn";
this.startQ3Btn.UseVisualStyleBackColor = false;
this.startQ3Btn.Click += new System.EventHandler(this.startQ3Btn_Click);
//
// startQ2Btn
//
this.startQ2Btn.BackColor = System.Drawing.Color.DarkSeaGreen;
resources.ApplyResources(this.startQ2Btn, "startQ2Btn");
this.startQ2Btn.Name = "startQ2Btn";
this.startQ2Btn.UseVisualStyleBackColor = false;
this.startQ2Btn.Click += new System.EventHandler(this.startQ2Btn_Click);
//
// startQ1Btn
//
this.startQ1Btn.BackColor = System.Drawing.Color.DarkSeaGreen;
resources.ApplyResources(this.startQ1Btn, "startQ1Btn");
this.startQ1Btn.Name = "startQ1Btn";
this.startQ1Btn.UseVisualStyleBackColor = false;
this.startQ1Btn.Click += new System.EventHandler(this.startQ1Btn_Click);
//
// testComboBox
//
resources.ApplyResources(this.testComboBox, "testComboBox");
this.testComboBox.FormattingEnabled = true;
this.testComboBox.Name = "testComboBox";
this.testComboBox.SelectedIndexChanged += new System.EventHandler(this.testComboBox_SelectedIndexChanged);
//
// purgeGroupBox
//
this.purgeGroupBox.BackColor = System.Drawing.SystemColors.Control;
this.purgeGroupBox.Controls.Add(this.purgeEndBtn);
this.purgeGroupBox.Controls.Add(this.purgeBeginBtn);
resources.ApplyResources(this.purgeGroupBox, "purgeGroupBox");
this.purgeGroupBox.Name = "purgeGroupBox";
this.purgeGroupBox.TabStop = false;
//
// emptyGroupBox
//
this.emptyGroupBox.Controls.Add(this.emptyTank1Btn);
this.emptyGroupBox.Controls.Add(this.emptyTank2Btn);
resources.ApplyResources(this.emptyGroupBox, "emptyGroupBox");
this.emptyGroupBox.Name = "emptyGroupBox";
this.emptyGroupBox.TabStop = false;
//
// otherGroupBox
//
this.otherGroupBox.Controls.Add(this.sensitivityTestBtn);
this.otherGroupBox.Controls.Add(this.nextButton);
this.otherGroupBox.Controls.Add(this.calibrationBtn);
this.otherGroupBox.Controls.Add(this.tryHeadsBtn);
resources.ApplyResources(this.otherGroupBox, "otherGroupBox");
this.otherGroupBox.Name = "otherGroupBox";
this.otherGroupBox.TabStop = false;
//
// nextButton
//
resources.ApplyResources(this.nextButton, "nextButton");
this.nextButton.Name = "nextButton";
this.nextButton.UseVisualStyleBackColor = true;
this.nextButton.Click += new System.EventHandler(this.nextButton_Click);
//
// groupBox1
//
this.groupBox1.Controls.Add(this.acceptResultsBtn);
this.groupBox1.Controls.Add(this.resetResultsBtn);
resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.Name = "groupBox1";
this.groupBox1.TabStop = false;
//
// acceptResultsBtn
//
this.acceptResultsBtn.BackColor = System.Drawing.Color.ForestGreen;
resources.ApplyResources(this.acceptResultsBtn, "acceptResultsBtn");
this.acceptResultsBtn.Name = "acceptResultsBtn";
this.acceptResultsBtn.UseVisualStyleBackColor = false;
this.acceptResultsBtn.Click += new System.EventHandler(this.acceptResultsBtn_Click);
//
// BenchControlPanel
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Control;
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.otherGroupBox);
this.Controls.Add(this.emptyGroupBox);
this.Controls.Add(this.purgeGroupBox);
this.Controls.Add(this.testGroupBox);
this.Name = "BenchControlPanel";
this.Load += new System.EventHandler(this.BenchControlPanel_Load);
this.testGroupBox.ResumeLayout(false);
this.purgeGroupBox.ResumeLayout(false);
this.emptyGroupBox.ResumeLayout(false);
this.otherGroupBox.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
this.ResumeLayout(false);
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BenchControlPanel));
this.stopBtn = new System.Windows.Forms.Button();
this.startTestBtn = new System.Windows.Forms.Button();
this.startCycleBtn = new System.Windows.Forms.Button();
this.purgeBeginBtn = new System.Windows.Forms.Button();
this.purgeEndBtn = new System.Windows.Forms.Button();
this.tryHeadsBtn = new System.Windows.Forms.Button();
this.resetResultsBtn = new System.Windows.Forms.Button();
this.calibrationBtn = new System.Windows.Forms.Button();
this.emptyTank1Btn = new System.Windows.Forms.Button();
this.sensitivityTestBtn = new System.Windows.Forms.Button();
this.emptyTank2Btn = new System.Windows.Forms.Button();
this.testGroupBox = new System.Windows.Forms.GroupBox();
this.startQ3Btn = new System.Windows.Forms.Button();
this.startQ2Btn = new System.Windows.Forms.Button();
this.startQ1Btn = new System.Windows.Forms.Button();
this.testComboBox = new System.Windows.Forms.ComboBox();
this.purgeGroupBox = new System.Windows.Forms.GroupBox();
this.emptyGroupBox = new System.Windows.Forms.GroupBox();
this.otherGroupBox = new System.Windows.Forms.GroupBox();
this.nextButton = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.acceptResultsBtn = new System.Windows.Forms.Button();
this.testGroupBox.SuspendLayout();
this.purgeGroupBox.SuspendLayout();
this.emptyGroupBox.SuspendLayout();
this.otherGroupBox.SuspendLayout();
this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// stopBtn
//
resources.ApplyResources(this.stopBtn, "stopBtn");
this.stopBtn.BackColor = System.Drawing.Color.Tomato;
this.stopBtn.Name = "stopBtn";
this.stopBtn.UseVisualStyleBackColor = false;
this.stopBtn.Click += new System.EventHandler(this.stopBtn_Click);
//
// startTestBtn
//
resources.ApplyResources(this.startTestBtn, "startTestBtn");
this.startTestBtn.BackColor = System.Drawing.Color.DarkSeaGreen;
this.startTestBtn.Name = "startTestBtn";
this.startTestBtn.UseVisualStyleBackColor = false;
this.startTestBtn.Click += new System.EventHandler(this.startTestBtn_Click);
//
// startCycleBtn
//
resources.ApplyResources(this.startCycleBtn, "startCycleBtn");
this.startCycleBtn.BackColor = System.Drawing.Color.LightSeaGreen;
this.startCycleBtn.Name = "startCycleBtn";
this.startCycleBtn.UseVisualStyleBackColor = false;
this.startCycleBtn.Click += new System.EventHandler(this.startCycleBtn_Click);
//
// purgeBeginBtn
//
resources.ApplyResources(this.purgeBeginBtn, "purgeBeginBtn");
this.purgeBeginBtn.BackColor = System.Drawing.Color.LightSteelBlue;
this.purgeBeginBtn.Name = "purgeBeginBtn";
this.purgeBeginBtn.UseVisualStyleBackColor = false;
this.purgeBeginBtn.Click += new System.EventHandler(this.purgeBeginBtn_Click);
//
// purgeEndBtn
//
resources.ApplyResources(this.purgeEndBtn, "purgeEndBtn");
this.purgeEndBtn.BackColor = System.Drawing.Color.LightSteelBlue;
this.purgeEndBtn.Name = "purgeEndBtn";
this.purgeEndBtn.UseVisualStyleBackColor = false;
this.purgeEndBtn.Click += new System.EventHandler(this.purgeEndBtn_Click);
//
// tryHeadsBtn
//
resources.ApplyResources(this.tryHeadsBtn, "tryHeadsBtn");
this.tryHeadsBtn.BackColor = System.Drawing.Color.DarkGray;
this.tryHeadsBtn.Name = "tryHeadsBtn";
this.tryHeadsBtn.UseVisualStyleBackColor = false;
this.tryHeadsBtn.Click += new System.EventHandler(this.tryHeadsBtn_Click);
//
// resetResultsBtn
//
resources.ApplyResources(this.resetResultsBtn, "resetResultsBtn");
this.resetResultsBtn.BackColor = System.Drawing.Color.Tomato;
this.resetResultsBtn.Name = "resetResultsBtn";
this.resetResultsBtn.UseVisualStyleBackColor = false;
this.resetResultsBtn.Click += new System.EventHandler(this.resetResultsBtn_Click);
//
// calibrationBtn
//
resources.ApplyResources(this.calibrationBtn, "calibrationBtn");
this.calibrationBtn.BackColor = System.Drawing.Color.DarkGray;
this.calibrationBtn.Name = "calibrationBtn";
this.calibrationBtn.UseVisualStyleBackColor = false;
this.calibrationBtn.Click += new System.EventHandler(this.calibrationBtn_Click);
//
// emptyTank1Btn
//
resources.ApplyResources(this.emptyTank1Btn, "emptyTank1Btn");
this.emptyTank1Btn.BackColor = System.Drawing.Color.LightSteelBlue;
this.emptyTank1Btn.Name = "emptyTank1Btn";
this.emptyTank1Btn.UseVisualStyleBackColor = false;
this.emptyTank1Btn.Click += new System.EventHandler(this.emptyTank1Btn_Click);
//
// sensitivityTestBtn
//
resources.ApplyResources(this.sensitivityTestBtn, "sensitivityTestBtn");
this.sensitivityTestBtn.BackColor = System.Drawing.Color.DarkGray;
this.sensitivityTestBtn.Name = "sensitivityTestBtn";
this.sensitivityTestBtn.UseVisualStyleBackColor = false;
this.sensitivityTestBtn.Click += new System.EventHandler(this.sensitivityTestBtn_Click);
//
// emptyTank2Btn
//
resources.ApplyResources(this.emptyTank2Btn, "emptyTank2Btn");
this.emptyTank2Btn.BackColor = System.Drawing.Color.LightSteelBlue;
this.emptyTank2Btn.Name = "emptyTank2Btn";
this.emptyTank2Btn.UseVisualStyleBackColor = false;
this.emptyTank2Btn.Click += new System.EventHandler(this.emptyTank2Btn_Click);
//
// testGroupBox
//
resources.ApplyResources(this.testGroupBox, "testGroupBox");
this.testGroupBox.Controls.Add(this.startQ3Btn);
this.testGroupBox.Controls.Add(this.startQ2Btn);
this.testGroupBox.Controls.Add(this.startQ1Btn);
this.testGroupBox.Controls.Add(this.testComboBox);
this.testGroupBox.Controls.Add(this.startTestBtn);
this.testGroupBox.Controls.Add(this.startCycleBtn);
this.testGroupBox.Controls.Add(this.stopBtn);
this.testGroupBox.Name = "testGroupBox";
this.testGroupBox.TabStop = false;
//
// startQ3Btn
//
resources.ApplyResources(this.startQ3Btn, "startQ3Btn");
this.startQ3Btn.BackColor = System.Drawing.Color.DarkSeaGreen;
this.startQ3Btn.Name = "startQ3Btn";
this.startQ3Btn.UseVisualStyleBackColor = false;
this.startQ3Btn.Click += new System.EventHandler(this.startQ3Btn_Click);
//
// startQ2Btn
//
resources.ApplyResources(this.startQ2Btn, "startQ2Btn");
this.startQ2Btn.BackColor = System.Drawing.Color.DarkSeaGreen;
this.startQ2Btn.Name = "startQ2Btn";
this.startQ2Btn.UseVisualStyleBackColor = false;
this.startQ2Btn.Click += new System.EventHandler(this.startQ2Btn_Click);
//
// startQ1Btn
//
resources.ApplyResources(this.startQ1Btn, "startQ1Btn");
this.startQ1Btn.BackColor = System.Drawing.Color.DarkSeaGreen;
this.startQ1Btn.Name = "startQ1Btn";
this.startQ1Btn.UseVisualStyleBackColor = false;
this.startQ1Btn.Click += new System.EventHandler(this.startQ1Btn_Click);
//
// testComboBox
//
resources.ApplyResources(this.testComboBox, "testComboBox");
this.testComboBox.FormattingEnabled = true;
this.testComboBox.Name = "testComboBox";
this.testComboBox.SelectedIndexChanged += new System.EventHandler(this.testComboBox_SelectedIndexChanged);
//
// purgeGroupBox
//
resources.ApplyResources(this.purgeGroupBox, "purgeGroupBox");
this.purgeGroupBox.BackColor = System.Drawing.SystemColors.Control;
this.purgeGroupBox.Controls.Add(this.purgeEndBtn);
this.purgeGroupBox.Controls.Add(this.purgeBeginBtn);
this.purgeGroupBox.Name = "purgeGroupBox";
this.purgeGroupBox.TabStop = false;
//
// emptyGroupBox
//
resources.ApplyResources(this.emptyGroupBox, "emptyGroupBox");
this.emptyGroupBox.Controls.Add(this.emptyTank1Btn);
this.emptyGroupBox.Controls.Add(this.emptyTank2Btn);
this.emptyGroupBox.Name = "emptyGroupBox";
this.emptyGroupBox.TabStop = false;
//
// otherGroupBox
//
resources.ApplyResources(this.otherGroupBox, "otherGroupBox");
this.otherGroupBox.Controls.Add(this.sensitivityTestBtn);
this.otherGroupBox.Controls.Add(this.nextButton);
this.otherGroupBox.Controls.Add(this.calibrationBtn);
this.otherGroupBox.Controls.Add(this.tryHeadsBtn);
this.otherGroupBox.Name = "otherGroupBox";
this.otherGroupBox.TabStop = false;
//
// nextButton
//
resources.ApplyResources(this.nextButton, "nextButton");
this.nextButton.Name = "nextButton";
this.nextButton.UseVisualStyleBackColor = true;
this.nextButton.Click += new System.EventHandler(this.nextButton_Click);
//
// groupBox1
//
resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.Controls.Add(this.acceptResultsBtn);
this.groupBox1.Controls.Add(this.resetResultsBtn);
this.groupBox1.Name = "groupBox1";
this.groupBox1.TabStop = false;
//
// acceptResultsBtn
//
resources.ApplyResources(this.acceptResultsBtn, "acceptResultsBtn");
this.acceptResultsBtn.BackColor = System.Drawing.Color.ForestGreen;
this.acceptResultsBtn.Name = "acceptResultsBtn";
this.acceptResultsBtn.UseVisualStyleBackColor = false;
this.acceptResultsBtn.Click += new System.EventHandler(this.acceptResultsBtn_Click);
//
// BenchControlPanel
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Control;
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.otherGroupBox);
this.Controls.Add(this.emptyGroupBox);
this.Controls.Add(this.purgeGroupBox);
this.Controls.Add(this.testGroupBox);
this.Name = "BenchControlPanel";
this.Load += new System.EventHandler(this.BenchControlPanel_Load);
this.testGroupBox.ResumeLayout(false);
this.purgeGroupBox.ResumeLayout(false);
this.emptyGroupBox.ResumeLayout(false);
this.otherGroupBox.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
this.ResumeLayout(false);
}

34
TestBenchFramework/UiControls/BenchControlPanel.de.resx
View File

@ -149,16 +149,16 @@
<value>5 Start Prüfung</value>
</data>
<data name="purgeBeginBtn.Font" type="System.Drawing.Font, System.Drawing">
<value>Verdana, 14.25pt</value>
<value>Verdana, 11pt</value>
</data>
<data name="purgeBeginBtn.Size" type="System.Drawing.Size, System.Drawing">
<value>93, 35</value>
</data>
<data name="purgeBeginBtn.Text" xml:space="preserve">
<value>6 Anf.</value>
<value>6 Befüllen</value>
</data>
<data name="purgeEndBtn.Font" type="System.Drawing.Font, System.Drawing">
<value>Verdana, 14.25pt</value>
<value>Verdana, 8pt</value>
</data>
<data name="purgeEndBtn.Location" type="System.Drawing.Point, System.Drawing">
<value>104, 23</value>
@ -167,7 +167,7 @@
<value>94, 35</value>
</data>
<data name="purgeEndBtn.Text" xml:space="preserve">
<value>7 Ende</value>
<value>7 Entwässern</value>
</data>
<data name="tryHeadsBtn.Font" type="System.Drawing.Font, System.Drawing">
<value>Verdana, 11.25pt</value>
@ -223,6 +223,12 @@
<data name="emptyTank2Btn.Text" xml:space="preserve">
<value>9 Beh.2</value>
</data>
<data name="testGroupBox.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 3</value>
</data>
<data name="testGroupBox.Text" xml:space="preserve">
<value>Prüfpunkt</value>
</data>
<data name="startQ3Btn.Font" type="System.Drawing.Font, System.Drawing">
<value>Verdana, 14.25pt</value>
</data>
@ -250,17 +256,11 @@
<data name="startQ1Btn.Text" xml:space="preserve">
<value>1</value>
</data>
<data name="testGroupBox.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 3</value>
</data>
<data name="testGroupBox.Text" xml:space="preserve">
<value>Prüfpunkt</value>
</data>
<data name="purgeGroupBox.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 252</value>
</data>
<data name="purgeGroupBox.Text" xml:space="preserve">
<value>Spülen</value>
<value>Prüfstrecke</value>
</data>
<data name="emptyGroupBox.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 397</value>
@ -277,18 +277,18 @@
<data name="otherGroupBox.Text" xml:space="preserve">
<value>Zubehör</value>
</data>
<data name="acceptResultsBtn.Font" type="System.Drawing.Font, System.Drawing">
<value>Verdana, 10pt</value>
</data>
<data name="acceptResultsBtn.Text" xml:space="preserve">
<value>bestätigen</value>
</data>
<data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 325</value>
</data>
<data name="groupBox1.Text" xml:space="preserve">
<value>Ergebnisse</value>
</data>
<data name="acceptResultsBtn.Font" type="System.Drawing.Font, System.Drawing">
<value>Verdana, 10pt</value>
</data>
<data name="acceptResultsBtn.Text" xml:space="preserve">
<value>bestätigen</value>
</data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>235, 1000</value>
</data>

1123
TestBenchFramework/UiControls/BenchControlPanel.resx
View File

File diff suppressed because it is too large Load Diff