diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs index 264d4913c..858f27893 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs @@ -119,11 +119,11 @@ namespace TBF.BenchControl.DataEntry.Munich { if (waterMeters.Count >= 1 && waterMeters[0] != null) { - waterMeters[0].State = (modelessDlg as CycleEndForm).MainStateText; + waterMeters[0].EndState = (modelessDlg as CycleEndForm).MainStateText; } if (waterMeters.Count >= 2 && waterMeters[1] != null) { - waterMeters[1].State = (modelessDlg as CycleEndForm).AuxStateText; + waterMeters[1].EndState = (modelessDlg as CycleEndForm).AuxStateText; } protocolTitle = (modelessDlg as CycleEndForm).ProtocolTitle; } diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.Designer.cs b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.Designer.cs new file mode 100644 index 000000000..64d01f078 --- /dev/null +++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.Designer.cs @@ -0,0 +1,302 @@ +namespace TBF.BenchControl.DataEntry.Munich3 +{ + partial class CycleBeginningForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.okButton = new System.Windows.Forms.Button(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.textBox3 = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.textBox4 = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.groupBox5 = new System.Windows.Forms.GroupBox(); + this.textBox5 = new System.Windows.Forms.TextBox(); + this.label5 = new System.Windows.Forms.Label(); + this.groupBox6 = new System.Windows.Forms.GroupBox(); + this.textBox6 = new System.Windows.Forms.TextBox(); + this.label6 = new System.Windows.Forms.Label(); + this.groupBox1.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.groupBox3.SuspendLayout(); + this.groupBox4.SuspendLayout(); + this.groupBox5.SuspendLayout(); + this.groupBox6.SuspendLayout(); + this.SuspendLayout(); + // + // okButton + // + this.okButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + 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 + // + 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); + 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); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(159, 23); + this.label1.TabIndex = 0; + this.label1.Text = "Seriennummer:"; + // + // 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); + 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); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(159, 23); + this.label4.TabIndex = 0; + this.label4.Text = "Seriennummer:"; + // + // 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); + 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); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(159, 23); + this.label2.TabIndex = 0; + this.label2.Text = "Seriennummer:"; + // + // 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); + 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); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(159, 23); + this.label3.TabIndex = 0; + this.label3.Text = "Seriennummer:"; + // + // 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); + 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); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(159, 23); + this.label5.TabIndex = 0; + this.label5.Text = "Seriennummer:"; + // + // 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); + 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); + 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); + 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); + this.Controls.Add(this.groupBox3); + this.Controls.Add(this.groupBox2); + this.Controls.Add(this.groupBox1); + this.Controls.Add(this.okButton); + 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); + this.groupBox1.PerformLayout(); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); + this.groupBox3.ResumeLayout(false); + this.groupBox3.PerformLayout(); + this.groupBox4.ResumeLayout(false); + this.groupBox4.PerformLayout(); + this.groupBox5.ResumeLayout(false); + this.groupBox5.PerformLayout(); + this.groupBox6.ResumeLayout(false); + this.groupBox6.PerformLayout(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Button okButton; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.GroupBox groupBox3; + private System.Windows.Forms.TextBox textBox3; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.GroupBox groupBox4; + private System.Windows.Forms.TextBox textBox4; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.GroupBox groupBox5; + private System.Windows.Forms.TextBox textBox5; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.GroupBox groupBox6; + private System.Windows.Forms.TextBox textBox6; + private System.Windows.Forms.Label label6; + } +} \ No newline at end of file diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.cs b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.cs new file mode 100644 index 000000000..4c69028f9 --- /dev/null +++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.cs @@ -0,0 +1,63 @@ +using System; +using System.Windows.Forms; + +namespace TBF.BenchControl.DataEntry.Munich3 +{ + public partial class CycleBeginningForm : Form, GenericDevices.IHasCompleted + { + /// Number of text boxes for serial numbers + public readonly int WaterMetersCount; + + /// To be retrieved after the form is closed + public string[] SNText; + + /// Set to 'true' when the form closes + public bool Completed { get { return completed; } } + bool completed; + + /// + /// Constructor + /// + /// Number of text boxes for serial numbers + public CycleBeginningForm(int waterMetersCount) + { + this.WaterMetersCount = waterMetersCount; + } + + /// 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; + if (WaterMetersCount < 4) groupBox4.Visible = false; + if (WaterMetersCount < 5) groupBox5.Visible = false; + if (WaterMetersCount < 6) groupBox6.Visible = false; + } + + private void okButton_Click(object sender, EventArgs e) + { + if (WaterMetersCount >= 1) SNText[0] = textBox1.Text; + if (WaterMetersCount >= 2) SNText[1] = textBox2.Text; + if (WaterMetersCount >= 3) SNText[2] = textBox3.Text; + if (WaterMetersCount >= 4) SNText[3] = textBox4.Text; + if (WaterMetersCount >= 5) SNText[4] = textBox5.Text; + if (WaterMetersCount >= 6) SNText[5] = textBox6.Text; + + completed = true; + Close(); + } + } +} diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.resx b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.resx new file mode 100644 index 000000000..1af7de150 --- /dev/null +++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.Designer.cs b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.Designer.cs new file mode 100644 index 000000000..c31cba651 --- /dev/null +++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.Designer.cs @@ -0,0 +1,361 @@ +namespace TBF.BenchControl.DataEntry.Munich3 +{ + partial class CycleEndForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.okButton = new System.Windows.Forms.Button(); + this.groupBox0 = new System.Windows.Forms.GroupBox(); + this.radioButton3 = new System.Windows.Forms.RadioButton(); + this.radioButton2 = new System.Windows.Forms.RadioButton(); + this.radioButton1 = new System.Windows.Forms.RadioButton(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.textBox3 = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.textBox4 = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + this.groupBox5 = new System.Windows.Forms.GroupBox(); + this.textBox5 = new System.Windows.Forms.TextBox(); + this.label5 = new System.Windows.Forms.Label(); + this.groupBox6 = new System.Windows.Forms.GroupBox(); + this.textBox6 = new System.Windows.Forms.TextBox(); + this.label6 = new System.Windows.Forms.Label(); + this.groupBox2.SuspendLayout(); + this.groupBox1.SuspendLayout(); + this.groupBox0.SuspendLayout(); + this.groupBox3.SuspendLayout(); + this.groupBox4.SuspendLayout(); + this.groupBox5.SuspendLayout(); + this.groupBox6.SuspendLayout(); + this.SuspendLayout(); + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.textBox2); + this.groupBox2.Controls.Add(this.label3); + 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(25, 251); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(362, 81); + this.groupBox2.TabIndex = 2; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "Wasserzähler 2"; + // + // textBox2 + // + this.textBox2.Location = new System.Drawing.Point(183, 31); + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(163, 31); + this.textBox2.TabIndex = 1; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(18, 34); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(74, 23); + this.label3.TabIndex = 0; + this.label3.Text = "Stand:"; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.textBox1); + this.groupBox1.Controls.Add(this.label2); + 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(25, 161); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(362, 81); + this.groupBox1.TabIndex = 1; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Wasserzähler 1"; + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(183, 31); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(163, 31); + this.textBox1.TabIndex = 1; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(18, 34); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(74, 23); + this.label2.TabIndex = 0; + this.label2.Text = "Stand:"; + // + // okButton + // + this.okButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.okButton.ForeColor = System.Drawing.Color.Black; + this.okButton.Location = new System.Drawing.Point(425, 23); + this.okButton.Name = "okButton"; + this.okButton.Size = new System.Drawing.Size(98, 63); + this.okButton.TabIndex = 7; + this.okButton.Text = "OK"; + this.okButton.UseVisualStyleBackColor = true; + this.okButton.Click += new System.EventHandler(this.okButton_Click); + // + // groupBox0 + // + this.groupBox0.Controls.Add(this.radioButton3); + this.groupBox0.Controls.Add(this.radioButton2); + this.groupBox0.Controls.Add(this.radioButton1); + this.groupBox0.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.groupBox0.Location = new System.Drawing.Point(25, 13); + this.groupBox0.Name = "groupBox0"; + this.groupBox0.Size = new System.Drawing.Size(362, 142); + this.groupBox0.TabIndex = 0; + this.groupBox0.TabStop = false; + this.groupBox0.Text = "Protokoll"; + // + // radioButton3 + // + this.radioButton3.AutoSize = true; + this.radioButton3.Location = new System.Drawing.Point(34, 100); + this.radioButton3.Name = "radioButton3"; + this.radioButton3.Size = new System.Drawing.Size(152, 27); + this.radioButton3.TabIndex = 2; + this.radioButton3.TabStop = true; + this.radioButton3.Text = "radioButton3"; + this.radioButton3.UseVisualStyleBackColor = true; + // + // radioButton2 + // + this.radioButton2.AutoSize = true; + this.radioButton2.Location = new System.Drawing.Point(34, 67); + this.radioButton2.Name = "radioButton2"; + this.radioButton2.Size = new System.Drawing.Size(152, 27); + this.radioButton2.TabIndex = 1; + this.radioButton2.TabStop = true; + this.radioButton2.Text = "radioButton2"; + this.radioButton2.UseVisualStyleBackColor = true; + // + // radioButton1 + // + this.radioButton1.AutoSize = true; + this.radioButton1.Checked = true; + this.radioButton1.Location = new System.Drawing.Point(34, 34); + this.radioButton1.Name = "radioButton1"; + this.radioButton1.Size = new System.Drawing.Size(152, 27); + this.radioButton1.TabIndex = 0; + this.radioButton1.TabStop = true; + this.radioButton1.Text = "radioButton1"; + this.radioButton1.UseVisualStyleBackColor = true; + // + // groupBox3 + // + this.groupBox3.Controls.Add(this.textBox3); + this.groupBox3.Controls.Add(this.label1); + 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(25, 341); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(362, 81); + this.groupBox3.TabIndex = 3; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "Wasserzähler 3"; + // + // textBox3 + // + this.textBox3.Location = new System.Drawing.Point(183, 31); + this.textBox3.Name = "textBox3"; + this.textBox3.Size = new System.Drawing.Size(163, 31); + this.textBox3.TabIndex = 1; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(18, 34); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(74, 23); + this.label1.TabIndex = 0; + this.label1.Text = "Stand:"; + // + // groupBox4 + // + this.groupBox4.Controls.Add(this.textBox4); + this.groupBox4.Controls.Add(this.label4); + 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(25, 431); + this.groupBox4.Name = "groupBox4"; + this.groupBox4.Size = new System.Drawing.Size(362, 81); + this.groupBox4.TabIndex = 4; + this.groupBox4.TabStop = false; + this.groupBox4.Text = "Wasserzähler 4"; + // + // textBox4 + // + this.textBox4.Location = new System.Drawing.Point(183, 31); + this.textBox4.Name = "textBox4"; + this.textBox4.Size = new System.Drawing.Size(163, 31); + this.textBox4.TabIndex = 1; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(18, 34); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(74, 23); + this.label4.TabIndex = 0; + this.label4.Text = "Stand:"; + // + // 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(25, 521); + this.groupBox5.Name = "groupBox5"; + this.groupBox5.Size = new System.Drawing.Size(362, 81); + this.groupBox5.TabIndex = 5; + this.groupBox5.TabStop = false; + this.groupBox5.Text = "Wasserzähler 5"; + // + // textBox5 + // + this.textBox5.Location = new System.Drawing.Point(183, 31); + 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, 34); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(74, 23); + this.label5.TabIndex = 0; + this.label5.Text = "Stand:"; + // + // 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(25, 611); + this.groupBox6.Name = "groupBox6"; + this.groupBox6.Size = new System.Drawing.Size(362, 81); + this.groupBox6.TabIndex = 6; + this.groupBox6.TabStop = false; + this.groupBox6.Text = "Wasserzähler 6"; + // + // textBox6 + // + this.textBox6.Location = new System.Drawing.Point(183, 31); + 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, 34); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(74, 23); + this.label6.TabIndex = 0; + this.label6.Text = "Stand:"; + // + // CycleEndForm + // + 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.Controls.Add(this.groupBox6); + this.Controls.Add(this.groupBox5); + this.Controls.Add(this.groupBox4); + this.Controls.Add(this.groupBox3); + this.Controls.Add(this.groupBox0); + this.Controls.Add(this.okButton); + this.Controls.Add(this.groupBox2); + this.Controls.Add(this.groupBox1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + this.Name = "CycleEndForm"; + this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; + this.Text = "Daten"; + this.TopMost = true; + this.Load += new System.EventHandler(this.CycleEndForm_Load); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); + this.groupBox0.ResumeLayout(false); + this.groupBox0.PerformLayout(); + this.groupBox3.ResumeLayout(false); + this.groupBox3.PerformLayout(); + this.groupBox4.ResumeLayout(false); + this.groupBox4.PerformLayout(); + this.groupBox5.ResumeLayout(false); + this.groupBox5.PerformLayout(); + this.groupBox6.ResumeLayout(false); + this.groupBox6.PerformLayout(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Button okButton; + private System.Windows.Forms.GroupBox groupBox0; + private System.Windows.Forms.RadioButton radioButton3; + private System.Windows.Forms.RadioButton radioButton2; + private System.Windows.Forms.RadioButton radioButton1; + private System.Windows.Forms.GroupBox groupBox3; + private System.Windows.Forms.TextBox textBox3; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.GroupBox groupBox4; + private System.Windows.Forms.TextBox textBox4; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.GroupBox groupBox5; + private System.Windows.Forms.TextBox textBox5; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.GroupBox groupBox6; + private System.Windows.Forms.TextBox textBox6; + private System.Windows.Forms.Label label6; + + } +} \ No newline at end of file diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.cs b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.cs new file mode 100644 index 000000000..9fd8d0dee --- /dev/null +++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.cs @@ -0,0 +1,77 @@ +using System; +using System.Windows.Forms; + +namespace TBF.BenchControl.DataEntry.Munich3 +{ + public partial class CycleEndForm : Form, GenericDevices.IHasCompleted + { + /// Number of text boxes for serial numbers + public readonly int WaterMetersCount; + + // To be set before the form opens + public string ProtocolName1; + public string ProtocolName2; + public string ProtocolName3; + + // To be retrieved after the form closes + public string ProtocolTitle; + public string[] EndStateText; + + // Set to 'true' when the form closes + public bool Completed { get { return completed; } } + bool completed; + + /// + /// Constructor + /// + /// Number of text boxes for serial numbers + public CycleEndForm(int waterMetersCount) + { + this.WaterMetersCount = waterMetersCount; + } + + /// Parameterless constructor for 3 watermeters + public CycleEndForm() + : this(3) + { + InitializeComponent(); + EndStateText = new string[WaterMetersCount]; + completed = false; + } + + private void CycleEndForm_Load(object sender, EventArgs e) + { + // TODO: localize strings + + Height = 195 + 90 * WaterMetersCount; + + if (WaterMetersCount < 1) groupBox1.Visible = false; + if (WaterMetersCount < 2) groupBox2.Visible = false; + if (WaterMetersCount < 3) groupBox3.Visible = false; + if (WaterMetersCount < 4) groupBox4.Visible = false; + if (WaterMetersCount < 5) groupBox5.Visible = false; + if (WaterMetersCount < 6) groupBox6.Visible = false; + + radioButton1.Text = ProtocolName1; + radioButton2.Text = ProtocolName2; + radioButton3.Text = ProtocolName3; + } + + private void okButton_Click(object sender, EventArgs e) + { + if (WaterMetersCount >= 1) EndStateText[0] = textBox1.Text; + if (WaterMetersCount >= 2) EndStateText[1] = textBox3.Text; + if (WaterMetersCount >= 3) EndStateText[2] = textBox4.Text; + if (WaterMetersCount >= 4) EndStateText[3] = textBox5.Text; + if (WaterMetersCount >= 5) EndStateText[4] = textBox6.Text; + if (WaterMetersCount >= 6) EndStateText[5] = textBox6.Text; + + if (radioButton1.Checked) ProtocolTitle = ProtocolName1; + else if (radioButton2.Checked) ProtocolTitle = ProtocolName2; + else if (radioButton3.Checked) ProtocolTitle = ProtocolName3; + + completed = true; + Close(); + } + } +} diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.resx b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.resx new file mode 100644 index 000000000..1af7de150 --- /dev/null +++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs new file mode 100644 index 000000000..773617f2f --- /dev/null +++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs @@ -0,0 +1,132 @@ +using System; +using System.Collections.Generic; +using TBF.BenchControl; + +namespace TBF.BenchControl.DataEntry.Munich3 +{ + public class EntryForm : Generic.IComponent, IOperation, GenericDevices.IDataEntry, GenericDevices.IHasProtocolTitle + { + readonly EntryFormCfg entryFormCfg; + public Generic.IComponentCfg Cfg { get { return entryFormCfg; } } + + public static void ResetStaticProperties() { } + + public string Name { get { return entryFormCfg.Name; } } + + /// + /// Properties set by the Begin and the End form + /// + public string ProtocolTitle { get { return protocolTitle; } } + string protocolTitle; + + + System.Windows.Forms.Form modelessDlg; + + IList waterMeters; + + public enum CurrentOp + { + None, + ShowFormAtCycleBeginning, + ShowFormAtCycleEnd, + } + + CurrentOp currentOp; + + public EntryForm(EntryFormCfg cfg) + { + if (cfg == null) throw new ArgumentNullException("cfg"); + this.entryFormCfg = cfg; + currentOp = CurrentOp.None; + } + + /// Reference to the operation + public IOperation ShowFormAtCycleBeginningOp(IList waterMeters) + { + if (currentOp != CurrentOp.None) throw new Exception("Sequence error"); + currentOp = CurrentOp.ShowFormAtCycleBeginning; + this.waterMeters = waterMeters; + return this; + } + + /// Reference to the operation + public IOperation ShowFormAtCycleEndOp(IList waterMeters) + { + if (currentOp != CurrentOp.None) throw new Exception("Sequence error"); + currentOp = CurrentOp.ShowFormAtCycleEnd; + this.waterMeters = waterMeters; + return this; + } + + delegate void EntryFormDlgt(EntryForm myRef); + /// + void OpenBeginningDlg(EntryForm myRef) + { + myRef.modelessDlg = new CycleBeginningForm(Program.WMsCount); + modelessDlg.Show(); + } + /// + void OpenEndDlg(EntryForm myRef) + { + CycleEndForm endForm = new CycleEndForm(); + endForm.ProtocolName1 = entryFormCfg.ProtocolTitle1; + endForm.ProtocolName2 = entryFormCfg.ProtocolTitle2; + endForm.ProtocolName3 = entryFormCfg.ProtocolTitle3; + myRef.modelessDlg = endForm; + modelessDlg.Show(); + } + + /// Start this operation + public void Start() + { + switch (currentOp) + { + case CurrentOp.ShowFormAtCycleBeginning: + Program.MainWnd.Invoke(new EntryFormDlgt(OpenBeginningDlg), this); + break; + case CurrentOp.ShowFormAtCycleEnd: + Program.MainWnd.Invoke(new EntryFormDlgt(OpenEndDlg), this); + break; + } + } + + /// Run this operation + /// Event.ResultsPrinted + public Event Run() + { + if (!(modelessDlg as GenericDevices.IHasCompleted).Completed) return Event.None; + + if (modelessDlg is CycleBeginningForm) + { + CycleBeginningForm dlg = (modelessDlg as CycleBeginningForm); + + if (dlg.WaterMetersCount > 0 && waterMeters[0] != null) waterMeters[0].SerialNr = dlg.SNText[0]; + if (dlg.WaterMetersCount > 1 && waterMeters[1] != null) waterMeters[1].SerialNr = dlg.SNText[1]; + if (dlg.WaterMetersCount > 2 && waterMeters[2] != null) waterMeters[2].SerialNr = dlg.SNText[2]; + if (dlg.WaterMetersCount > 3 && waterMeters[3] != null) waterMeters[3].SerialNr = dlg.SNText[3]; + if (dlg.WaterMetersCount > 4 && waterMeters[4] != null) waterMeters[4].SerialNr = dlg.SNText[4]; + if (dlg.WaterMetersCount > 5 && waterMeters[5] != null) waterMeters[5].SerialNr = dlg.SNText[5]; + } + else if (modelessDlg is CycleEndForm) + { + CycleEndForm dlg = (modelessDlg as CycleEndForm); + + protocolTitle = dlg.ProtocolTitle; + if (dlg.WaterMetersCount > 0 && waterMeters[0] != null) waterMeters[0].EndState = dlg.EndStateText[0]; + if (dlg.WaterMetersCount > 1 && waterMeters[1] != null) waterMeters[1].EndState = dlg.EndStateText[1]; + if (dlg.WaterMetersCount > 2 && waterMeters[2] != null) waterMeters[2].EndState = dlg.EndStateText[2]; + if (dlg.WaterMetersCount > 3 && waterMeters[3] != null) waterMeters[3].EndState = dlg.EndStateText[3]; + if (dlg.WaterMetersCount > 4 && waterMeters[4] != null) waterMeters[4].EndState = dlg.EndStateText[4]; + if (dlg.WaterMetersCount > 5 && waterMeters[5] != null) waterMeters[5].EndState = dlg.EndStateText[5]; + } + return Event.Done; + } + + /// Stop this operation + public void Stop() + { + modelessDlg = null; + currentOp = CurrentOp.None; + } + } +} diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfg.cs b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfg.cs new file mode 100644 index 000000000..0d9df24f2 --- /dev/null +++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfg.cs @@ -0,0 +1,62 @@ +using System; +using System.IO; +using System.Xml.Serialization; +using TBF.BenchControl.Generic; + +namespace TBF.BenchControl.DataEntry.Munich3 +{ + public class EntryFormCfg : ComponentCfgBase, Generic.IComponentCfg + { + public string ProtocolTitle1; + public string ProtocolTitle2; + public string ProtocolTitle3; + + /// Parameterless constructor + public EntryFormCfg() + { + } + + /// + /// Data entry form configuration parameters + /// + /// Data entry form factory + /// Component name + public EntryFormCfg(IComponentFactory factory, string name, + string protocolTitle1, string protocolTitle2, string protocolTitle3) + : base(factory, name) + { + this.ProtocolTitle1 = protocolTitle1; + this.ProtocolTitle2 = protocolTitle2; + this.ProtocolTitle3 = protocolTitle3; + } + + public IComponentCfg Clone() + { + return new EntryFormCfg(Factory, Name, ProtocolTitle1, ProtocolTitle2, ProtocolTitle3); + } + + public string ToString(int i) + { + return string.Empty; + } + + public TBF.Entities.Component CreateDbEntity() + { + using (var writer = new StringWriter()) + { + (new XmlSerializer(GetType())).Serialize(writer, this); + return Entities.Component.CreateFromCfg(Name, Factory.ClassName, ParentName, ItemNr, DebugLevel, LogLevel, writer.ToString()); + } + } + + public static IComponentCfg CreateFromDbEntity(Entities.Component component, IComponentFactory factory) + { + using (var reader = new StringReader(component.Parameters)) + { + EntryFormCfg config = (EntryFormCfg)(new XmlSerializer(typeof(EntryFormCfg))).Deserialize(reader); + config.InitCfgBaseFromEntity(component, factory); + return config; + } + } + } +} diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.cs b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.cs new file mode 100644 index 000000000..27a8956d6 --- /dev/null +++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.cs @@ -0,0 +1,67 @@ +using System; +using System.Windows.Forms; +using log4net; +using TBF.BenchControl.Generic; + +namespace TBF.BenchControl.DataEntry.Munich3 +{ + public partial class EntryFormCfgCtrl : UserControl, IComponentCfgCtrl + { + static readonly ILog log = LogManager.GetLogger(typeof(EntryFormCfgCtrl)); + + EntryFormCfg config; + + public IComponentCfg Config + { + get { return config as IComponentCfg; } + set + { + config = value as EntryFormCfg; + Redraw(); + } + } + + public EntryFormCfgCtrl() + { + InitializeComponent(); + } + + private void EntryFormCfgCtrl_Load(object sender, EventArgs e) + { + Redraw(); + } + + void Redraw() + { + if (config == null) return; /// Control was not loaded, settings were not changed + classNameLabel.Text = config.Factory.ClassName; + nameTextBox.Text = config.Name; + protocolTitle1TextBox.Text = config.ProtocolTitle1; + protocolTitle2TextBox.Text = config.ProtocolTitle2; + protocolTitle3TextBox.Text = config.ProtocolTitle3; + } + + public void Unlock() + { + nameTextBox.Enabled = true; + protocolTitle1TextBox.Enabled = true; + protocolTitle2TextBox.Enabled = true; + protocolTitle3TextBox.Enabled = true; + } + + public CfgVerifyFlags VerifyCfg(ref string message) + { + CfgVerifyFlags flags = CfgVerifyFlags.None; + return flags; + } + + public void UpdateCfg() + { + if (config == null) return; /// Control was not loaded, settings were not changed + config.Name = nameTextBox.Text; + config.ProtocolTitle1 = protocolTitle1TextBox.Text; + config.ProtocolTitle2 = protocolTitle2TextBox.Text; + config.ProtocolTitle3 = protocolTitle3TextBox.Text; + } + } +} diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.designer.cs b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.designer.cs new file mode 100644 index 000000000..b0c1abe27 --- /dev/null +++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.designer.cs @@ -0,0 +1,152 @@ +namespace TBF.BenchControl.DataEntry.Munich3 +{ + partial class EntryFormCfgCtrl + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.nameTextBox = new System.Windows.Forms.TextBox(); + this.nameLabel = new System.Windows.Forms.Label(); + this.classNameLabel = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.protocolTitle1TextBox = new System.Windows.Forms.TextBox(); + this.protocolTitle2TextBox = new System.Windows.Forms.TextBox(); + this.protocolTitle3TextBox = new System.Windows.Forms.TextBox(); + this.SuspendLayout(); + // + // nameTextBox + // + this.nameTextBox.Enabled = false; + this.nameTextBox.Location = new System.Drawing.Point(137, 57); + this.nameTextBox.Name = "nameTextBox"; + this.nameTextBox.Size = new System.Drawing.Size(130, 20); + this.nameTextBox.TabIndex = 5; + // + // nameLabel + // + this.nameLabel.AutoSize = true; + this.nameLabel.Location = new System.Drawing.Point(27, 60); + this.nameLabel.Name = "nameLabel"; + this.nameLabel.Size = new System.Drawing.Size(35, 13); + this.nameLabel.TabIndex = 4; + this.nameLabel.Text = "Name"; + // + // classNameLabel + // + this.classNameLabel.AutoSize = true; + this.classNameLabel.Location = new System.Drawing.Point(134, 33); + this.classNameLabel.Name = "classNameLabel"; + this.classNameLabel.Size = new System.Drawing.Size(83, 13); + this.classNameLabel.TabIndex = 3; + this.classNameLabel.Text = "ComonentName"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(27, 86); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(74, 13); + this.label1.TabIndex = 6; + this.label1.Text = "Protocol title 1"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(27, 112); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(74, 13); + this.label2.TabIndex = 7; + this.label2.Text = "Protocol title 2"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(27, 138); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(74, 13); + this.label3.TabIndex = 8; + this.label3.Text = "Protocol title 3"; + // + // protocolTitle1TextBox + // + this.protocolTitle1TextBox.Enabled = false; + this.protocolTitle1TextBox.Location = new System.Drawing.Point(137, 83); + this.protocolTitle1TextBox.Name = "protocolTitle1TextBox"; + this.protocolTitle1TextBox.Size = new System.Drawing.Size(130, 20); + this.protocolTitle1TextBox.TabIndex = 9; + // + // protocolTitle2TextBox + // + this.protocolTitle2TextBox.Enabled = false; + this.protocolTitle2TextBox.Location = new System.Drawing.Point(137, 109); + this.protocolTitle2TextBox.Name = "protocolTitle2TextBox"; + this.protocolTitle2TextBox.Size = new System.Drawing.Size(130, 20); + this.protocolTitle2TextBox.TabIndex = 10; + // + // protocolTitle3TextBox + // + this.protocolTitle3TextBox.Enabled = false; + this.protocolTitle3TextBox.Location = new System.Drawing.Point(137, 135); + this.protocolTitle3TextBox.Name = "protocolTitle3TextBox"; + this.protocolTitle3TextBox.Size = new System.Drawing.Size(130, 20); + this.protocolTitle3TextBox.TabIndex = 11; + // + // EntryFormCfgCtrl + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.protocolTitle3TextBox); + this.Controls.Add(this.protocolTitle2TextBox); + this.Controls.Add(this.protocolTitle1TextBox); + this.Controls.Add(this.label3); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Controls.Add(this.nameTextBox); + this.Controls.Add(this.nameLabel); + this.Controls.Add(this.classNameLabel); + this.Name = "EntryFormCfgCtrl"; + this.Size = new System.Drawing.Size(300, 200); + this.Load += new System.EventHandler(this.EntryFormCfgCtrl_Load); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.TextBox nameTextBox; + private System.Windows.Forms.Label nameLabel; + private System.Windows.Forms.Label classNameLabel; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.TextBox protocolTitle1TextBox; + private System.Windows.Forms.TextBox protocolTitle2TextBox; + private System.Windows.Forms.TextBox protocolTitle3TextBox; + } +} diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.resx b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.resx new file mode 100644 index 000000000..1af7de150 --- /dev/null +++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormFactory.cs b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormFactory.cs new file mode 100644 index 000000000..a996cb9f4 --- /dev/null +++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormFactory.cs @@ -0,0 +1,40 @@ +using System.Collections.Generic; +using TBF.BenchControl.Generic; + +namespace TBF.BenchControl.DataEntry.Munich3 +{ + public class EntryFormFactory : IComponentFactory + { + public string ClassName { get { return "DataEntryForm-3"; } } + public bool HasProcedureParams { get { return false; } } + public bool HasTestParams { get { return false; } } + public IParamsProvider GetTestParams(Entities.ComponentTest testParams) { return null; } + public IParamsProvider GetProcedureParams(Entities.ComponentProcedure procedureParams) { return null; } + + /// Max. number of components of this class in the system + public int MaxCount { get { return 1; } } + + + public IComponentCfg DefaultConfig(IList components) + { + return new EntryFormCfg(this, "DataEntryForm-3", "Protokoll Werkprüfung", "Protokoll 2", "Protokoll 3"); + } + + public IComponentCfgCtrl CreateCfgCtrl() + { + return new EntryFormCfgCtrl(); + } + + public IComponent ComponentFromCmpntCfg(IComponentCfg config, IList components) + { + return new EntryForm((EntryFormCfg)config); + } + + public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) + { + return EntryFormCfg.CreateFromDbEntity(component, this); + } + + public void ResetStaticProperties() { EntryForm.ResetStaticProperties(); } + } +} diff --git a/TestBenchFramework/BenchControl/GenericDevices/IWaterMeter.cs b/TestBenchFramework/BenchControl/GenericDevices/IWaterMeter.cs index 33f075a0e..5b556154c 100644 --- a/TestBenchFramework/BenchControl/GenericDevices/IWaterMeter.cs +++ b/TestBenchFramework/BenchControl/GenericDevices/IWaterMeter.cs @@ -9,6 +9,6 @@ namespace TBF.BenchControl.GenericDevices string ApprovalInfo { get; } string MetrologicalClass { get; } string SerialNr { get; set; } - string State { get; set; } + string EndState { get; set; } } } diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Munich/MunichPrintDocument.cs b/TestBenchFramework/BenchControl/ResultsPrinters/Munich/MunichPrintDocument.cs index 00165f2bd..d0fa68096 100644 --- a/TestBenchFramework/BenchControl/ResultsPrinters/Munich/MunichPrintDocument.cs +++ b/TestBenchFramework/BenchControl/ResultsPrinters/Munich/MunichPrintDocument.cs @@ -168,11 +168,11 @@ namespace TBF.BenchControl.ResultsPrinters.Munich lineNr++; PrintAt(e, Tab1, lineNr * SpacingOne, "Stand :"); - PrintAt(e, Tab2, lineNr * SpacingOne, prn.WaterMeters[0].State); + PrintAt(e, Tab2, lineNr * SpacingOne, prn.WaterMeters[0].EndState); if (combined) { PrintAt(e, Tab3, lineNr * SpacingOne, "Stand :"); - PrintAt(e, Tab4, lineNr * SpacingOne, prn.WaterMeters[1].State); + PrintAt(e, Tab4, lineNr * SpacingOne, prn.WaterMeters[1].EndState); lineNr += 2; PrintAt(e, Tab1, lineNr * SpacingOne, "Umschaltpunkte :"); diff --git a/TestBenchFramework/BenchControl/TbfComponents.cs b/TestBenchFramework/BenchControl/TbfComponents.cs index f68a0484b..47de3385a 100644 --- a/TestBenchFramework/BenchControl/TbfComponents.cs +++ b/TestBenchFramework/BenchControl/TbfComponents.cs @@ -15,7 +15,8 @@ namespace TBF.BenchControl Factories.Add(new Cameras.IdcCamera.IdcCameraFactory()); Factories.Add(new Cameras.CameraRoi.CameraRoiFactory()); Factories.Add(new DataEntry.Munich.EntryFormFactory()); - Factories.Add(new Elde.ControlBoardFactory()); + Factories.Add(new DataEntry.Munich3.EntryFormFactory()); + Factories.Add(new Elde.ControlBoardFactory()); Factories.Add(new Elde.Diverter.DiverterFactory()); Factories.Add(new Elde.FlowMeter.FlowMeterFactory()); Factories.Add(new Elde.PressureMeter.PressureMeterFactory()); diff --git a/TestBenchFramework/BenchControl/WaterMeter/WaterMeter.cs b/TestBenchFramework/BenchControl/WaterMeter/WaterMeter.cs index 5835456d9..a4aa72cbd 100644 --- a/TestBenchFramework/BenchControl/WaterMeter/WaterMeter.cs +++ b/TestBenchFramework/BenchControl/WaterMeter/WaterMeter.cs @@ -45,7 +45,7 @@ namespace TBF.BenchControl.WaterMeter } string serialNr; - public string State + public string EndState { get { return endState; } set { endState = value; } diff --git a/TestBenchFramework/TBF.csproj b/TestBenchFramework/TBF.csproj index 781278d59..683959bd7 100644 --- a/TestBenchFramework/TBF.csproj +++ b/TestBenchFramework/TBF.csproj @@ -158,6 +158,27 @@ + + Form + + + CycleBeginningForm.cs + + + Form + + + CycleEndForm.cs + + + + + UserControl + + + EntryFormCfgCtrl.cs + + Form @@ -827,6 +848,15 @@ IdcCameraCfgCtrl.cs + + CycleBeginningForm.cs + + + CycleEndForm.cs + + + EntryFormCfgCtrl.cs + CycleBeginningForm.cs