From af0de8734abe9f54f2d72767364ef9b3dc0471ac Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Thu, 19 May 2016 15:51:06 +0200 Subject: [PATCH] Munich.EntryForms support 4 protocols, ver.2.7.286 --- .../DataEntry/Munich/CycleEndForm.Designer.cs | 21 +- .../DataEntry/Munich/CycleEndForm.cs | 22 +- .../DataEntry/Munich/CycleEndForm.resx | 72 +++++- .../DataEntry/Munich/EntryForm.cs | 3 +- .../DataEntry/Munich/EntryFormCfg.cs | 13 +- .../DataEntry/Munich/EntryFormCfgCtrl.cs | 7 +- .../Munich/EntryFormCfgCtrl.designer.cs | 235 ++++++++++-------- .../DataEntry/Munich3/EntryFormCfg.cs | 11 +- .../DataEntry/Munich3/EntryFormCfgCtrl.cs | 7 +- .../Munich3/EntryFormCfgCtrl.designer.cs | 235 ++++++++++-------- TestBenchFramework/Properties/AssemblyInfo.cs | 4 +- 11 files changed, 387 insertions(+), 243 deletions(-) diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.Designer.cs b/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.Designer.cs index 34791a42e..4dc0a890c 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.Designer.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.Designer.cs @@ -63,6 +63,7 @@ namespace TBF.BenchControl.DataEntry.Munich this.mainState3Label = new System.Windows.Forms.Label(); this.auxState3TextBox = new System.Windows.Forms.TextBox(); this.auxState3Label = new System.Windows.Forms.Label(); + this.radioButton4 = new System.Windows.Forms.RadioButton(); this.groupBox1.SuspendLayout(); this.protocolGroupBox.SuspendLayout(); this.groupBox2.SuspendLayout(); @@ -156,9 +157,9 @@ namespace TBF.BenchControl.DataEntry.Munich // 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(699, 33); + this.okButton.Location = new System.Drawing.Point(699, 23); this.okButton.Name = "okButton"; - this.okButton.Size = new System.Drawing.Size(98, 63); + this.okButton.Size = new System.Drawing.Size(98, 55); this.okButton.TabIndex = 0; this.okButton.Text = "OK"; this.okButton.UseVisualStyleBackColor = true; @@ -166,13 +167,14 @@ namespace TBF.BenchControl.DataEntry.Munich // // protocolGroupBox // + this.protocolGroupBox.Controls.Add(this.radioButton4); this.protocolGroupBox.Controls.Add(this.radioButton3); this.protocolGroupBox.Controls.Add(this.radioButton2); this.protocolGroupBox.Controls.Add(this.radioButton1); this.protocolGroupBox.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.protocolGroupBox.Location = new System.Drawing.Point(422, 118); + this.protocolGroupBox.Location = new System.Drawing.Point(422, 87); this.protocolGroupBox.Name = "protocolGroupBox"; - this.protocolGroupBox.Size = new System.Drawing.Size(375, 142); + this.protocolGroupBox.Size = new System.Drawing.Size(375, 173); this.protocolGroupBox.TabIndex = 4; this.protocolGroupBox.TabStop = false; this.protocolGroupBox.Text = "Protocol"; @@ -375,6 +377,16 @@ namespace TBF.BenchControl.DataEntry.Munich this.auxState3Label.TabIndex = 2; this.auxState3Label.Text = "Aux. WM State"; // + // radioButton4 + // + this.radioButton4.AutoSize = true; + this.radioButton4.Location = new System.Drawing.Point(34, 133); + this.radioButton4.Name = "radioButton4"; + this.radioButton4.Size = new System.Drawing.Size(152, 27); + this.radioButton4.TabIndex = 3; + this.radioButton4.Text = "radioButton4"; + this.radioButton4.UseVisualStyleBackColor = true; + // // CycleEndForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -438,6 +450,7 @@ namespace TBF.BenchControl.DataEntry.Munich private System.Windows.Forms.Label mainState3Label; private System.Windows.Forms.TextBox auxState3TextBox; private System.Windows.Forms.Label auxState3Label; + private System.Windows.Forms.RadioButton radioButton4; } } \ No newline at end of file diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.cs b/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.cs index a17b65f36..9aa41532f 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.cs @@ -18,6 +18,7 @@ namespace TBF.BenchControl.DataEntry.Munich public string ProtocolName1; public string ProtocolName2; public string ProtocolName3; + public string ProtocolName4; // To be retrieved after the form closes public string[] MainStateText; @@ -72,14 +73,18 @@ namespace TBF.BenchControl.DataEntry.Munich radioButton1.Text = ProtocolName1; radioButton2.Text = ProtocolName2; radioButton3.Text = ProtocolName3; + radioButton4.Text = ProtocolName4; - qRise1TextBox.Text = Utils.DoubleToStr(Sequences.SequenceBase.Qrise, 3); - qFall1TextBox.Text = Utils.DoubleToStr(Sequences.SequenceBase.Qfall, 3); + if (Sequences.ProcessData.BatchRslts.WaterMeters.Length >= 1) + { + qRise1TextBox.Text = Utils.DoubleToStr(Sequences.ProcessData.BatchRslts.WaterMeters[0].QRise, 3); + qFall1TextBox.Text = Utils.DoubleToStr(Sequences.ProcessData.BatchRslts.WaterMeters[0].QFall, 3); + } - if (Config.Data.CompoundWMsCount >= 2) + if (Sequences.ProcessData.BatchRslts.WaterMeters.Length >= 2) { - qRise2TextBox.Text = Utils.DoubleToStr(Sequences.SequenceBase.Qrise, 3); - qFall2TextBox.Text = Utils.DoubleToStr(Sequences.SequenceBase.Qfall, 3); + qRise2TextBox.Text = Utils.DoubleToStr(Sequences.ProcessData.BatchRslts.WaterMeters[1].QRise, 3); + qFall2TextBox.Text = Utils.DoubleToStr(Sequences.ProcessData.BatchRslts.WaterMeters[1].QFall, 3); } else { @@ -87,10 +92,10 @@ namespace TBF.BenchControl.DataEntry.Munich Height = 305; } - if (Config.Data.CompoundWMsCount >= 3) + if (Sequences.ProcessData.BatchRslts.WaterMeters.Length >= 3) { - qRise3TextBox.Text = Utils.DoubleToStr(Sequences.SequenceBase.Qrise, 3); - qFall3TextBox.Text = Utils.DoubleToStr(Sequences.SequenceBase.Qfall, 3); + qRise3TextBox.Text = Utils.DoubleToStr(Sequences.ProcessData.BatchRslts.WaterMeters[2].QRise, 3); + qFall3TextBox.Text = Utils.DoubleToStr(Sequences.ProcessData.BatchRslts.WaterMeters[2].QFall, 3); } else { @@ -127,6 +132,7 @@ namespace TBF.BenchControl.DataEntry.Munich if (radioButton1.Checked) ProtocolTitle = ProtocolName1; else if (radioButton2.Checked) ProtocolTitle = ProtocolName2; else if (radioButton3.Checked) ProtocolTitle = ProtocolName3; + else if (radioButton4.Checked) ProtocolTitle = ProtocolName4; if (allOK) { diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.resx b/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.resx index e2e65bced..21cf58d0d 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.resx +++ b/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.resx @@ -144,10 +144,31 @@ True - + True - + + True + + + True + + + True + + + True + + + True + + + True + + + True + + True @@ -186,6 +207,30 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True @@ -213,7 +258,28 @@ True - + + True + + + True + + + True + + + True + + + True + + + True + + + True + + True \ No newline at end of file diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs index aaf98baec..1baec9c19 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs @@ -110,7 +110,8 @@ namespace TBF.BenchControl.DataEntry.Munich endForm.ProtocolName1 = entryFormCfg.ProtocolTitle1; endForm.ProtocolName2 = entryFormCfg.ProtocolTitle2; endForm.ProtocolName3 = entryFormCfg.ProtocolTitle3; - myRef.modelessDlg = endForm; + endForm.ProtocolName4 = entryFormCfg.ProtocolTitle4; + myRef.modelessDlg = endForm; modelessDlg.Show(); } diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormCfg.cs b/TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormCfg.cs index c1e1c4749..ffe6c339b 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormCfg.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormCfg.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2016 Sensus Metering Systems /// using System; using System.Collections.Generic; @@ -20,16 +20,18 @@ namespace TBF.BenchControl.DataEntry.Munich public string ProtocolTitle1; public string ProtocolTitle2; public string ProtocolTitle3; + public string ProtocolTitle4; /// Private parameterless constructor invoked by all other (public) constructors EntryFormCfg() { Name = "DataEntryForm-Munich"; ParentName = string.Empty; - ProtocolTitle1 = "Protokoll Werkprüfung"; + ProtocolTitle1 = "Protokoll 1"; ProtocolTitle2 = "Protokoll 2"; ProtocolTitle3 = "Protokoll 3"; - } + ProtocolTitle4 = "Protokoll 4"; + } public EntryFormCfg(IComponentFactory factory) : this() @@ -39,11 +41,12 @@ namespace TBF.BenchControl.DataEntry.Munich public string ToString(int i) { - return string.Format("Name={0}, Protocol1={1}, Protocol2={2}, Protocol3={3}", + return string.Format("Name={0}, P1={1}, P2={2}, P3={3}, P4={4}", Name, (string.IsNullOrEmpty(ProtocolTitle1) ? "-" : ProtocolTitle1), (string.IsNullOrEmpty(ProtocolTitle2) ? "-" : ProtocolTitle2), - (string.IsNullOrEmpty(ProtocolTitle3) ? "-" : ProtocolTitle3)); + (string.IsNullOrEmpty(ProtocolTitle3) ? "-" : ProtocolTitle3), + (string.IsNullOrEmpty(ProtocolTitle4) ? "-" : ProtocolTitle4)); } } } diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.cs b/TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.cs index bfda6cbed..1a53202e0 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.cs @@ -47,7 +47,8 @@ namespace TBF.BenchControl.DataEntry.Munich protocolTitle1TextBox.Text = config.ProtocolTitle1; protocolTitle2TextBox.Text = config.ProtocolTitle2; protocolTitle3TextBox.Text = config.ProtocolTitle3; - } + protocolTitle4TextBox.Text = config.ProtocolTitle4; + } public void Unlock() { @@ -55,7 +56,8 @@ namespace TBF.BenchControl.DataEntry.Munich protocolTitle1TextBox.Enabled = true; protocolTitle2TextBox.Enabled = true; protocolTitle3TextBox.Enabled = true; - } + protocolTitle4TextBox.Enabled = true; + } public CfgUpdateFlags VerifyCfg(ref string message) { @@ -73,6 +75,7 @@ namespace TBF.BenchControl.DataEntry.Munich config.ProtocolTitle1 = protocolTitle1TextBox.Text; config.ProtocolTitle2 = protocolTitle2TextBox.Text; config.ProtocolTitle3 = protocolTitle3TextBox.Text; + config.ProtocolTitle4 = protocolTitle4TextBox.Text; return flags; } diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.designer.cs b/TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.designer.cs index c40534856..eada7a244 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.designer.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.designer.cs @@ -31,112 +31,133 @@ namespace TBF.BenchControl.DataEntry.Munich /// 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(); + 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.protocolTitle4TextBox = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + 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; + // + // protocolTitle4TextBox + // + this.protocolTitle4TextBox.Enabled = false; + this.protocolTitle4TextBox.Location = new System.Drawing.Point(137, 161); + this.protocolTitle4TextBox.Name = "protocolTitle4TextBox"; + this.protocolTitle4TextBox.Size = new System.Drawing.Size(130, 20); + this.protocolTitle4TextBox.TabIndex = 13; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(27, 164); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(74, 13); + this.label4.TabIndex = 12; + this.label4.Text = "Protocol title 4"; + // + // EntryFormCfgCtrl + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.protocolTitle4TextBox); + this.Controls.Add(this.label4); + 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(); } @@ -151,5 +172,7 @@ namespace TBF.BenchControl.DataEntry.Munich private System.Windows.Forms.TextBox protocolTitle1TextBox; private System.Windows.Forms.TextBox protocolTitle2TextBox; private System.Windows.Forms.TextBox protocolTitle3TextBox; + private System.Windows.Forms.TextBox protocolTitle4TextBox; + private System.Windows.Forms.Label label4; } } diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfg.cs b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfg.cs index 94917e712..a958cd962 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfg.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfg.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2016 Sensus Metering Systems /// using System; using System.Collections.Generic; @@ -20,15 +20,17 @@ namespace TBF.BenchControl.DataEntry.Munich3 public string ProtocolTitle1; public string ProtocolTitle2; public string ProtocolTitle3; + public string ProtocolTitle4; /// Private parameterless constructor invoked by all other (public) constructors EntryFormCfg() { Name = "DataEntryForm-3"; ParentName = string.Empty; - ProtocolTitle1 = "Protokoll Werkprüfung"; + ProtocolTitle1 = "Protokoll 1"; ProtocolTitle2 = "Protokoll 2"; ProtocolTitle3 = "Protokoll 3"; + ProtocolTitle4 = "Protokoll 4"; } public EntryFormCfg(IComponentFactory factory) @@ -39,11 +41,12 @@ namespace TBF.BenchControl.DataEntry.Munich3 public string ToString(int i) { - return string.Format("Name={0}, Protocol1={1}, Protocol2={2}, Protocol3={3}", + return string.Format("Name={0}, P1={1}, P2={2}, P3={3}, P4={4}", Name, (string.IsNullOrEmpty(ProtocolTitle1) ? "-" : ProtocolTitle1), (string.IsNullOrEmpty(ProtocolTitle2) ? "-" : ProtocolTitle2), - (string.IsNullOrEmpty(ProtocolTitle3) ? "-" : ProtocolTitle3)); + (string.IsNullOrEmpty(ProtocolTitle3) ? "-" : ProtocolTitle3), + (string.IsNullOrEmpty(ProtocolTitle4) ? "-" : ProtocolTitle4)); } } } diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.cs b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.cs index edf37c72c..6d0c8c8f5 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.cs @@ -47,7 +47,8 @@ namespace TBF.BenchControl.DataEntry.Munich3 protocolTitle1TextBox.Text = config.ProtocolTitle1; protocolTitle2TextBox.Text = config.ProtocolTitle2; protocolTitle3TextBox.Text = config.ProtocolTitle3; - } + protocolTitle4TextBox.Text = config.ProtocolTitle4; + } public void Unlock() { @@ -55,7 +56,8 @@ namespace TBF.BenchControl.DataEntry.Munich3 protocolTitle1TextBox.Enabled = true; protocolTitle2TextBox.Enabled = true; protocolTitle3TextBox.Enabled = true; - } + protocolTitle4TextBox.Enabled = true; + } public CfgUpdateFlags VerifyCfg(ref string message) { @@ -73,6 +75,7 @@ namespace TBF.BenchControl.DataEntry.Munich3 config.ProtocolTitle1 = protocolTitle1TextBox.Text; config.ProtocolTitle2 = protocolTitle2TextBox.Text; config.ProtocolTitle3 = protocolTitle3TextBox.Text; + config.ProtocolTitle4 = protocolTitle4TextBox.Text; return flags; } diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.designer.cs b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.designer.cs index a4bfee830..13f2ecc4b 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.designer.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.designer.cs @@ -31,112 +31,133 @@ namespace TBF.BenchControl.DataEntry.Munich3 /// 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(); + 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.protocolTitle4TextBox = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + 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; + // + // protocolTitle4TextBox + // + this.protocolTitle4TextBox.Enabled = false; + this.protocolTitle4TextBox.Location = new System.Drawing.Point(137, 161); + this.protocolTitle4TextBox.Name = "protocolTitle4TextBox"; + this.protocolTitle4TextBox.Size = new System.Drawing.Size(130, 20); + this.protocolTitle4TextBox.TabIndex = 13; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(27, 164); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(74, 13); + this.label4.TabIndex = 12; + this.label4.Text = "Protocol title 4"; + // + // EntryFormCfgCtrl + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.protocolTitle4TextBox); + this.Controls.Add(this.label4); + 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(); } @@ -151,5 +172,7 @@ namespace TBF.BenchControl.DataEntry.Munich3 private System.Windows.Forms.TextBox protocolTitle1TextBox; private System.Windows.Forms.TextBox protocolTitle2TextBox; private System.Windows.Forms.TextBox protocolTitle3TextBox; + private System.Windows.Forms.TextBox protocolTitle4TextBox; + private System.Windows.Forms.Label label4; } } diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 76a8a59fd..fa868e3e6 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.7.285.1")] -[assembly: AssemblyFileVersion("2.7.285.1")] +[assembly: AssemblyVersion("2.7.286.1")] +[assembly: AssemblyFileVersion("2.7.286.1")]