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

Munich.EntryForms support 4 protocols, ver.2.7.286

Browse Source
This commit is contained in:
Milan Hanajik
2016-05-19 15:51:06 +02:00
parent cd43aa2f42
commit af0de8734a
11 changed files with 387 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.Designer.cs
Generated
+17 -4
View File
@@ -63,6 +63,7 @@ namespace TBF.BenchControl.DataEntry.Munich
this.mainState3Label = new System.Windows.Forms.Label(); this.mainState3Label = new System.Windows.Forms.Label();
this.auxState3TextBox = new System.Windows.Forms.TextBox(); this.auxState3TextBox = new System.Windows.Forms.TextBox();
this.auxState3Label = new System.Windows.Forms.Label(); this.auxState3Label = new System.Windows.Forms.Label();
this.radioButton4 = new System.Windows.Forms.RadioButton();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.protocolGroupBox.SuspendLayout(); this.protocolGroupBox.SuspendLayout();
this.groupBox2.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.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.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.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.TabIndex = 0;
this.okButton.Text = "OK"; this.okButton.Text = "OK";
this.okButton.UseVisualStyleBackColor = true; this.okButton.UseVisualStyleBackColor = true;
@@ -166,13 +167,14 @@ namespace TBF.BenchControl.DataEntry.Munich
// //
// protocolGroupBox // protocolGroupBox
// //
this.protocolGroupBox.Controls.Add(this.radioButton4);
this.protocolGroupBox.Controls.Add(this.radioButton3); this.protocolGroupBox.Controls.Add(this.radioButton3);
this.protocolGroupBox.Controls.Add(this.radioButton2); this.protocolGroupBox.Controls.Add(this.radioButton2);
this.protocolGroupBox.Controls.Add(this.radioButton1); 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.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.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.TabIndex = 4;
this.protocolGroupBox.TabStop = false; this.protocolGroupBox.TabStop = false;
this.protocolGroupBox.Text = "Protocol"; this.protocolGroupBox.Text = "Protocol";
@@ -375,6 +377,16 @@ namespace TBF.BenchControl.DataEntry.Munich
this.auxState3Label.TabIndex = 2; this.auxState3Label.TabIndex = 2;
this.auxState3Label.Text = "Aux. WM State"; 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 // CycleEndForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 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.Label mainState3Label;
private System.Windows.Forms.TextBox auxState3TextBox; private System.Windows.Forms.TextBox auxState3TextBox;
private System.Windows.Forms.Label auxState3Label; private System.Windows.Forms.Label auxState3Label;
private System.Windows.Forms.RadioButton radioButton4;
} }
} }
TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.cs
+14 -8
View File
@@ -18,6 +18,7 @@ namespace TBF.BenchControl.DataEntry.Munich
public string ProtocolName1; public string ProtocolName1;
public string ProtocolName2; public string ProtocolName2;
public string ProtocolName3; public string ProtocolName3;
public string ProtocolName4;
// To be retrieved after the form closes // To be retrieved after the form closes
public string[] MainStateText; public string[] MainStateText;
@@ -72,14 +73,18 @@ namespace TBF.BenchControl.DataEntry.Munich
radioButton1.Text = ProtocolName1; radioButton1.Text = ProtocolName1;
radioButton2.Text = ProtocolName2; radioButton2.Text = ProtocolName2;
radioButton3.Text = ProtocolName3; radioButton3.Text = ProtocolName3;
radioButton4.Text = ProtocolName4;
qRise1TextBox.Text = Utils.DoubleToStr(Sequences.SequenceBase.Qrise, 3); if (Sequences.ProcessData.BatchRslts.WaterMeters.Length >= 1)
qFall1TextBox.Text = Utils.DoubleToStr(Sequences.SequenceBase.Qfall, 3); {
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); qRise2TextBox.Text = Utils.DoubleToStr(Sequences.ProcessData.BatchRslts.WaterMeters[1].QRise, 3);
qFall2TextBox.Text = Utils.DoubleToStr(Sequences.SequenceBase.Qfall, 3); qFall2TextBox.Text = Utils.DoubleToStr(Sequences.ProcessData.BatchRslts.WaterMeters[1].QFall, 3);
} }
else else
{ {
@@ -87,10 +92,10 @@ namespace TBF.BenchControl.DataEntry.Munich
Height = 305; Height = 305;
} }
if (Config.Data.CompoundWMsCount >= 3) if (Sequences.ProcessData.BatchRslts.WaterMeters.Length >= 3)
{ {
qRise3TextBox.Text = Utils.DoubleToStr(Sequences.SequenceBase.Qrise, 3); qRise3TextBox.Text = Utils.DoubleToStr(Sequences.ProcessData.BatchRslts.WaterMeters[2].QRise, 3);
qFall3TextBox.Text = Utils.DoubleToStr(Sequences.SequenceBase.Qfall, 3); qFall3TextBox.Text = Utils.DoubleToStr(Sequences.ProcessData.BatchRslts.WaterMeters[2].QFall, 3);
} }
else else
{ {
@@ -127,6 +132,7 @@ namespace TBF.BenchControl.DataEntry.Munich
if (radioButton1.Checked) ProtocolTitle = ProtocolName1; if (radioButton1.Checked) ProtocolTitle = ProtocolName1;
else if (radioButton2.Checked) ProtocolTitle = ProtocolName2; else if (radioButton2.Checked) ProtocolTitle = ProtocolName2;
else if (radioButton3.Checked) ProtocolTitle = ProtocolName3; else if (radioButton3.Checked) ProtocolTitle = ProtocolName3;
else if (radioButton4.Checked) ProtocolTitle = ProtocolName4;
if (allOK) if (allOK)
{ {
TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.resx
+69 -3
View File
@@ -144,10 +144,31 @@
<metadata name="auxState1Label.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="auxState1Label.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="okButton.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="qFall1Label.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="protocolGroupBox.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="qFall1TextBox.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="qRise1Label.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="qRise1TextBox.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="auxState1TextBox.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="auxState1Label.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="radioButton3.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="radioButton2.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="radioButton1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="radioButton3.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="radioButton3.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -186,6 +207,30 @@
<metadata name="auxState2Label.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="auxState2Label.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="qFall2Label.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="qFall2TextBox.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="qRise2Label.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="qRise2TextBox.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="mainState2TextBox.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="mainState2Label.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="auxState2TextBox.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="auxState2Label.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="groupBox3.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="groupBox3.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
@@ -213,7 +258,28 @@
<metadata name="auxState3Label.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="auxState3Label.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="qFall3Label.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="qFall3TextBox.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="qRise3Label.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="qRise3TextBox.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="mainState3TextBox.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="mainState3Label.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="auxState3TextBox.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="auxState3Label.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
</root> </root>
TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs
+2 -1
View File
@@ -110,7 +110,8 @@ namespace TBF.BenchControl.DataEntry.Munich
endForm.ProtocolName1 = entryFormCfg.ProtocolTitle1; endForm.ProtocolName1 = entryFormCfg.ProtocolTitle1;
endForm.ProtocolName2 = entryFormCfg.ProtocolTitle2; endForm.ProtocolName2 = entryFormCfg.ProtocolTitle2;
endForm.ProtocolName3 = entryFormCfg.ProtocolTitle3; endForm.ProtocolName3 = entryFormCfg.ProtocolTitle3;
myRef.modelessDlg = endForm; endForm.ProtocolName4 = entryFormCfg.ProtocolTitle4;
myRef.modelessDlg = endForm;
modelessDlg.Show(); modelessDlg.Show();
} }
TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormCfg.cs
+8 -5
View File
@@ -1,5 +1,5 @@
/// ///
/// Copyright (c) 2013-2015 Sensus Metering Systems /// Copyright (c) 2013-2016 Sensus Metering Systems
/// ///
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -20,16 +20,18 @@ namespace TBF.BenchControl.DataEntry.Munich
public string ProtocolTitle1; public string ProtocolTitle1;
public string ProtocolTitle2; public string ProtocolTitle2;
public string ProtocolTitle3; public string ProtocolTitle3;
public string ProtocolTitle4;
/// Private parameterless constructor invoked by all other (public) constructors /// Private parameterless constructor invoked by all other (public) constructors
EntryFormCfg() EntryFormCfg()
{ {
Name = "DataEntryForm-Munich"; Name = "DataEntryForm-Munich";
ParentName = string.Empty; ParentName = string.Empty;
ProtocolTitle1 = "Protokoll Werkprüfung"; ProtocolTitle1 = "Protokoll 1";
ProtocolTitle2 = "Protokoll 2"; ProtocolTitle2 = "Protokoll 2";
ProtocolTitle3 = "Protokoll 3"; ProtocolTitle3 = "Protokoll 3";
} ProtocolTitle4 = "Protokoll 4";
}
public EntryFormCfg(IComponentFactory factory) public EntryFormCfg(IComponentFactory factory)
: this() : this()
@@ -39,11 +41,12 @@ namespace TBF.BenchControl.DataEntry.Munich
public string ToString(int i) 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, Name,
(string.IsNullOrEmpty(ProtocolTitle1) ? "-" : ProtocolTitle1), (string.IsNullOrEmpty(ProtocolTitle1) ? "-" : ProtocolTitle1),
(string.IsNullOrEmpty(ProtocolTitle2) ? "-" : ProtocolTitle2), (string.IsNullOrEmpty(ProtocolTitle2) ? "-" : ProtocolTitle2),
(string.IsNullOrEmpty(ProtocolTitle3) ? "-" : ProtocolTitle3)); (string.IsNullOrEmpty(ProtocolTitle3) ? "-" : ProtocolTitle3),
(string.IsNullOrEmpty(ProtocolTitle4) ? "-" : ProtocolTitle4));
} }
} }
} }
TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.cs
+5 -2
View File
@@ -47,7 +47,8 @@ namespace TBF.BenchControl.DataEntry.Munich
protocolTitle1TextBox.Text = config.ProtocolTitle1; protocolTitle1TextBox.Text = config.ProtocolTitle1;
protocolTitle2TextBox.Text = config.ProtocolTitle2; protocolTitle2TextBox.Text = config.ProtocolTitle2;
protocolTitle3TextBox.Text = config.ProtocolTitle3; protocolTitle3TextBox.Text = config.ProtocolTitle3;
} protocolTitle4TextBox.Text = config.ProtocolTitle4;
}
public void Unlock() public void Unlock()
{ {
@@ -55,7 +56,8 @@ namespace TBF.BenchControl.DataEntry.Munich
protocolTitle1TextBox.Enabled = true; protocolTitle1TextBox.Enabled = true;
protocolTitle2TextBox.Enabled = true; protocolTitle2TextBox.Enabled = true;
protocolTitle3TextBox.Enabled = true; protocolTitle3TextBox.Enabled = true;
} protocolTitle4TextBox.Enabled = true;
}
public CfgUpdateFlags VerifyCfg(ref string message) public CfgUpdateFlags VerifyCfg(ref string message)
{ {
@@ -73,6 +75,7 @@ namespace TBF.BenchControl.DataEntry.Munich
config.ProtocolTitle1 = protocolTitle1TextBox.Text; config.ProtocolTitle1 = protocolTitle1TextBox.Text;
config.ProtocolTitle2 = protocolTitle2TextBox.Text; config.ProtocolTitle2 = protocolTitle2TextBox.Text;
config.ProtocolTitle3 = protocolTitle3TextBox.Text; config.ProtocolTitle3 = protocolTitle3TextBox.Text;
config.ProtocolTitle4 = protocolTitle4TextBox.Text;
return flags; return flags;
} }
TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.designer.cs
Generated
+129 -106
View File
@@ -31,112 +31,133 @@ namespace TBF.BenchControl.DataEntry.Munich
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
this.nameTextBox = new System.Windows.Forms.TextBox(); this.nameTextBox = new System.Windows.Forms.TextBox();
this.nameLabel = new System.Windows.Forms.Label(); this.nameLabel = new System.Windows.Forms.Label();
this.classNameLabel = new System.Windows.Forms.Label(); this.classNameLabel = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label();
this.protocolTitle1TextBox = new System.Windows.Forms.TextBox(); this.protocolTitle1TextBox = new System.Windows.Forms.TextBox();
this.protocolTitle2TextBox = new System.Windows.Forms.TextBox(); this.protocolTitle2TextBox = new System.Windows.Forms.TextBox();
this.protocolTitle3TextBox = new System.Windows.Forms.TextBox(); this.protocolTitle3TextBox = new System.Windows.Forms.TextBox();
this.SuspendLayout(); this.protocolTitle4TextBox = new System.Windows.Forms.TextBox();
// this.label4 = new System.Windows.Forms.Label();
// nameTextBox this.SuspendLayout();
// //
this.nameTextBox.Enabled = false; // nameTextBox
this.nameTextBox.Location = new System.Drawing.Point(137, 57); //
this.nameTextBox.Name = "nameTextBox"; this.nameTextBox.Enabled = false;
this.nameTextBox.Size = new System.Drawing.Size(130, 20); this.nameTextBox.Location = new System.Drawing.Point(137, 57);
this.nameTextBox.TabIndex = 5; this.nameTextBox.Name = "nameTextBox";
// this.nameTextBox.Size = new System.Drawing.Size(130, 20);
// nameLabel this.nameTextBox.TabIndex = 5;
// //
this.nameLabel.AutoSize = true; // nameLabel
this.nameLabel.Location = new System.Drawing.Point(27, 60); //
this.nameLabel.Name = "nameLabel"; this.nameLabel.AutoSize = true;
this.nameLabel.Size = new System.Drawing.Size(35, 13); this.nameLabel.Location = new System.Drawing.Point(27, 60);
this.nameLabel.TabIndex = 4; this.nameLabel.Name = "nameLabel";
this.nameLabel.Text = "Name"; this.nameLabel.Size = new System.Drawing.Size(35, 13);
// this.nameLabel.TabIndex = 4;
// classNameLabel this.nameLabel.Text = "Name";
// //
this.classNameLabel.AutoSize = true; // classNameLabel
this.classNameLabel.Location = new System.Drawing.Point(134, 33); //
this.classNameLabel.Name = "classNameLabel"; this.classNameLabel.AutoSize = true;
this.classNameLabel.Size = new System.Drawing.Size(83, 13); this.classNameLabel.Location = new System.Drawing.Point(134, 33);
this.classNameLabel.TabIndex = 3; this.classNameLabel.Name = "classNameLabel";
this.classNameLabel.Text = "ComonentName"; this.classNameLabel.Size = new System.Drawing.Size(83, 13);
// this.classNameLabel.TabIndex = 3;
// label1 this.classNameLabel.Text = "ComonentName";
// //
this.label1.AutoSize = true; // label1
this.label1.Location = new System.Drawing.Point(27, 86); //
this.label1.Name = "label1"; this.label1.AutoSize = true;
this.label1.Size = new System.Drawing.Size(74, 13); this.label1.Location = new System.Drawing.Point(27, 86);
this.label1.TabIndex = 6; this.label1.Name = "label1";
this.label1.Text = "Protocol title 1"; this.label1.Size = new System.Drawing.Size(74, 13);
// this.label1.TabIndex = 6;
// label2 this.label1.Text = "Protocol title 1";
// //
this.label2.AutoSize = true; // label2
this.label2.Location = new System.Drawing.Point(27, 112); //
this.label2.Name = "label2"; this.label2.AutoSize = true;
this.label2.Size = new System.Drawing.Size(74, 13); this.label2.Location = new System.Drawing.Point(27, 112);
this.label2.TabIndex = 7; this.label2.Name = "label2";
this.label2.Text = "Protocol title 2"; this.label2.Size = new System.Drawing.Size(74, 13);
// this.label2.TabIndex = 7;
// label3 this.label2.Text = "Protocol title 2";
// //
this.label3.AutoSize = true; // label3
this.label3.Location = new System.Drawing.Point(27, 138); //
this.label3.Name = "label3"; this.label3.AutoSize = true;
this.label3.Size = new System.Drawing.Size(74, 13); this.label3.Location = new System.Drawing.Point(27, 138);
this.label3.TabIndex = 8; this.label3.Name = "label3";
this.label3.Text = "Protocol title 3"; this.label3.Size = new System.Drawing.Size(74, 13);
// this.label3.TabIndex = 8;
// protocolTitle1TextBox this.label3.Text = "Protocol title 3";
// //
this.protocolTitle1TextBox.Enabled = false; // protocolTitle1TextBox
this.protocolTitle1TextBox.Location = new System.Drawing.Point(137, 83); //
this.protocolTitle1TextBox.Name = "protocolTitle1TextBox"; this.protocolTitle1TextBox.Enabled = false;
this.protocolTitle1TextBox.Size = new System.Drawing.Size(130, 20); this.protocolTitle1TextBox.Location = new System.Drawing.Point(137, 83);
this.protocolTitle1TextBox.TabIndex = 9; this.protocolTitle1TextBox.Name = "protocolTitle1TextBox";
// this.protocolTitle1TextBox.Size = new System.Drawing.Size(130, 20);
// protocolTitle2TextBox this.protocolTitle1TextBox.TabIndex = 9;
// //
this.protocolTitle2TextBox.Enabled = false; // protocolTitle2TextBox
this.protocolTitle2TextBox.Location = new System.Drawing.Point(137, 109); //
this.protocolTitle2TextBox.Name = "protocolTitle2TextBox"; this.protocolTitle2TextBox.Enabled = false;
this.protocolTitle2TextBox.Size = new System.Drawing.Size(130, 20); this.protocolTitle2TextBox.Location = new System.Drawing.Point(137, 109);
this.protocolTitle2TextBox.TabIndex = 10; this.protocolTitle2TextBox.Name = "protocolTitle2TextBox";
// this.protocolTitle2TextBox.Size = new System.Drawing.Size(130, 20);
// protocolTitle3TextBox this.protocolTitle2TextBox.TabIndex = 10;
// //
this.protocolTitle3TextBox.Enabled = false; // protocolTitle3TextBox
this.protocolTitle3TextBox.Location = new System.Drawing.Point(137, 135); //
this.protocolTitle3TextBox.Name = "protocolTitle3TextBox"; this.protocolTitle3TextBox.Enabled = false;
this.protocolTitle3TextBox.Size = new System.Drawing.Size(130, 20); this.protocolTitle3TextBox.Location = new System.Drawing.Point(137, 135);
this.protocolTitle3TextBox.TabIndex = 11; this.protocolTitle3TextBox.Name = "protocolTitle3TextBox";
// this.protocolTitle3TextBox.Size = new System.Drawing.Size(130, 20);
// EntryFormCfgCtrl this.protocolTitle3TextBox.TabIndex = 11;
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); // protocolTitle4TextBox
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; //
this.Controls.Add(this.protocolTitle3TextBox); this.protocolTitle4TextBox.Enabled = false;
this.Controls.Add(this.protocolTitle2TextBox); this.protocolTitle4TextBox.Location = new System.Drawing.Point(137, 161);
this.Controls.Add(this.protocolTitle1TextBox); this.protocolTitle4TextBox.Name = "protocolTitle4TextBox";
this.Controls.Add(this.label3); this.protocolTitle4TextBox.Size = new System.Drawing.Size(130, 20);
this.Controls.Add(this.label2); this.protocolTitle4TextBox.TabIndex = 13;
this.Controls.Add(this.label1); //
this.Controls.Add(this.nameTextBox); // label4
this.Controls.Add(this.nameLabel); //
this.Controls.Add(this.classNameLabel); this.label4.AutoSize = true;
this.Name = "EntryFormCfgCtrl"; this.label4.Location = new System.Drawing.Point(27, 164);
this.Size = new System.Drawing.Size(300, 200); this.label4.Name = "label4";
this.Load += new System.EventHandler(this.EntryFormCfgCtrl_Load); this.label4.Size = new System.Drawing.Size(74, 13);
this.ResumeLayout(false); this.label4.TabIndex = 12;
this.PerformLayout(); 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 protocolTitle1TextBox;
private System.Windows.Forms.TextBox protocolTitle2TextBox; private System.Windows.Forms.TextBox protocolTitle2TextBox;
private System.Windows.Forms.TextBox protocolTitle3TextBox; private System.Windows.Forms.TextBox protocolTitle3TextBox;
private System.Windows.Forms.TextBox protocolTitle4TextBox;
private System.Windows.Forms.Label label4;
} }
} }
TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfg.cs
+7 -4
View File
@@ -1,5 +1,5 @@
/// ///
/// Copyright (c) 2013-2015 Sensus Metering Systems /// Copyright (c) 2013-2016 Sensus Metering Systems
/// ///
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -20,15 +20,17 @@ namespace TBF.BenchControl.DataEntry.Munich3
public string ProtocolTitle1; public string ProtocolTitle1;
public string ProtocolTitle2; public string ProtocolTitle2;
public string ProtocolTitle3; public string ProtocolTitle3;
public string ProtocolTitle4;
/// Private parameterless constructor invoked by all other (public) constructors /// Private parameterless constructor invoked by all other (public) constructors
EntryFormCfg() EntryFormCfg()
{ {
Name = "DataEntryForm-3"; Name = "DataEntryForm-3";
ParentName = string.Empty; ParentName = string.Empty;
ProtocolTitle1 = "Protokoll Werkprüfung"; ProtocolTitle1 = "Protokoll 1";
ProtocolTitle2 = "Protokoll 2"; ProtocolTitle2 = "Protokoll 2";
ProtocolTitle3 = "Protokoll 3"; ProtocolTitle3 = "Protokoll 3";
ProtocolTitle4 = "Protokoll 4";
} }
public EntryFormCfg(IComponentFactory factory) public EntryFormCfg(IComponentFactory factory)
@@ -39,11 +41,12 @@ namespace TBF.BenchControl.DataEntry.Munich3
public string ToString(int i) 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, Name,
(string.IsNullOrEmpty(ProtocolTitle1) ? "-" : ProtocolTitle1), (string.IsNullOrEmpty(ProtocolTitle1) ? "-" : ProtocolTitle1),
(string.IsNullOrEmpty(ProtocolTitle2) ? "-" : ProtocolTitle2), (string.IsNullOrEmpty(ProtocolTitle2) ? "-" : ProtocolTitle2),
(string.IsNullOrEmpty(ProtocolTitle3) ? "-" : ProtocolTitle3)); (string.IsNullOrEmpty(ProtocolTitle3) ? "-" : ProtocolTitle3),
(string.IsNullOrEmpty(ProtocolTitle4) ? "-" : ProtocolTitle4));
} }
} }
} }
TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.cs
+5 -2
View File
@@ -47,7 +47,8 @@ namespace TBF.BenchControl.DataEntry.Munich3
protocolTitle1TextBox.Text = config.ProtocolTitle1; protocolTitle1TextBox.Text = config.ProtocolTitle1;
protocolTitle2TextBox.Text = config.ProtocolTitle2; protocolTitle2TextBox.Text = config.ProtocolTitle2;
protocolTitle3TextBox.Text = config.ProtocolTitle3; protocolTitle3TextBox.Text = config.ProtocolTitle3;
} protocolTitle4TextBox.Text = config.ProtocolTitle4;
}
public void Unlock() public void Unlock()
{ {
@@ -55,7 +56,8 @@ namespace TBF.BenchControl.DataEntry.Munich3
protocolTitle1TextBox.Enabled = true; protocolTitle1TextBox.Enabled = true;
protocolTitle2TextBox.Enabled = true; protocolTitle2TextBox.Enabled = true;
protocolTitle3TextBox.Enabled = true; protocolTitle3TextBox.Enabled = true;
} protocolTitle4TextBox.Enabled = true;
}
public CfgUpdateFlags VerifyCfg(ref string message) public CfgUpdateFlags VerifyCfg(ref string message)
{ {
@@ -73,6 +75,7 @@ namespace TBF.BenchControl.DataEntry.Munich3
config.ProtocolTitle1 = protocolTitle1TextBox.Text; config.ProtocolTitle1 = protocolTitle1TextBox.Text;
config.ProtocolTitle2 = protocolTitle2TextBox.Text; config.ProtocolTitle2 = protocolTitle2TextBox.Text;
config.ProtocolTitle3 = protocolTitle3TextBox.Text; config.ProtocolTitle3 = protocolTitle3TextBox.Text;
config.ProtocolTitle4 = protocolTitle4TextBox.Text;
return flags; return flags;
} }
TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.designer.cs
Generated
+129 -106
View File
@@ -31,112 +31,133 @@ namespace TBF.BenchControl.DataEntry.Munich3
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
this.nameTextBox = new System.Windows.Forms.TextBox(); this.nameTextBox = new System.Windows.Forms.TextBox();
this.nameLabel = new System.Windows.Forms.Label(); this.nameLabel = new System.Windows.Forms.Label();
this.classNameLabel = new System.Windows.Forms.Label(); this.classNameLabel = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label();
this.protocolTitle1TextBox = new System.Windows.Forms.TextBox(); this.protocolTitle1TextBox = new System.Windows.Forms.TextBox();
this.protocolTitle2TextBox = new System.Windows.Forms.TextBox(); this.protocolTitle2TextBox = new System.Windows.Forms.TextBox();
this.protocolTitle3TextBox = new System.Windows.Forms.TextBox(); this.protocolTitle3TextBox = new System.Windows.Forms.TextBox();
this.SuspendLayout(); this.protocolTitle4TextBox = new System.Windows.Forms.TextBox();
// this.label4 = new System.Windows.Forms.Label();
// nameTextBox this.SuspendLayout();
// //
this.nameTextBox.Enabled = false; // nameTextBox
this.nameTextBox.Location = new System.Drawing.Point(137, 57); //
this.nameTextBox.Name = "nameTextBox"; this.nameTextBox.Enabled = false;
this.nameTextBox.Size = new System.Drawing.Size(130, 20); this.nameTextBox.Location = new System.Drawing.Point(137, 57);
this.nameTextBox.TabIndex = 5; this.nameTextBox.Name = "nameTextBox";
// this.nameTextBox.Size = new System.Drawing.Size(130, 20);
// nameLabel this.nameTextBox.TabIndex = 5;
// //
this.nameLabel.AutoSize = true; // nameLabel
this.nameLabel.Location = new System.Drawing.Point(27, 60); //
this.nameLabel.Name = "nameLabel"; this.nameLabel.AutoSize = true;
this.nameLabel.Size = new System.Drawing.Size(35, 13); this.nameLabel.Location = new System.Drawing.Point(27, 60);
this.nameLabel.TabIndex = 4; this.nameLabel.Name = "nameLabel";
this.nameLabel.Text = "Name"; this.nameLabel.Size = new System.Drawing.Size(35, 13);
// this.nameLabel.TabIndex = 4;
// classNameLabel this.nameLabel.Text = "Name";
// //
this.classNameLabel.AutoSize = true; // classNameLabel
this.classNameLabel.Location = new System.Drawing.Point(134, 33); //
this.classNameLabel.Name = "classNameLabel"; this.classNameLabel.AutoSize = true;
this.classNameLabel.Size = new System.Drawing.Size(83, 13); this.classNameLabel.Location = new System.Drawing.Point(134, 33);
this.classNameLabel.TabIndex = 3; this.classNameLabel.Name = "classNameLabel";
this.classNameLabel.Text = "ComonentName"; this.classNameLabel.Size = new System.Drawing.Size(83, 13);
// this.classNameLabel.TabIndex = 3;
// label1 this.classNameLabel.Text = "ComonentName";
// //
this.label1.AutoSize = true; // label1
this.label1.Location = new System.Drawing.Point(27, 86); //
this.label1.Name = "label1"; this.label1.AutoSize = true;
this.label1.Size = new System.Drawing.Size(74, 13); this.label1.Location = new System.Drawing.Point(27, 86);
this.label1.TabIndex = 6; this.label1.Name = "label1";
this.label1.Text = "Protocol title 1"; this.label1.Size = new System.Drawing.Size(74, 13);
// this.label1.TabIndex = 6;
// label2 this.label1.Text = "Protocol title 1";
// //
this.label2.AutoSize = true; // label2
this.label2.Location = new System.Drawing.Point(27, 112); //
this.label2.Name = "label2"; this.label2.AutoSize = true;
this.label2.Size = new System.Drawing.Size(74, 13); this.label2.Location = new System.Drawing.Point(27, 112);
this.label2.TabIndex = 7; this.label2.Name = "label2";
this.label2.Text = "Protocol title 2"; this.label2.Size = new System.Drawing.Size(74, 13);
// this.label2.TabIndex = 7;
// label3 this.label2.Text = "Protocol title 2";
// //
this.label3.AutoSize = true; // label3
this.label3.Location = new System.Drawing.Point(27, 138); //
this.label3.Name = "label3"; this.label3.AutoSize = true;
this.label3.Size = new System.Drawing.Size(74, 13); this.label3.Location = new System.Drawing.Point(27, 138);
this.label3.TabIndex = 8; this.label3.Name = "label3";
this.label3.Text = "Protocol title 3"; this.label3.Size = new System.Drawing.Size(74, 13);
// this.label3.TabIndex = 8;
// protocolTitle1TextBox this.label3.Text = "Protocol title 3";
// //
this.protocolTitle1TextBox.Enabled = false; // protocolTitle1TextBox
this.protocolTitle1TextBox.Location = new System.Drawing.Point(137, 83); //
this.protocolTitle1TextBox.Name = "protocolTitle1TextBox"; this.protocolTitle1TextBox.Enabled = false;
this.protocolTitle1TextBox.Size = new System.Drawing.Size(130, 20); this.protocolTitle1TextBox.Location = new System.Drawing.Point(137, 83);
this.protocolTitle1TextBox.TabIndex = 9; this.protocolTitle1TextBox.Name = "protocolTitle1TextBox";
// this.protocolTitle1TextBox.Size = new System.Drawing.Size(130, 20);
// protocolTitle2TextBox this.protocolTitle1TextBox.TabIndex = 9;
// //
this.protocolTitle2TextBox.Enabled = false; // protocolTitle2TextBox
this.protocolTitle2TextBox.Location = new System.Drawing.Point(137, 109); //
this.protocolTitle2TextBox.Name = "protocolTitle2TextBox"; this.protocolTitle2TextBox.Enabled = false;
this.protocolTitle2TextBox.Size = new System.Drawing.Size(130, 20); this.protocolTitle2TextBox.Location = new System.Drawing.Point(137, 109);
this.protocolTitle2TextBox.TabIndex = 10; this.protocolTitle2TextBox.Name = "protocolTitle2TextBox";
// this.protocolTitle2TextBox.Size = new System.Drawing.Size(130, 20);
// protocolTitle3TextBox this.protocolTitle2TextBox.TabIndex = 10;
// //
this.protocolTitle3TextBox.Enabled = false; // protocolTitle3TextBox
this.protocolTitle3TextBox.Location = new System.Drawing.Point(137, 135); //
this.protocolTitle3TextBox.Name = "protocolTitle3TextBox"; this.protocolTitle3TextBox.Enabled = false;
this.protocolTitle3TextBox.Size = new System.Drawing.Size(130, 20); this.protocolTitle3TextBox.Location = new System.Drawing.Point(137, 135);
this.protocolTitle3TextBox.TabIndex = 11; this.protocolTitle3TextBox.Name = "protocolTitle3TextBox";
// this.protocolTitle3TextBox.Size = new System.Drawing.Size(130, 20);
// EntryFormCfgCtrl this.protocolTitle3TextBox.TabIndex = 11;
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); // protocolTitle4TextBox
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; //
this.Controls.Add(this.protocolTitle3TextBox); this.protocolTitle4TextBox.Enabled = false;
this.Controls.Add(this.protocolTitle2TextBox); this.protocolTitle4TextBox.Location = new System.Drawing.Point(137, 161);
this.Controls.Add(this.protocolTitle1TextBox); this.protocolTitle4TextBox.Name = "protocolTitle4TextBox";
this.Controls.Add(this.label3); this.protocolTitle4TextBox.Size = new System.Drawing.Size(130, 20);
this.Controls.Add(this.label2); this.protocolTitle4TextBox.TabIndex = 13;
this.Controls.Add(this.label1); //
this.Controls.Add(this.nameTextBox); // label4
this.Controls.Add(this.nameLabel); //
this.Controls.Add(this.classNameLabel); this.label4.AutoSize = true;
this.Name = "EntryFormCfgCtrl"; this.label4.Location = new System.Drawing.Point(27, 164);
this.Size = new System.Drawing.Size(300, 200); this.label4.Name = "label4";
this.Load += new System.EventHandler(this.EntryFormCfgCtrl_Load); this.label4.Size = new System.Drawing.Size(74, 13);
this.ResumeLayout(false); this.label4.TabIndex = 12;
this.PerformLayout(); 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 protocolTitle1TextBox;
private System.Windows.Forms.TextBox protocolTitle2TextBox; private System.Windows.Forms.TextBox protocolTitle2TextBox;
private System.Windows.Forms.TextBox protocolTitle3TextBox; private System.Windows.Forms.TextBox protocolTitle3TextBox;
private System.Windows.Forms.TextBox protocolTitle4TextBox;
private System.Windows.Forms.Label label4;
} }
} }
TestBenchFramework/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.7.285.1")] [assembly: AssemblyVersion("2.7.286.1")]
[assembly: AssemblyFileVersion("2.7.285.1")] [assembly: AssemblyFileVersion("2.7.286.1")]