diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.Designer.cs b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.Designer.cs index 64d01f078..1b202cd45 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.Designer.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CycleBeginningForm)); this.okButton = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.textBox1 = new System.Windows.Forms.TextBox(); @@ -57,197 +58,131 @@ // // okButton // - this.okButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + resources.ApplyResources(this.okButton, "okButton"); this.okButton.ForeColor = System.Drawing.Color.Black; - this.okButton.Location = new System.Drawing.Point(439, 27); this.okButton.Name = "okButton"; - this.okButton.Size = new System.Drawing.Size(98, 63); - this.okButton.TabIndex = 0; - this.okButton.Text = "OK"; this.okButton.UseVisualStyleBackColor = true; this.okButton.Click += new System.EventHandler(this.okButton_Click); // // groupBox1 // + resources.ApplyResources(this.groupBox1, "groupBox1"); this.groupBox1.Controls.Add(this.textBox1); this.groupBox1.Controls.Add(this.label1); - this.groupBox1.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.groupBox1.ForeColor = System.Drawing.Color.Black; - this.groupBox1.Location = new System.Drawing.Point(28, 18); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(376, 92); - this.groupBox1.TabIndex = 1; this.groupBox1.TabStop = false; - this.groupBox1.Text = "Wasserzähler 1"; // // textBox1 // - this.textBox1.Location = new System.Drawing.Point(183, 37); + resources.ApplyResources(this.textBox1, "textBox1"); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(163, 31); - this.textBox1.TabIndex = 1; // // label1 // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(18, 40); + resources.ApplyResources(this.label1, "label1"); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(159, 23); - this.label1.TabIndex = 0; - this.label1.Text = "Seriennummer:"; // // groupBox2 // + resources.ApplyResources(this.groupBox2, "groupBox2"); this.groupBox2.Controls.Add(this.textBox2); this.groupBox2.Controls.Add(this.label4); - this.groupBox2.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.groupBox2.ForeColor = System.Drawing.Color.Black; - this.groupBox2.Location = new System.Drawing.Point(28, 123); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(376, 92); - this.groupBox2.TabIndex = 2; this.groupBox2.TabStop = false; - this.groupBox2.Text = "Wasserzähler 2"; // // textBox2 // - this.textBox2.Location = new System.Drawing.Point(183, 37); + resources.ApplyResources(this.textBox2, "textBox2"); this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(163, 31); - this.textBox2.TabIndex = 1; // // label4 // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(18, 40); + resources.ApplyResources(this.label4, "label4"); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(159, 23); - this.label4.TabIndex = 0; - this.label4.Text = "Seriennummer:"; // // groupBox3 // + resources.ApplyResources(this.groupBox3, "groupBox3"); this.groupBox3.Controls.Add(this.textBox3); this.groupBox3.Controls.Add(this.label2); - this.groupBox3.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.groupBox3.ForeColor = System.Drawing.Color.Black; - this.groupBox3.Location = new System.Drawing.Point(28, 228); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(376, 92); - this.groupBox3.TabIndex = 3; this.groupBox3.TabStop = false; - this.groupBox3.Text = "Wasserzähler 3"; // // textBox3 // - this.textBox3.Location = new System.Drawing.Point(183, 37); + resources.ApplyResources(this.textBox3, "textBox3"); this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(163, 31); - this.textBox3.TabIndex = 1; // // label2 // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(18, 40); + resources.ApplyResources(this.label2, "label2"); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(159, 23); - this.label2.TabIndex = 0; - this.label2.Text = "Seriennummer:"; // // groupBox4 // + resources.ApplyResources(this.groupBox4, "groupBox4"); this.groupBox4.Controls.Add(this.textBox4); this.groupBox4.Controls.Add(this.label3); - this.groupBox4.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.groupBox4.ForeColor = System.Drawing.Color.Black; - this.groupBox4.Location = new System.Drawing.Point(28, 333); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(376, 92); - this.groupBox4.TabIndex = 4; this.groupBox4.TabStop = false; - this.groupBox4.Text = "Wasserzähler 4"; // // textBox4 // - this.textBox4.Location = new System.Drawing.Point(183, 37); + resources.ApplyResources(this.textBox4, "textBox4"); this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(163, 31); - this.textBox4.TabIndex = 1; // // label3 // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(18, 40); + resources.ApplyResources(this.label3, "label3"); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(159, 23); - this.label3.TabIndex = 0; - this.label3.Text = "Seriennummer:"; // // groupBox5 // + resources.ApplyResources(this.groupBox5, "groupBox5"); this.groupBox5.Controls.Add(this.textBox5); this.groupBox5.Controls.Add(this.label5); - this.groupBox5.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.groupBox5.ForeColor = System.Drawing.Color.Black; - this.groupBox5.Location = new System.Drawing.Point(28, 438); this.groupBox5.Name = "groupBox5"; - this.groupBox5.Size = new System.Drawing.Size(376, 92); - this.groupBox5.TabIndex = 5; this.groupBox5.TabStop = false; - this.groupBox5.Text = "Wasserzähler 5"; // // textBox5 // - this.textBox5.Location = new System.Drawing.Point(183, 37); + resources.ApplyResources(this.textBox5, "textBox5"); this.textBox5.Name = "textBox5"; - this.textBox5.Size = new System.Drawing.Size(163, 31); - this.textBox5.TabIndex = 1; // // label5 // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(18, 40); + resources.ApplyResources(this.label5, "label5"); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(159, 23); - this.label5.TabIndex = 0; - this.label5.Text = "Seriennummer:"; // // groupBox6 // + resources.ApplyResources(this.groupBox6, "groupBox6"); this.groupBox6.Controls.Add(this.textBox6); this.groupBox6.Controls.Add(this.label6); - this.groupBox6.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.groupBox6.ForeColor = System.Drawing.Color.Black; - this.groupBox6.Location = new System.Drawing.Point(28, 543); this.groupBox6.Name = "groupBox6"; - this.groupBox6.Size = new System.Drawing.Size(376, 92); - this.groupBox6.TabIndex = 4; this.groupBox6.TabStop = false; - this.groupBox6.Text = "Wasserzähler 6"; // // textBox6 // - this.textBox6.Location = new System.Drawing.Point(183, 37); + resources.ApplyResources(this.textBox6, "textBox6"); this.textBox6.Name = "textBox6"; - this.textBox6.Size = new System.Drawing.Size(163, 31); - this.textBox6.TabIndex = 1; // // label6 // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(18, 40); + resources.ApplyResources(this.label6, "label6"); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(159, 23); - this.label6.TabIndex = 0; - this.label6.Text = "Seriennummer:"; // // CycleBeginningForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.AutoSize = true; this.BackColor = System.Drawing.Color.DarkGoldenrod; - this.ClientSize = new System.Drawing.Size(569, 661); this.Controls.Add(this.groupBox6); this.Controls.Add(this.groupBox5); this.Controls.Add(this.groupBox4); @@ -258,7 +193,6 @@ this.ForeColor = System.Drawing.Color.Black; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.Name = "CycleBeginningForm"; - this.Text = "Daten"; this.TopMost = true; this.Load += new System.EventHandler(this.CycleBeginningForm_Load); this.groupBox1.ResumeLayout(false); diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.cs b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.cs index 4c69028f9..dea495a62 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.cs @@ -22,23 +22,23 @@ namespace TBF.BenchControl.DataEntry.Munich3 public CycleBeginningForm(int waterMetersCount) { this.WaterMetersCount = waterMetersCount; + InitializeComponent(); + SNText = new string[WaterMetersCount]; + completed = false; + + //Height = 55 + WaterMetersCount * 105; } /// Parameterless constructor for 3 watermeters public CycleBeginningForm() : this(3) { - InitializeComponent(); - SNText = new string[WaterMetersCount]; - completed = false; } private void CycleBeginningForm_Load(object sender, EventArgs e) { // TODO: localize strings - Height = 55 + WaterMetersCount * 105; - if (WaterMetersCount < 1) groupBox1.Visible = false; if (WaterMetersCount < 2) groupBox2.Visible = false; if (WaterMetersCount < 3) groupBox3.Visible = false; diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.resx b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.resx index 1af7de150..2628a7388 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.resx +++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.resx @@ -117,4 +117,504 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 183, 37 + + + 0 + + + 159, 23 + + + Verdana, 14.25pt + + + label6 + + + 439, 27 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + 0 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Wasserzähler 3 + + + groupBox1 + + + 376, 92 + + + 0 + + + textBox6 + + + Seriennummer: + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Verdana, 14.25pt + + + groupBox6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Wasserzähler 4 + + + 1 + + + groupBox4 + + + 376, 92 + + + 4 + + + 0 + + + groupBox6 + + + textBox3 + + + $this + + + 0 + + + 0 + + + Daten + + + 1 + + + Verdana, 14.25pt + + + Wasserzähler 5 + + + 1 + + + label1 + + + 376, 92 + + + 0 + + + 1 + + + 163, 31 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 1 + + + 163, 31 + + + Wasserzähler 6 + + + OK + + + Seriennummer: + + + 1 + + + Seriennummer: + + + True + + + 163, 31 + + + True + + + $this + + + $this + + + True + + + groupBox5 + + + groupBox1 + + + 1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + 183, 37 + + + label5 + + + groupBox3 + + + groupBox4 + + + 0 + + + 18, 40 + + + 183, 37 + + + 18, 40 + + + groupBox5 + + + CycleBeginningForm + + + 569, 339 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 3 + + + 376, 92 + + + groupBox2 + + + $this + + + 5 + + + 1 + + + 5 + + + groupBox4 + + + okButton + + + $this + + + 159, 23 + + + 18, 40 + + + $this + + + groupBox3 + + + 98, 63 + + + 6 + + + 2 + + + 28, 18 + + + $this + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Seriennummer: + + + label4 + + + textBox4 + + + 0 + + + 159, 23 + + + 18, 40 + + + 0 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox6 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 183, 37 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + textBox1 + + + Verdana, 14.25pt + + + 2 + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 28, 438 + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + groupBox5 + + + Seriennummer: + + + groupBox3 + + + 1 + + + True + + + 4 + + + 163, 31 + + + 1 + + + 3 + + + 159, 23 + + + 28, 123 + + + textBox5 + + + 163, 31 + + + 6, 13 + + + True + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Verdana, 14.25pt + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 4 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 159, 23 + + + 28, 228 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 183, 37 + + + label2 + + + 183, 37 + + + 18, 40 + + + Wasserzähler 1 + + + Verdana, 14.25pt + + + 1 + + + 376, 92 + + + 28, 333 + + + 1 + + + 163, 31 + + + True + + + 28, 543 + + + Wasserzähler 2 + + + Verdana, 14.25pt + + + 159, 23 + + + 376, 92 + + + 0 + + + groupBox2 + + + groupBox2 + + + textBox2 + + + 1 + + + 18, 40 + + + 1 + + + True + + + Seriennummer: + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + True + \ No newline at end of file diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.Designer.cs b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.Designer.cs index c31cba651..593bd2586 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.Designer.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.Designer.cs @@ -298,7 +298,7 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.DarkGoldenrod; - this.ClientSize = new System.Drawing.Size(559, 711); + this.ClientSize = new System.Drawing.Size(559, 439); this.Controls.Add(this.groupBox6); this.Controls.Add(this.groupBox5); this.Controls.Add(this.groupBox4); diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.cs b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.cs index 9fd8d0dee..f00468938 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.cs @@ -28,15 +28,15 @@ namespace TBF.BenchControl.DataEntry.Munich3 public CycleEndForm(int waterMetersCount) { this.WaterMetersCount = waterMetersCount; + InitializeComponent(); + EndStateText = new string[WaterMetersCount]; + completed = false; } /// Parameterless constructor for 3 watermeters public CycleEndForm() : this(3) { - InitializeComponent(); - EndStateText = new string[WaterMetersCount]; - completed = false; } private void CycleEndForm_Load(object sender, EventArgs e) diff --git a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs index 21ca43c8d..0cccf937d 100644 --- a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs +++ b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs @@ -182,7 +182,7 @@ namespace TBF.BenchControl.Sequences { Bridge.OnActivity(this, "Enter the water meter data"); State.Create("MainSeq : Enter begin data") - .AddOperation((dataEntryCmpnt as GenericDevices.IDataEntry).ShowFormAtCycleBeginningOp(WaterMeters)) + .AddOperation(dataEntryCmpnt.ShowFormAtCycleBeginningOp(WaterMeters)) .AddOperation(checkUiOp) .EnterState(); do diff --git a/TestBenchFramework/BenchControl/StateMachine.cs b/TestBenchFramework/BenchControl/StateMachine.cs index 8da8c28fb..ea23d882b 100644 --- a/TestBenchFramework/BenchControl/StateMachine.cs +++ b/TestBenchFramework/BenchControl/StateMachine.cs @@ -307,7 +307,14 @@ namespace TBF.BenchControl { foreach (var cmpnt in components) { - if (cmpnt is ComponentBase) (cmpnt as ComponentBase).GetProcedureParams(procedure); + if (cmpnt is ComponentBase) + { + if (cmpnt.Cfg.Name.Equals("ROI2")) + { + int a = 5; + } + (cmpnt as ComponentBase).GetProcedureParams(procedure); + } } } diff --git a/TestBenchFramework/BenchControl/TbfComponents.cs b/TestBenchFramework/BenchControl/TbfComponents.cs index 47de3385a..5536663f8 100644 --- a/TestBenchFramework/BenchControl/TbfComponents.cs +++ b/TestBenchFramework/BenchControl/TbfComponents.cs @@ -139,7 +139,10 @@ namespace TBF.BenchControl /// Search for an existing matching entity foreach (var procPrms in procedure.MoreParams) { - if (procPrms.CmpntName.Equals(cmpnt.Cfg.Name)) return cmpnt.Cfg.Factory.GetProcedureParams(procPrms); + if (procPrms.CmpntName.Equals(cmpnt.Cfg.Name)) + { + return cmpnt.Cfg.Factory.GetProcedureParams(procPrms); + } } /// Create a new entity and add it to the list procedure.MoreParams