diff --git a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs index e2f7567c7..9b749cfad 100644 --- a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs +++ b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs @@ -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" }; + + /// + /// To clear process values at the beginning of each test + /// + protected void ClearProcessValues() + { + refCount.Clear(); + refFreq.Clear(); + refFlow.Clear(); + mass.Clear(); + startMass.Clear(); + endMass.Clear(); + + } + /// /// Empties the tank: opens the emptying valve and measures the weight. /// @@ -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; diff --git a/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs index fbb610418..4db4ff6ed 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs @@ -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); diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs index 708bff779..98ad99590 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs @@ -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 measureOperations = new List(); @@ -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; //------------------------------------------------ diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs index 8d43672fd..90f8934a1 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs @@ -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; //------------------------------------------------ diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs index 70602423b..0ed4a5192 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs @@ -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 measureOperations = new List(); @@ -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; //------------------------------------------------ diff --git a/TestBenchFramework/Boxes/FloatBox.cs b/TestBenchFramework/Boxes/FloatBox.cs index 91acd21f4..2a9c19f7f 100644 --- a/TestBenchFramework/Boxes/FloatBox.cs +++ b/TestBenchFramework/Boxes/FloatBox.cs @@ -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 @@ } /// Parameterless constructor - public FloatBox() { } + public FloatBox() + { + } /// Constructor that initializes the value - public FloatBox(float val) { this.Val = val; } - - /// Constructor that initializes the format - public FloatBox(string format) { SetFormat(format); } - - /// Constructor that initializes the complex format - public FloatBox(string name, string format, string formatInvalid, string formatEx) - { - SetFormat(name, format, formatInvalid, formatEx); - } - /// Constructor that initializes the value and the format - public FloatBox(float val, string format) - : this(val) - { - SetFormat(format); - } - /// Constructor that initializes the value and the complex format - 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; + } /// /// 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}"; - /// - /// Set a basic format for the conversion to a string representation - /// - 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; - } /// /// Converts the box value to a string representation /// @@ -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)); } } - /// /// Validate the string representation of the box value /// @@ -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); } + /// /// Update the parameter from a string /// @@ -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; } } } diff --git a/TestBenchFramework/Boxes/IBox.cs b/TestBenchFramework/Boxes/IBox.cs index 179152032..64126952b 100644 --- a/TestBenchFramework/Boxes/IBox.cs +++ b/TestBenchFramework/Boxes/IBox.cs @@ -15,19 +15,6 @@ namespace TBF.Boxes /// bool Valid { get; } - /// - /// 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'. - /// - void SetFormat(string name, string format, string formatInvalid, string formatEx); - - /// - /// Set only the basic format. 'formatInvalid' is "---". - /// - void SetFormat(string format); - /// /// Clear the box value and the valid flag /// diff --git a/TestBenchFramework/Boxes/IntBox.cs b/TestBenchFramework/Boxes/IntBox.cs index a9603e60d..b858cf9c0 100644 --- a/TestBenchFramework/Boxes/IntBox.cs +++ b/TestBenchFramework/Boxes/IntBox.cs @@ -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 } /// Parameterless constructor - public IntBox() { } + public IntBox() + { + } /// Constructor that initializes the value - public IntBox(int val) { this.Val = val; } - - /// Constructor that initializes the format - public IntBox(string format) { SetFormat(format); } - - /// Constructor that initializes the complex format - public IntBox(string name, string format, string formatInvalid, string formatEx) - { - SetFormat(name, format, formatInvalid, formatEx); - } - /// Constructor that initializes the value and the format - public IntBox(int val, string format) - : this(val) - { - SetFormat(format); - } - /// Constructor that initializes the value and the complex format - 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; + } /// /// 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}"; - /// - /// Set a format for the conversion to a string representation - /// - 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; - } - /// + /// /// Converts the box value to a string representation /// 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)); } } - /// /// Validates the string representation of the box value /// @@ -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); } + /// /// Update the parameter from a string /// @@ -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; + } } } diff --git a/TestBenchFramework/MainWnd.Designer.cs b/TestBenchFramework/MainWnd.Designer.cs index a1ec6e9d8..7b4d207a1 100644 --- a/TestBenchFramework/MainWnd.Designer.cs +++ b/TestBenchFramework/MainWnd.Designer.cs @@ -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; } } diff --git a/TestBenchFramework/MainWnd.cs b/TestBenchFramework/MainWnd.cs index 4c1b08ab2..170dbaa8a 100644 --- a/TestBenchFramework/MainWnd.cs +++ b/TestBenchFramework/MainWnd.cs @@ -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)); diff --git a/TestBenchFramework/MainWnd.de.resx b/TestBenchFramework/MainWnd.de.resx index bc36c1826..1ba84a7da 100644 --- a/TestBenchFramework/MainWnd.de.resx +++ b/TestBenchFramework/MainWnd.de.resx @@ -119,7 +119,7 @@ - 1020, 562 + 1020, 542 1020, 666 @@ -131,43 +131,43 @@ 1254, 666 - 1012, 553 + 1012, 533 - 1012, 553 + 1012, 533 - 1012, 553 + 1012, 533 - 1012, 553 + 1012, 533 - 1012, 553 + 1012, 533 - 1012, 553 + 1012, 533 - 1012, 553 + 1012, 533 - 1012, 553 + 1012, 533 - 1012, 553 + 1012, 533 - 1012, 553 + 1012, 533 - 1012, 553 + 1012, 533 - 1012, 553 + 1012, 533 - 1012, 553 + 1012, 533 0, 690 @@ -195,34 +195,34 @@ Prüfstand - 152, 22 + 150, 22 Komponenten - 152, 22 + 150, 22 Pfade - 152, 22 + 150, 22 Übergänge - 152, 22 + 150, 22 Metrologie - 149, 6 + 147, 6 - 152, 22 + 150, 22 Beenden @@ -296,6 +296,12 @@ Prüfungen + + 58, 20 + + + Prozess + 49, 20 @@ -303,12 +309,15 @@ Bilder - 70, 20 + 75, 20 - Ergebnise + Ergebnisse 1254, 712 + + Inherit + \ No newline at end of file diff --git a/TestBenchFramework/MainWnd.resx b/TestBenchFramework/MainWnd.resx index 095f6cc7b..a868332dc 100644 --- a/TestBenchFramework/MainWnd.resx +++ b/TestBenchFramework/MainWnd.resx @@ -117,1087 +117,1138 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Fill + + + 1012, 523 + + + verticalSplitContainer - - True + + 31 - - - 0, 24 + + 1 - - Fill + + 4 - - True + + 4, 5 - - 0, 0 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Horizontal - - - NoControl - - - 6, 25 - - - 237, 33 - - - 0 - - - mainProgressBar - - - System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - progressGroupBox - - - 0 - - - Verdana, 12pt - - - 767, 15 - - - 249, 68 - - - 19 - - - Progress - - - progressGroupBox - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - horizontalSplitContainer.Panel1 - - - 0 - - - False + + benchTSMenuItem Verdana, 15.75pt - - 8, 25 + + logsTabPage - - 244, 33 + + 1020 - - 6 + + Results - - procedureComboBox + + 1 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - procedureGroupBox - - - 0 - - - Verdana, 12pt - - - 503, 15 - - - 258, 68 - - - 17 - - - Procedure - - - procedureGroupBox - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - horizontalSplitContainer.Panel1 - - + 1 True - - Verdana, 15.75pt + + passwortToolStripMenuItem - - NoControl - - - 6, 28 - - - 0, 25 - - - 0 - - - activityLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - activityGroupBox - - - 0 - - - Verdana, 12pt - - - 12, 15 - - - 485, 68 - - - 18 - - - Activity - - - activityGroupBox - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - horizontalSplitContainer.Panel1 - - - 2 - - - horizontalSplitContainer.Panel1 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - horizontalSplitContainer - - - 0 - - - Fill - - - 0, 0 - - - 1012, 543 - - - 1 - - - ctrlBrdComponent - - - ControlComponent3Munich.UserControl1, ControlComponent3Munich, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - homeTabPage - - - 0 - - - 4, 5 - - - 1012, 543 - - - 29 + + 503, 72 Hydraulics - - homeTabPage + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + measurementTSMenuItem + + + $this + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Logs + + + benchMetrologyTSMenuItem + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 1012, 523 + + + 0, 680 + + + True + + + horizontalSplitContainer.Panel1 + + + picturesTabPage + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + logsTSMenuItem + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - mainTabControl + + 0 + + + horizontalSplitContainer.Panel1 + + + procedureGroupBox + + + 8, 15 + + + 1012, 523 + + + 1012, 523 + + + 0 + + + exitToolStripMenuItem + + + TBF.Screens.LogsTabPageCtrl, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + 6 + + + descriptionGroupBox + + + 52, 20 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 1254, 22 + + + 59, 20 + + + horizontalSplitContainer.Panel1 + + + 126, 22 + + + 1012, 523 + + + 1012, 523 + + + Test Bench Framework + + + toolStripSeparator1 + + + 92, 20 + + + 1 + + + Measurement + + + 0 + + + 0, 0 + + + activityGroupBox + + + True + + + Verdana, 12pt + + + horizontalSplitContainer 0 - - Fill + + 143, 22 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Settings + + + False + + + 0 + + + Database + + + rightHorizSplitContainer.Panel1 + + + benchPathsTSMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 143, 22 + + + horizontalSplitContainer + + + 21 + + + + 4, 4, 4, 4 + + + insertTabPage + + + 6, 13 + + + 0 + + + activityStatusLabel + + + 2 + + + 1012, 523 + + + NoControl + + + 0 + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + 0 + + + picturesTSMItem + + + 61, 20 + + + 0 + + + Results + + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + verticalSplitContainer.Panel1 + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl + + + Exit + + + 249, 64 + + + 0, 25 + + + 4, 5 + + + 8, 23 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + measurementTabPage + + + 25 + + + 1 + + + 20 Microsoft Sans Serif, 8.25pt - + + procedureGroupBox + + + NoControl + + + TBF.Screens.ResultsTabPageCtrl, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + activityLabel + + + activityGroupBox + + + verticalSplitContainer + + + 1020, 532 + + + 0, 0 + + + processTabPage + + + Fill + + + Fill + + + progressFlowLayoutPanel + + + homeTabPage + + + MeasurementTabPageCtrl + + + horizontalSplitContainer + + + progressGroupBox + + + 1 + + + 0, 0 + + + 0, 0 + + + 143, 22 + + + Bench + + + resultsTabPageCtrl + + + benchComponentsTSMenuItem + + + System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Transitions + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + 1012, 523 + + + 78, 20 + + + 0 + + + 15 + + + resultsTSMenuItem + + + verticalSplitContainer + + + logsTabPage + + + resultsTabPage + + + 0, 1 + + + Fill + + + horizontalSplitContainer.Panel2 + + 0, 0 4, 4, 4, 4 - - 1012, 543 - - - 1 - - - processTabPageCtrl - - - TBF.Screens.ProcessTabPageCtrl, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - processTabPage - - - 0 - - - 4, 5 - - - 1012, 543 - - - 30 - - - Process - - - processTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + mainTabControl - - 1 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Fill + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Verdana, 11.25pt + + Metrology - - 0, 0 + + statusStrip1 - - 4, 4, 4, 4 + + 503, 8 - - 1012, 543 + + descriptionGroupBox - - 0 + + 56, 20 - - MeasurementTabPageCtrl - - - TBF.Screens.MeasurementTabPageCtrl, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - measurementTabPage - - - 0 + + NoControl 4, 5 - - 1012, 543 + + 4, 5 - - 25 + + 0 - + + 0, 0 + + + 1020, 656 + + + 120 + + + horizontalSplitContainer.Panel1 + + + ctrlBrdComponent + + + Help + + + 0 + + + 44, 20 + + + 4, 5 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + picturesTabPage + + + 1254, 702 + + + 140, 6 + + + TBF.Screens.PicturesTabPageCtrl, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + Fill + + + 0, 0 + + + 3 + + + 2 + + + rightHorizSplitContainer.Panel2 + + + homeTSMenuItem + + + editTSMenuItem + + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Paths + + + Fill + + + 52, 20 + + + Process + + + 4, 5 + + + Home + + + 143, 22 + + + Microsoft Sans Serif, 8.25pt + + + 44, 20 + + + Verdana, 11.25pt + + + 1 + + + 22 + + + proceduresToolStripMenuItem + + + Language + + + Process + + + userInfoStatusLabel + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + mainTabControl + + + 6, 28 + + + helpTSMenuItem + + + 511, 40 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 143, 22 + + + 18 + + + verticalSplitContainer.Panel1 + + + verticalSplitContainer.Panel2 + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Activity + + + 5 + + + Components + + + 19 + + + databaseSettingsTSMenuItem + + + mainTabControl + + + 1254, 24 + + + TopDown + + + localSettingsTSMenuItem + + + 0, 13 + + + rightHorizSplitContainer + + + Verdana, 12pt + + + processTabPage + + + System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Password + + + TBF.Screens.ProcessTabPageCtrl, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + 4, 5 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fill + + + Fill + + + 230, 240 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + Microsoft Sans Serif, 8.25pt + + + 126, 22 + + + 230, 656 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + MainWnd + + + 6, 23 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mainTabControl + + + horizontalSplitContainer.Panel1 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 2 + + + 0 + + + 0 + + + 0 + + + rightHorizSplitContainer.Panel1 + + + mainTabControl + + + mainProgressBar + + + resultsToolStripMenuItem + + + 0 + + + Verdana, 15.75pt + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + picturesTabPageCtrl1 + + + Microsoft Sans Serif, 8.25pt + + + descriptionLabel + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 244, 33 + + + 0, 0 + + + Logs + + + 1012, 523 + + + rightHorizSplitContainer + + + Pictures + + Measurement + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + procedureComboBox + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0, 0 + + + True + + + 0 + + + resultsTabPage + + + 767, 8 + + + Fill + + + mainTabControl + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + About + + + Procedures + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Results + + + 3 + + + Insert + + + 1 + + + Horizontal + + + 1254, 656 + + + Fill + + + statusStrip1 + + + homeTabPage + + + 0 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + processToolStripMenuItem + + + 107, 22 + + + 17 + measurementTabPage System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - mainTabControl - - - 2 - - - 4, 5 - - - 1012, 543 - - - 22 - - - Insert - - - insertTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainTabControl - - - 3 - - - Fill - - - Microsoft Sans Serif, 8.25pt - - - 0, 0 - - - 1012, 543 - - - 0 - - - picturesTabPageCtrl1 - - - TBF.Screens.PicturesTabPageCtrl, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - picturesTabPage - - - 0 - - - 4, 5 - - - 1012, 543 - - - 31 - - - Pictures - - - picturesTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainTabControl - - - 4 - - - Fill - - - Microsoft Sans Serif, 8.25pt - - - 0, 0 - - + 4, 4, 4, 4 - - 1012, 543 + + processTabPageCtrl - - 0 - - - resultsTabPageCtrl - - - TBF.Screens.ResultsTabPageCtrl, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - resultsTabPage - - - 0 - - - 4, 5 - - - 1012, 543 - - - 15 - - - Results - - - resultsTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + mainTabControl - - 5 - - - Fill - - - Microsoft Sans Serif, 8.25pt - - - 0, 0 - - - 4, 4, 4, 4 - - - 1012, 543 - - - 0 - - - logsTabPageCtrl - - - TBF.Screens.LogsTabPageCtrl, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - logsTabPage - - - 0 - - - 4, 5 - - - 1012, 543 - - - 21 - - - Logs - - - logsTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainTabControl - - - 6 - - - Fill - - - 0, 1 - - - 0, 0 - - - 1020, 552 - - - 1 - - - mainTabControl - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - horizontalSplitContainer.Panel2 - - - 0 - - - horizontalSplitContainer.Panel2 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - horizontalSplitContainer - - - 1 - - - 1020, 656 - - - 100 - - - 2 - - - horizontalSplitContainer - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - verticalSplitContainer.Panel1 - - - 0 - - - verticalSplitContainer.Panel1 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - verticalSplitContainer - - - 0 - - - Fill - - - 0, 0 - - - Horizontal - - - True - - - Fill - - - TopDown - - - 0, 0 - - - 230, 240 - - - 1 - - - False - - - progressFlowLayoutPanel - - - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - rightHorizSplitContainer.Panel1 - - - 0 - - - rightHorizSplitContainer.Panel1 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - rightHorizSplitContainer - - - 0 - - - rightHorizSplitContainer.Panel2 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - rightHorizSplitContainer - - - 1 - - - 230, 656 - - - 240 - - - 0 - - - rightHorizSplitContainer - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - verticalSplitContainer.Panel2 - - - 0 - - - verticalSplitContainer.Panel2 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - verticalSplitContainer - - - 1 - - - 1254, 656 - - - 1020 - - - 3 - - - verticalSplitContainer - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - - - 152, 17 - - - 0, 17 - - - 0, 17 - - - 0, 680 - - - 1254, 22 - - - 2 - - - statusStrip1 - - - statusStrip1 - - - System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 1 - - - 143, 22 - - - Components - - - 143, 22 - - - Paths - - - 143, 22 - - - Transitions - - - 143, 22 - - - Metrology - - - 140, 6 - - - 143, 22 - - - Exit - - - 52, 20 - - - Bench - - - 52, 20 - - - Home - - - 92, 20 - - - Measurement - - - 56, 20 - - - Results - - - 44, 20 - - - Logs - - - 126, 22 - - - Users - - - 126, 22 - - - Language - - - 126, 22 - - - Database - - - 126, 22 - - - Password - - - 61, 20 - - - Settings - - - 107, 22 - - - About - - - 44, 20 - - - Help - - - 17, 17 - - - 78, 20 - - - Procedures - - - 59, 20 - - - Process - - - 61, 20 - - - Pictures - - - 56, 20 - - - Results - - - 0, 0 - - - 1254, 24 - - - 0 - mainMenuStrip - - mainMenuStrip + + 0 - - System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fill + + + 485, 104 + + + 0, 0 + + + ControlComponent3Munich.UserControl1, ControlComponent3Munich, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + 30 + + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Progress + + + 126, 22 + + + aboutTSMenuItem + + + 258, 64 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 12, 8 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 4, 4, 4, 4 + + + progressGroupBox + + + 0, 24 + + + logsTabPageCtrl + + + 0, 0 + + + 240 $this - + + TBF.Screens.MeasurementTabPageCtrl, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + Procedure + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 61, 20 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 237, 33 + + + Horizontal + + + 29 + + + 56, 20 + + + 0 + + 2 + + Users + + + 1012, 523 + + + 2 + + + False + + + benchTransitionsToolStripMenuItem + + + mainMenuStrip + + + 0 + + + 0, 17 + + + 0 + + + 3 + + + Verdana, 12pt + + + Pictures + + + verticalSplitContainer.Panel2 + + + 0 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 126, 22 + + + 0 + + + 1 + + + usersTSMenuItem + + + 1012, 523 + + + horizontalSplitContainer.Panel2 + + + 1 + + + rightHorizSplitContainer + + + 0, 17 + + + 1012, 523 + + + Fill + + + mainTabControl + + + 1012, 523 + + + 6 + True 25 - - 6, 13 - - - 1254, 702 - - - Test Bench Framework - - - userInfoStatusLabel - - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - activityStatusLabel - - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - benchTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - benchComponentsTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - benchPathsTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - benchTransitionsToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - benchMetrologyTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - toolStripSeparator1 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - exitToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - homeTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - measurementTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - resultsTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - logsTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - editTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - usersTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - localSettingsTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - databaseSettingsTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - passwortToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - helpTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - aboutTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - proceduresToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - processToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - picturesTSMItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - resultsToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - MainWnd - - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + 152, 17 + + + 17, 17 + \ No newline at end of file diff --git a/TestBenchFramework/ProcedureDlg.Designer.cs b/TestBenchFramework/ProcedureDlg.Designer.cs index 03db46383..71ec5b890 100644 --- a/TestBenchFramework/ProcedureDlg.Designer.cs +++ b/TestBenchFramework/ProcedureDlg.Designer.cs @@ -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; diff --git a/TestBenchFramework/ProcedureDlg.de.resx b/TestBenchFramework/ProcedureDlg.de.resx index 65e47f2fc..4b2cf0350 100644 --- a/TestBenchFramework/ProcedureDlg.de.resx +++ b/TestBenchFramework/ProcedureDlg.de.resx @@ -320,7 +320,7 @@ 923, 371 - Prozess + Prüfstrecke 931, 409 diff --git a/TestBenchFramework/ProcedureDlg.resx b/TestBenchFramework/ProcedureDlg.resx index 867883114..ccb7d7d15 100644 --- a/TestBenchFramework/ProcedureDlg.resx +++ b/TestBenchFramework/ProcedureDlg.resx @@ -134,22 +134,16 @@ 24, 90 - - - 0 - tabControl + 0 10 - - $this - generalTabPage @@ -306,6 +300,9 @@ 139, 283 + + generalTabPage + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -351,6 +348,9 @@ Changed by + + 3, 3, 3, 3 + 57, 13 @@ -387,6 +387,9 @@ TBF.UiControls.ListViewEx, TBF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + resultsPrinterComboBox + Fill @@ -423,6 +426,9 @@ tabControl + + 291, 90 + 12 @@ -444,9 +450,6 @@ createdOnTextBox - - metrology1ListViewEx - 17 @@ -519,8 +522,8 @@ 24 - - 291, 90 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 931 @@ -567,8 +570,8 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Fill + + metrology2TabPage Procedure name @@ -618,8 +621,8 @@ 5 - - resultsPrinterComboBox + + metrology1ListViewEx 97, 20 @@ -711,8 +714,8 @@ Process - - 3, 3, 3, 3 + + 17 watermetersLabel @@ -747,8 +750,8 @@ resultsWriterComboBox - - 17 + + $this True @@ -834,6 +837,9 @@ generalTabPage + + Fill + sharedButtons @@ -957,9 +963,6 @@ 3, 3, 3, 3 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 121, 21 @@ -978,11 +981,8 @@ 3, 3 - - generalTabPage - - - 4 + + 0 generalTabPage @@ -1005,8 +1005,8 @@ 24, 318 - - metrology2TabPage + + 4 System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1173,7 +1173,4 @@ True - - de - \ No newline at end of file diff --git a/TestBenchFramework/Resources/Strings.de.resx b/TestBenchFramework/Resources/Strings.de.resx index 7f35f2551..1a8b3aaeb 100644 --- a/TestBenchFramework/Resources/Strings.de.resx +++ b/TestBenchFramework/Resources/Strings.de.resx @@ -544,10 +544,10 @@ <kein> - Messsensoren + Abtastung - - Prüfenvahren + + Prüfart Ergebnise leeren @@ -592,7 +592,7 @@ Wiegen - Prüfdurchfluss anfahren + Prüfdurchfluss einstellen Prüfpunkt fertiggestellt @@ -634,7 +634,7 @@ Hersteller - Zählers + Zählerdaten Drucker @@ -721,13 +721,13 @@ Impulse pro Liter - Änderungsrate [%] + Durchflussänderung [%] - Relatives Q von + Relativer Q von - Relatives Q bis + Relativer Q bis Ubergang - Ende @@ -735,4 +735,19 @@ Ubergang - Start + + Einstellung Durchfluss + + + Auswahl Prüfart + + + + + + Prüfart + + + Volumen und Fehlergrenzen + \ No newline at end of file diff --git a/TestBenchFramework/TBF.csproj b/TestBenchFramework/TBF.csproj index b46e66e50..d60d24a66 100644 --- a/TestBenchFramework/TBF.csproj +++ b/TestBenchFramework/TBF.csproj @@ -935,6 +935,7 @@ TabNameDlg.cs + PicturesTabPageCtrl.cs @@ -1066,7 +1067,6 @@ ResXFileCodeGenerator Strings.Designer.cs - ProcessTabPageCtrl.cs diff --git a/TestBenchFramework/UiControls/BenchControlPanel.Designer.cs b/TestBenchFramework/UiControls/BenchControlPanel.Designer.cs index 6db3b2eda..1e3ab87e2 100644 --- a/TestBenchFramework/UiControls/BenchControlPanel.Designer.cs +++ b/TestBenchFramework/UiControls/BenchControlPanel.Designer.cs @@ -28,236 +28,236 @@ /// 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); } diff --git a/TestBenchFramework/UiControls/BenchControlPanel.de.resx b/TestBenchFramework/UiControls/BenchControlPanel.de.resx index 8ef361b7d..7bf5c8b5c 100644 --- a/TestBenchFramework/UiControls/BenchControlPanel.de.resx +++ b/TestBenchFramework/UiControls/BenchControlPanel.de.resx @@ -149,16 +149,16 @@ 5 Start Prüfung - Verdana, 14.25pt + Verdana, 11pt 93, 35 - 6 Anf. + 6 Befüllen - Verdana, 14.25pt + Verdana, 8pt 104, 23 @@ -167,7 +167,7 @@ 94, 35 - 7 Ende + 7 Entwässern Verdana, 11.25pt @@ -223,6 +223,12 @@ 9 Beh.2 + + 13, 3 + + + Prüfpunkt + Verdana, 14.25pt @@ -250,17 +256,11 @@ 1 - - 13, 3 - - - Prüfpunkt - 13, 252 - Spülen + Prüfstrecke 13, 397 @@ -277,18 +277,18 @@ Zubehör - - Verdana, 10pt - - - bestätigen - 13, 325 Ergebnisse + + Verdana, 10pt + + + bestätigen + 235, 1000 diff --git a/TestBenchFramework/UiControls/BenchControlPanel.resx b/TestBenchFramework/UiControls/BenchControlPanel.resx index 06514cf23..e7d42cbf0 100644 --- a/TestBenchFramework/UiControls/BenchControlPanel.resx +++ b/TestBenchFramework/UiControls/BenchControlPanel.resx @@ -118,300 +118,81 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Verdana, 15.75pt - - - - NoControl - - - 106, 168 - - - 92, 70 - - - - 5 - - - Stop - - - stopBtn - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - testGroupBox - - - 6 - - - Verdana, 15.75pt - - - NoControl - - - 8, 67 - - - 190, 45 - - - 4 + + 8, 26 Start Test - - startTestBtn + + + NoControl - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 92, 45 - - testGroupBox - - - 4 + + 0 Verdana, 15.75pt - - NoControl - - - 8, 168 - - - 92, 70 - - - 7 - - - Start Cycle - - - startCycleBtn - - + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - testGroupBox + + 3 - - 5 - - + Verdana, 15.75pt - - NoControl + + 2 - - 8, 23 - - - 92, 35 - - - 8 - - - Begin - - - purgeBeginBtn - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - purgeGroupBox - - - 1 - - - Verdana, 15.75pt - - + NoControl 106, 23 - - 92, 35 + + 4, 4, 4, 4 - - 9 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - End + + 2 - - purgeEndBtn + + + 5 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - purgeGroupBox - - - 0 - - - Verdana, 12pt - - - NoControl - - - 8, 26 - - - 92, 45 - - - 10 - - - Try heads - - - tryHeadsBtn - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - otherGroupBox - - - 3 - - - Verdana, 15.75pt - - - NoControl - - - 8, 20 - - - 92, 42 - - - 11 - - - Reset - - - resetResultsBtn - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 1 + + Results Verdana, 12pt - - NoControl - - - 106, 26 - - - 92, 45 - - - 12 - - - Calib- ration - - - calibrationBtn - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - otherGroupBox - - - 2 - - - Verdana, 15.75pt - - - NoControl - - - 8, 26 - - - 92, 35 - - - 13 - - - Tank 1 - - - emptyTank1Btn + + Verdana, 12pt System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - emptyGroupBox + + Verdana, 15.75pt - - 0 + + 19 - - Verdana, 12pt + + Verdana, 15.75pt - - NoControl + + Auxiliary - - 8, 77 - - - 92, 45 - - - 14 - - - Sensi- tivity - - - sensitivityTestBtn - - + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -420,367 +201,589 @@ 0 - - Verdana, 15.75pt - - - NoControl - - - 106, 26 - - - 92, 35 - - - 15 - - - Tank 2 - - - emptyTank2Btn + + Reset System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - emptyGroupBox - - - 1 - - - Verdana, 15.75pt - - - NoControl - - - 138, 117 - - - 60, 45 - - - 9 - - - Q3 - - - startQ3Btn - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - testGroupBox - - - 0 - - - Verdana, 15.75pt - - - NoControl - - - 73, 117 - - - 60, 45 - - - 8 - - - Q2 - startQ2Btn - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + sensitivityTestBtn - - testGroupBox + + Sensi- tivity - - 1 - - - Verdana, 15.75pt - - - NoControl - - - 8, 117 - - - 60, 45 - - - 7 - - - Q1 - - - startQ1Btn - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - testGroupBox - - - 2 - - - Verdana, 15.75pt - - - 8, 25 - - - 190, 33 - - - 6 - - - testComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - testGroupBox - - - 3 - - - Verdana, 12pt - - - 7, 3 - - - 207, 246 + + Verdana, 11.25pt 17 - - Test - - - testGroupBox - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 4 - - - Verdana, 12pt - 7, 253 - - 207, 68 - - - 18 - - - Purge - - - purgeGroupBox - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - - - Verdana, 12pt - - - 7, 397 - - - 207, 68 - - - 19 - - - Empty - - - emptyGroupBox - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - - - False + + 92, 35 Lucida Console, 8.25pt - - 106, 77 + + 106, 26 - - 91, 25 - - - 21 - - - Next - - - False - - - nextButton - - + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - otherGroupBox + + testGroupBox - - 1 - - - Verdana, 12pt - - - 7, 469 - - - 207, 128 - - - 20 - - - Auxiliary - - - otherGroupBox + + 8, 67 System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - $this + + Q3 - + + 3 + + 1 - + + groupBox1 + + + testGroupBox + + + 7, 397 + + + startCycleBtn + + + emptyGroupBox + + + startQ3Btn + + + testGroupBox + + + groupBox1 + + + 4 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 8 + + + 207, 68 + + + $this + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Verdana, 15.75pt - + + 7 + + + Begin + + NoControl 106, 20 - - 92, 42 + + 106, 77 - - 15 - - - Accept - - - acceptResultsBtn - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - + 0 - - Verdana, 12pt - - - 7, 325 - - - 207, 68 + + Try heads 22 - - Results + + Tank 2 - - groupBox1 + + 21 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + otherGroupBox - + + Q1 + + + Start Cycle + + + 92, 35 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + purgeEndBtn + + + Verdana, 12pt + + + nextButton + + + 1 + + $this - - 0 + + 92, 35 - - True - - - 9, 18 + + stopBtn - - Verdana, 11.25pt + + 92, 70 - - 4, 4, 4, 4 - - - 224, 736 + + 20 BenchControlPanel + + Purge + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 8, 168 + + + 1 + + + 6 + + + 14 + + + 0 + + + 92, 35 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 6 + + + 0 + + + 92, 42 + + + 190, 33 + + + NoControl + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + End + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + purgeGroupBox + + + Empty + + + NoControl + + + startQ1Btn + + + Tank 1 + + + 13 + + + NoControl + + + Verdana, 15.75pt + + + 7 + + + 3 + + + purgeGroupBox + + + 7, 325 + + + 4 + + + testGroupBox + + + resetResultsBtn + + + Verdana, 15.75pt + + + calibrationBtn + + + 92, 42 + + + Test + + + $this + + + 2 + + + 92, 45 + + + Verdana, 15.75pt + + + startTestBtn + + + 10 + + + emptyTank1Btn + + + 15 + + + False + + + 11 + + + 9 + + + testComboBox + + + testGroupBox + + + 60, 45 + + + 4 + + + 9 + + + 224, 736 + + + purgeBeginBtn + + + Verdana, 12pt + + + acceptResultsBtn + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 1 + + + Calib- ration + + + emptyGroupBox + + + 1 + + + 8, 25 + + + testGroupBox + System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 138, 117 + + + NoControl + + + 60, 45 + + + 8 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 8, 117 + + + Verdana, 15.75pt + + + 73, 117 + + + otherGroupBox + + + 207, 68 + + + Stop + + + Verdana, 15.75pt + + + NoControl + + + Verdana, 12pt + + + NoControl + + + 106, 168 + + + 106, 26 + + + NoControl + + + 9, 18 + + + NoControl + + + Verdana, 12pt + + + Verdana, 12pt + + + 0 + + + 8, 77 + + + 8, 23 + + + 5 + + + NoControl + + + 190, 45 + + + 207, 68 + + + $this + + + Verdana, 15.75pt + + + otherGroupBox + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Verdana, 15.75pt + + + emptyGroupBox + + + emptyTank2Btn + + + 7, 469 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 8, 26 + + + 18 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 91, 25 + + + 92, 45 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 7, 3 + + + 1 + + + Verdana, 12pt + + + purgeGroupBox + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 8, 20 + + + Q2 + + + tryHeadsBtn + + + groupBox1 + + + testGroupBox + + + NoControl + + + False + + + NoControl + + + Verdana, 15.75pt + + + testGroupBox + + + Next + + + otherGroupBox + + + NoControl + + + 12 + + + 92, 70 + + + 207, 128 + + + 15 + + + 207, 246 + + + Accept + + + 60, 45 + + + True + + + de + \ No newline at end of file