From 42dfbeab2f3192d8449a780fbdce1f07eb04b9ef Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Tue, 7 Jan 2020 11:05:31 +0100 Subject: [PATCH] Testmethods.ManualEntry : (1) UI (yes/no, last values are stored, etc.), (2) PMax pressure and test time fixed, ver. 2.24.1390 --- Results/Entities/TestRslt.cs | 4 +- Results/ManualEntryItemSpec.cs | 12 +- Results/Properties/AssemblyInfo.cs | 4 +- .../Standard12/CycleBeginningForm.cs | 6 +- .../DataEntry/Standard12/EntryFormCfg.cs | 2 + .../DataEntry/Standard12/EntryFormCfgCtrl.cs | 5 +- .../Standard12/EntryFormCfgCtrl.designer.cs | 14 ++ .../Standard12/EntryFormNoStartEnd.cs | 2 +- .../ManualEntry/ManualEntryForm.cs | 39 ++- .../ManualEntry/ManualEntryForm.designer.cs | 224 ++++++++++++++++++ TBF/Properties/AssemblyInfo.cs | 4 +- 11 files changed, 303 insertions(+), 13 deletions(-) diff --git a/Results/Entities/TestRslt.cs b/Results/Entities/TestRslt.cs index db72be2ae..2ee5ca233 100644 --- a/Results/Entities/TestRslt.cs +++ b/Results/Entities/TestRslt.cs @@ -141,8 +141,8 @@ namespace Results.Entities public virtual double TargetTime() { return TestData.TargetTime; } public virtual string Method() { return TestData.Method; } public virtual string RefFlowmeter() { return (Components != null) ? Components.Flowmeter : string.Empty; } - public virtual bool IsRelErrTest() { return (MethodClass != null) ? (MethodClass.Contains("FixedStart") || MethodClass.Contains("FlyingStart") || MethodClass.Contains("CombinedWithDetection") || MethodClass.Contains("DiverterTest")) : true; } - public virtual bool IsPMaxTest() { return (MethodClass != null) ? (MethodClass.Contains("PMaxTest") || MethodClass.Contains("LeakTest")) : true; } + public virtual bool IsRelErrTest() { return (MethodClass != null) ? (MethodClass.Contains("FixedStart") || MethodClass.Contains("FlyingStart") || MethodClass.Contains("CombinedWithDetection") || MethodClass.Contains("DiverterTest") || MethodClass.Contains("ManualEntry")) : true; } + public virtual bool IsPMaxTest() { return (MethodClass != null) ? (MethodClass.Contains("PMaxTest") || MethodClass.Contains("LeakTest") || TestData.Method.ToLower().Contains("pmax")) : true; } public virtual bool IsStartStop() { return (MethodClass != null) ? MethodClass.Contains("FixedStart") : true; } public virtual bool IsDiverter() { return (MethodClass != null) ? ((MethodClass.Contains("FlyingStart") && MethodClass.Contains("MassColl")) || MethodClass.Contains("DiverterTest")) : true; } public virtual bool IsVolumeMethod() { return (MethodClass != null) ? (MethodClass.Contains("TestMethods.FixedStart.") || MethodClass.Contains("TestMethods.FlyingStart.")) : false; } diff --git a/Results/ManualEntryItemSpec.cs b/Results/ManualEntryItemSpec.cs index ef57cf98f..458197e75 100644 --- a/Results/ManualEntryItemSpec.cs +++ b/Results/ManualEntryItemSpec.cs @@ -123,9 +123,17 @@ namespace Results Strings.T_s, "Test time", Quantity.Time, - ItemCategory.TestResult, + ItemCategory.MeterResult, (str, mtr) => { bool r; - mtr.TestRslt.TestTime = ParseDouble(str, out r); + mtr.TestTime = ParseDouble(str, out r); + return r; })); + AllItems.Add(new ManualEntryItemSpec(ItemID.PMax_test_time, + "Pressure test time", + "Pressure test time", + Quantity.Time, + ItemCategory.MeterResult, + (str, mtr) => { bool r; + mtr.TestTime = ParseDouble(str, out r); return r; })); AllItems.Add(new ManualEntryItemSpec(ItemID.TestPassed, Strings.Test_passed, diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs index 15b1e5b92..8e86a1999 100644 --- a/Results/Properties/AssemblyInfo.cs +++ b/Results/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.24.1389.0")] -[assembly: AssemblyFileVersion("2.24.1389.0")] +[assembly: AssemblyVersion("2.24.1390.0")] +[assembly: AssemblyFileVersion("2.24.1390.0")] diff --git a/TBF/BenchControl/DataEntry/Standard12/CycleBeginningForm.cs b/TBF/BenchControl/DataEntry/Standard12/CycleBeginningForm.cs index 5feeceee8..33dbe04fc 100644 --- a/TBF/BenchControl/DataEntry/Standard12/CycleBeginningForm.cs +++ b/TBF/BenchControl/DataEntry/Standard12/CycleBeginningForm.cs @@ -21,6 +21,7 @@ namespace TBF.BenchControl.DataEntry.Standard12 public readonly int WaterMetersCount; public readonly bool AtTheEnd; public readonly bool SensusExtensions; + public readonly bool PlusKeyIsOK; /// To be retrieved after the form is closed public string PurchaseOrder; @@ -77,13 +78,14 @@ namespace TBF.BenchControl.DataEntry.Standard12 /// Constructor /// /// Number of text boxes for serial numbers - public CycleBeginningForm(Results.Entities.WaterMeter[] waterMeters, bool atTheEnd, bool sensusExtensions) + public CycleBeginningForm(Results.Entities.WaterMeter[] waterMeters, bool atTheEnd, bool sensusExtensions, bool plusKeyIsOK) : this() { this.WaterMeters = waterMeters; this.WaterMetersCount = waterMeters.Length; this.AtTheEnd = atTheEnd; this.SensusExtensions = sensusExtensions; + this.PlusKeyIsOK = plusKeyIsOK; SNText = new string[WaterMetersCount]; Disabled = new bool[WaterMetersCount]; @@ -457,7 +459,7 @@ namespace TBF.BenchControl.DataEntry.Standard12 /// TextBox control which received the event private void ProcKeyPress(object sender, KeyPressEventArgs e, ComboBox currentFocusOwner) { - if (e.KeyChar == '+') + if (e.KeyChar == '+' && PlusKeyIsOK) { /// Process '+' key ..... Form completed okButton_Click(sender, e); diff --git a/TBF/BenchControl/DataEntry/Standard12/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/Standard12/EntryFormCfg.cs index 0f5b2c902..e0cb92728 100644 --- a/TBF/BenchControl/DataEntry/Standard12/EntryFormCfg.cs +++ b/TBF/BenchControl/DataEntry/Standard12/EntryFormCfg.cs @@ -22,6 +22,7 @@ namespace TBF.BenchControl.DataEntry.Standard12 public bool EnterSerialNrsAtTheEnd; public bool ShowCycleEndForm; public bool SensusExtensions; + public bool PlusKeyIsOK; /// Private parameterless constructor invoked by all other (public) constructors EntryFormCfg() @@ -31,6 +32,7 @@ namespace TBF.BenchControl.DataEntry.Standard12 EnterSerialNrsAtTheEnd = false; ShowCycleEndForm = false; SensusExtensions = false; + PlusKeyIsOK = false; } public EntryFormCfg(IComponentFactory factory) diff --git a/TBF/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.cs index 1c15660bf..083559fb1 100644 --- a/TBF/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.cs +++ b/TBF/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2016 Sensus Metering Systems +/// Copyright (c) 2013-2019 Sensus Slovensko a.s. /// using System; using System.Windows.Forms; @@ -54,6 +54,7 @@ namespace TBF.BenchControl.DataEntry.Standard12 enterSNsAtTheEndCheckBox.Checked = config.EnterSerialNrsAtTheEnd; showEndStateFormCheckBox.Checked = config.ShowCycleEndForm; sensusExtensionsCheckBox.Checked = config.SensusExtensions; + plusKeyIsOkCheckBox.Checked = config.PlusKeyIsOK; } public void Unlock() @@ -62,6 +63,7 @@ namespace TBF.BenchControl.DataEntry.Standard12 enterSNsAtTheEndCheckBox.Enabled = true; showEndStateFormCheckBox.Enabled = true; sensusExtensionsCheckBox.Enabled = true; + plusKeyIsOkCheckBox.Enabled = true; } public CfgUpdateFlags VerifyCfg(ref string message) @@ -80,6 +82,7 @@ namespace TBF.BenchControl.DataEntry.Standard12 config.EnterSerialNrsAtTheEnd = enterSNsAtTheEndCheckBox.Checked; config.ShowCycleEndForm = showEndStateFormCheckBox.Checked; config.SensusExtensions = sensusExtensionsCheckBox.Checked; + config.PlusKeyIsOK = plusKeyIsOkCheckBox.Checked; return flags; } diff --git a/TBF/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.designer.cs b/TBF/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.designer.cs index 86e5f66e2..577aa5b4c 100644 --- a/TBF/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.designer.cs +++ b/TBF/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.designer.cs @@ -37,6 +37,7 @@ namespace TBF.BenchControl.DataEntry.Standard12 this.showEndStateFormCheckBox = new System.Windows.Forms.CheckBox(); this.enterSNsAtTheEndCheckBox = new System.Windows.Forms.CheckBox(); this.sensusExtensionsCheckBox = new System.Windows.Forms.CheckBox(); + this.plusKeyIsOkCheckBox = new System.Windows.Forms.CheckBox(); this.SuspendLayout(); // // nameTextBox @@ -98,10 +99,22 @@ namespace TBF.BenchControl.DataEntry.Standard12 this.sensusExtensionsCheckBox.Text = "Sensus extensions"; this.sensusExtensionsCheckBox.UseVisualStyleBackColor = true; // + // plusKeyIsOkCheckBox + // + this.plusKeyIsOkCheckBox.AutoSize = true; + this.plusKeyIsOkCheckBox.Enabled = false; + this.plusKeyIsOkCheckBox.Location = new System.Drawing.Point(99, 158); + this.plusKeyIsOkCheckBox.Name = "plusKeyIsOkCheckBox"; + this.plusKeyIsOkCheckBox.Size = new System.Drawing.Size(114, 17); + this.plusKeyIsOkCheckBox.TabIndex = 6; + this.plusKeyIsOkCheckBox.Text = "Sensus extensions"; + this.plusKeyIsOkCheckBox.UseVisualStyleBackColor = true; + // // EntryFormCfgCtrl // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.plusKeyIsOkCheckBox); this.Controls.Add(this.sensusExtensionsCheckBox); this.Controls.Add(this.enterSNsAtTheEndCheckBox); this.Controls.Add(this.showEndStateFormCheckBox); @@ -124,5 +137,6 @@ namespace TBF.BenchControl.DataEntry.Standard12 private System.Windows.Forms.CheckBox showEndStateFormCheckBox; private System.Windows.Forms.CheckBox enterSNsAtTheEndCheckBox; private System.Windows.Forms.CheckBox sensusExtensionsCheckBox; + private System.Windows.Forms.CheckBox plusKeyIsOkCheckBox; } } diff --git a/TBF/BenchControl/DataEntry/Standard12/EntryFormNoStartEnd.cs b/TBF/BenchControl/DataEntry/Standard12/EntryFormNoStartEnd.cs index 88fd5e2cc..e2cb9d0e9 100644 --- a/TBF/BenchControl/DataEntry/Standard12/EntryFormNoStartEnd.cs +++ b/TBF/BenchControl/DataEntry/Standard12/EntryFormNoStartEnd.cs @@ -125,7 +125,7 @@ namespace TBF.BenchControl.DataEntry.Standard12 /// void OpenBeginningDlg(EntryFormNoStartEnd myRef) { - myRef.modelessDlg = new CycleBeginningForm(myRef.waterMeters, entryFormCfg.EnterSerialNrsAtTheEnd, entryFormCfg.SensusExtensions); + myRef.modelessDlg = new CycleBeginningForm(myRef.waterMeters, entryFormCfg.EnterSerialNrsAtTheEnd, entryFormCfg.SensusExtensions, entryFormCfg.PlusKeyIsOK); modelessDlg.Show(); } /// diff --git a/TBF/BenchControl/TestMethods/ManualEntry/ManualEntryForm.cs b/TBF/BenchControl/TestMethods/ManualEntry/ManualEntryForm.cs index 177cb15db..afdccb227 100644 --- a/TBF/BenchControl/TestMethods/ManualEntry/ManualEntryForm.cs +++ b/TBF/BenchControl/TestMethods/ManualEntry/ManualEntryForm.cs @@ -25,9 +25,13 @@ namespace TBF.BenchControl.TestMethods.ManualEntry string prompt; IList items; + static string[] lastValues = new string[7]; + GroupBox[] groupBoxes; Label[] labels; TextBox[] textBoxes; + RadioButton[] yesRadioButtons; + RadioButton[] noRadioButtons; /// /// Default constructor @@ -39,6 +43,8 @@ namespace TBF.BenchControl.TestMethods.ManualEntry groupBoxes = new GroupBox[] { groupBox1, groupBox2, groupBox3, groupBox4, groupBox5, groupBox6, groupBox7 }; labels = new Label[] { label1, label2, label3, label4, label5, label6, label7 }; textBoxes = new TextBox[] { textBox1, textBox2, textBox3, textBox4, textBox5, textBox6, textBox7 }; + yesRadioButtons = new RadioButton[] { yesRadioButton1, yesRadioButton2, yesRadioButton3, yesRadioButton4, yesRadioButton5, yesRadioButton6, yesRadioButton7 }; + noRadioButtons = new RadioButton[] { noRadioButton1, noRadioButton2, noRadioButton3, noRadioButton4, noRadioButton5, noRadioButton6, noRadioButton7 }; ControlBox = false; completed = false; @@ -65,6 +71,16 @@ namespace TBF.BenchControl.TestMethods.ManualEntry { labels[i].Text = items[i].Caption; groupBoxes[i].Visible = true; + if (items[i].Quantity == Config.Quantity.Boolean) + { + textBoxes[i].Visible = false; + yesRadioButtons[i].Visible = true; + noRadioButtons[i].Visible = true; + } + else if (!string.IsNullOrEmpty(lastValues[i])) + { + textBoxes[i].Text = lastValues[i]; + } } Height = 100 + 90 * items.Count; @@ -76,6 +92,22 @@ namespace TBF.BenchControl.TestMethods.ManualEntry okButton.Text = Strings.OkBtnText; } + private void yesRadioButton1_CheckedChanged(object sender, EventArgs e) { if (yesRadioButton1.Checked) textBox1.Text = true.ToString(); } + private void yesRadioButton2_CheckedChanged(object sender, EventArgs e) { if (yesRadioButton2.Checked) textBox2.Text = true.ToString(); } + private void yesRadioButton3_CheckedChanged(object sender, EventArgs e) { if (yesRadioButton3.Checked) textBox3.Text = true.ToString(); } + private void yesRadioButton4_CheckedChanged(object sender, EventArgs e) { if (yesRadioButton4.Checked) textBox4.Text = true.ToString(); } + private void yesRadioButton5_CheckedChanged(object sender, EventArgs e) { if (yesRadioButton5.Checked) textBox5.Text = true.ToString(); } + private void yesRadioButton6_CheckedChanged(object sender, EventArgs e) { if (yesRadioButton6.Checked) textBox6.Text = true.ToString(); } + private void yesRadioButton7_CheckedChanged(object sender, EventArgs e) { if (yesRadioButton7.Checked) textBox7.Text = true.ToString(); } + + private void noRadioButton1_CheckedChanged(object sender, EventArgs e) { if (noRadioButton1.Checked) textBox1.Text = false.ToString(); } + private void noRadioButton2_CheckedChanged(object sender, EventArgs e) { if (noRadioButton2.Checked) textBox2.Text = false.ToString(); } + private void noRadioButton3_CheckedChanged(object sender, EventArgs e) { if (noRadioButton3.Checked) textBox3.Text = false.ToString(); } + private void noRadioButton4_CheckedChanged(object sender, EventArgs e) { if (noRadioButton4.Checked) textBox4.Text = false.ToString(); } + private void noRadioButton5_CheckedChanged(object sender, EventArgs e) { if (noRadioButton5.Checked) textBox5.Text = false.ToString(); } + private void noRadioButton6_CheckedChanged(object sender, EventArgs e) { if (noRadioButton6.Checked) textBox6.Text = false.ToString(); } + private void noRadioButton7_CheckedChanged(object sender, EventArgs e) { if (noRadioButton7.Checked) textBox7.Text = false.ToString(); } + private void okButton_Click(object sender, EventArgs e) { bool ok = true; @@ -84,7 +116,12 @@ namespace TBF.BenchControl.TestMethods.ManualEntry { for (int i = 0; i < Math.Min(items.Count, groupBoxes.Length); i++) { - ok = ok &= items[i].Update(textBoxes[i].Text, meterTestRslt); + bool isItemOK = items[i].Update(textBoxes[i].Text, meterTestRslt); + if (isItemOK) + { + lastValues[i] = textBoxes[i].Text; + } + ok = (ok && isItemOK); } } diff --git a/TBF/BenchControl/TestMethods/ManualEntry/ManualEntryForm.designer.cs b/TBF/BenchControl/TestMethods/ManualEntry/ManualEntryForm.designer.cs index d73bd1037..14a92c206 100644 --- a/TBF/BenchControl/TestMethods/ManualEntry/ManualEntryForm.designer.cs +++ b/TBF/BenchControl/TestMethods/ManualEntry/ManualEntryForm.designer.cs @@ -54,6 +54,20 @@ namespace TBF.BenchControl.TestMethods.ManualEntry this.textBox7 = new System.Windows.Forms.TextBox(); this.label7 = new System.Windows.Forms.Label(); this.promptLabel = new System.Windows.Forms.Label(); + this.yesRadioButton1 = new System.Windows.Forms.RadioButton(); + this.noRadioButton1 = new System.Windows.Forms.RadioButton(); + this.noRadioButton2 = new System.Windows.Forms.RadioButton(); + this.yesRadioButton2 = new System.Windows.Forms.RadioButton(); + this.noRadioButton3 = new System.Windows.Forms.RadioButton(); + this.yesRadioButton3 = new System.Windows.Forms.RadioButton(); + this.noRadioButton4 = new System.Windows.Forms.RadioButton(); + this.yesRadioButton4 = new System.Windows.Forms.RadioButton(); + this.noRadioButton5 = new System.Windows.Forms.RadioButton(); + this.yesRadioButton5 = new System.Windows.Forms.RadioButton(); + this.noRadioButton6 = new System.Windows.Forms.RadioButton(); + this.yesRadioButton6 = new System.Windows.Forms.RadioButton(); + this.noRadioButton7 = new System.Windows.Forms.RadioButton(); + this.yesRadioButton7 = new System.Windows.Forms.RadioButton(); this.groupBox2.SuspendLayout(); this.groupBox1.SuspendLayout(); this.groupBox3.SuspendLayout(); @@ -65,6 +79,8 @@ namespace TBF.BenchControl.TestMethods.ManualEntry // // groupBox2 // + this.groupBox2.Controls.Add(this.noRadioButton2); + this.groupBox2.Controls.Add(this.yesRadioButton2); this.groupBox2.Controls.Add(this.textBox2); this.groupBox2.Controls.Add(this.label2); this.groupBox2.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); @@ -95,6 +111,8 @@ namespace TBF.BenchControl.TestMethods.ManualEntry // // groupBox1 // + this.groupBox1.Controls.Add(this.noRadioButton1); + this.groupBox1.Controls.Add(this.yesRadioButton1); 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))); @@ -136,6 +154,8 @@ namespace TBF.BenchControl.TestMethods.ManualEntry // // groupBox3 // + this.groupBox3.Controls.Add(this.noRadioButton3); + this.groupBox3.Controls.Add(this.yesRadioButton3); this.groupBox3.Controls.Add(this.textBox3); this.groupBox3.Controls.Add(this.label3); this.groupBox3.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); @@ -166,6 +186,8 @@ namespace TBF.BenchControl.TestMethods.ManualEntry // // groupBox4 // + this.groupBox4.Controls.Add(this.noRadioButton4); + this.groupBox4.Controls.Add(this.yesRadioButton4); 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))); @@ -196,6 +218,8 @@ namespace TBF.BenchControl.TestMethods.ManualEntry // // groupBox5 // + this.groupBox5.Controls.Add(this.noRadioButton5); + this.groupBox5.Controls.Add(this.yesRadioButton5); 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))); @@ -226,6 +250,8 @@ namespace TBF.BenchControl.TestMethods.ManualEntry // // groupBox6 // + this.groupBox6.Controls.Add(this.noRadioButton6); + this.groupBox6.Controls.Add(this.yesRadioButton6); 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))); @@ -256,6 +282,8 @@ namespace TBF.BenchControl.TestMethods.ManualEntry // // groupBox7 // + this.groupBox7.Controls.Add(this.noRadioButton7); + this.groupBox7.Controls.Add(this.yesRadioButton7); this.groupBox7.Controls.Add(this.textBox7); this.groupBox7.Controls.Add(this.label7); this.groupBox7.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); @@ -294,6 +322,188 @@ namespace TBF.BenchControl.TestMethods.ManualEntry this.promptLabel.TabIndex = 11; this.promptLabel.Text = "Prompt"; // + // yesRadioButton1 + // + this.yesRadioButton1.AutoSize = true; + this.yesRadioButton1.Location = new System.Drawing.Point(226, 32); + this.yesRadioButton1.Name = "yesRadioButton1"; + this.yesRadioButton1.Size = new System.Drawing.Size(61, 27); + this.yesRadioButton1.TabIndex = 2; + this.yesRadioButton1.TabStop = true; + this.yesRadioButton1.Text = "Yes"; + this.yesRadioButton1.UseVisualStyleBackColor = true; + this.yesRadioButton1.Visible = false; + this.yesRadioButton1.CheckedChanged += new System.EventHandler(this.yesRadioButton1_CheckedChanged); + // + // noRadioButton1 + // + this.noRadioButton1.AutoSize = true; + this.noRadioButton1.Location = new System.Drawing.Point(339, 32); + this.noRadioButton1.Name = "noRadioButton1"; + this.noRadioButton1.Size = new System.Drawing.Size(54, 27); + this.noRadioButton1.TabIndex = 3; + this.noRadioButton1.TabStop = true; + this.noRadioButton1.Text = "No"; + this.noRadioButton1.UseVisualStyleBackColor = true; + this.noRadioButton1.Visible = false; + this.noRadioButton1.CheckedChanged += new System.EventHandler(this.noRadioButton1_CheckedChanged); + // + // noRadioButton2 + // + this.noRadioButton2.AutoSize = true; + this.noRadioButton2.Location = new System.Drawing.Point(339, 32); + this.noRadioButton2.Name = "noRadioButton2"; + this.noRadioButton2.Size = new System.Drawing.Size(54, 27); + this.noRadioButton2.TabIndex = 5; + this.noRadioButton2.TabStop = true; + this.noRadioButton2.Text = "No"; + this.noRadioButton2.UseVisualStyleBackColor = true; + this.noRadioButton2.Visible = false; + this.noRadioButton2.CheckedChanged += new System.EventHandler(this.noRadioButton2_CheckedChanged); + // + // yesRadioButton2 + // + this.yesRadioButton2.AutoSize = true; + this.yesRadioButton2.Location = new System.Drawing.Point(226, 32); + this.yesRadioButton2.Name = "yesRadioButton2"; + this.yesRadioButton2.Size = new System.Drawing.Size(61, 27); + this.yesRadioButton2.TabIndex = 4; + this.yesRadioButton2.TabStop = true; + this.yesRadioButton2.Text = "Yes"; + this.yesRadioButton2.UseVisualStyleBackColor = true; + this.yesRadioButton2.Visible = false; + this.yesRadioButton2.CheckedChanged += new System.EventHandler(this.yesRadioButton2_CheckedChanged); + // + // noRadioButton3 + // + this.noRadioButton3.AutoSize = true; + this.noRadioButton3.Location = new System.Drawing.Point(339, 32); + this.noRadioButton3.Name = "noRadioButton3"; + this.noRadioButton3.Size = new System.Drawing.Size(54, 27); + this.noRadioButton3.TabIndex = 5; + this.noRadioButton3.TabStop = true; + this.noRadioButton3.Text = "No"; + this.noRadioButton3.UseVisualStyleBackColor = true; + this.noRadioButton3.Visible = false; + this.noRadioButton3.CheckedChanged += new System.EventHandler(this.noRadioButton3_CheckedChanged); + // + // yesRadioButton3 + // + this.yesRadioButton3.AutoSize = true; + this.yesRadioButton3.Location = new System.Drawing.Point(226, 32); + this.yesRadioButton3.Name = "yesRadioButton3"; + this.yesRadioButton3.Size = new System.Drawing.Size(61, 27); + this.yesRadioButton3.TabIndex = 4; + this.yesRadioButton3.TabStop = true; + this.yesRadioButton3.Text = "Yes"; + this.yesRadioButton3.UseVisualStyleBackColor = true; + this.yesRadioButton3.Visible = false; + this.yesRadioButton3.CheckedChanged += new System.EventHandler(this.yesRadioButton3_CheckedChanged); + // + // noRadioButton4 + // + this.noRadioButton4.AutoSize = true; + this.noRadioButton4.Location = new System.Drawing.Point(339, 32); + this.noRadioButton4.Name = "noRadioButton4"; + this.noRadioButton4.Size = new System.Drawing.Size(54, 27); + this.noRadioButton4.TabIndex = 5; + this.noRadioButton4.TabStop = true; + this.noRadioButton4.Text = "No"; + this.noRadioButton4.UseVisualStyleBackColor = true; + this.noRadioButton4.Visible = false; + this.noRadioButton4.CheckedChanged += new System.EventHandler(this.noRadioButton4_CheckedChanged); + // + // yesRadioButton4 + // + this.yesRadioButton4.AutoSize = true; + this.yesRadioButton4.Location = new System.Drawing.Point(226, 32); + this.yesRadioButton4.Name = "yesRadioButton4"; + this.yesRadioButton4.Size = new System.Drawing.Size(61, 27); + this.yesRadioButton4.TabIndex = 4; + this.yesRadioButton4.TabStop = true; + this.yesRadioButton4.Text = "Yes"; + this.yesRadioButton4.UseVisualStyleBackColor = true; + this.yesRadioButton4.Visible = false; + this.yesRadioButton4.CheckedChanged += new System.EventHandler(this.yesRadioButton4_CheckedChanged); + // + // noRadioButton5 + // + this.noRadioButton5.AutoSize = true; + this.noRadioButton5.Location = new System.Drawing.Point(339, 32); + this.noRadioButton5.Name = "noRadioButton5"; + this.noRadioButton5.Size = new System.Drawing.Size(54, 27); + this.noRadioButton5.TabIndex = 5; + this.noRadioButton5.TabStop = true; + this.noRadioButton5.Text = "No"; + this.noRadioButton5.UseVisualStyleBackColor = true; + this.noRadioButton5.Visible = false; + this.noRadioButton5.CheckedChanged += new System.EventHandler(this.noRadioButton5_CheckedChanged); + // + // yesRadioButton5 + // + this.yesRadioButton5.AutoSize = true; + this.yesRadioButton5.Location = new System.Drawing.Point(226, 32); + this.yesRadioButton5.Name = "yesRadioButton5"; + this.yesRadioButton5.Size = new System.Drawing.Size(61, 27); + this.yesRadioButton5.TabIndex = 4; + this.yesRadioButton5.TabStop = true; + this.yesRadioButton5.Text = "Yes"; + this.yesRadioButton5.UseVisualStyleBackColor = true; + this.yesRadioButton5.Visible = false; + this.yesRadioButton5.CheckedChanged += new System.EventHandler(this.yesRadioButton5_CheckedChanged); + // + // noRadioButton6 + // + this.noRadioButton6.AutoSize = true; + this.noRadioButton6.Location = new System.Drawing.Point(339, 32); + this.noRadioButton6.Name = "noRadioButton6"; + this.noRadioButton6.Size = new System.Drawing.Size(54, 27); + this.noRadioButton6.TabIndex = 5; + this.noRadioButton6.TabStop = true; + this.noRadioButton6.Text = "No"; + this.noRadioButton6.UseVisualStyleBackColor = true; + this.noRadioButton6.Visible = false; + this.noRadioButton6.CheckedChanged += new System.EventHandler(this.noRadioButton6_CheckedChanged); + // + // yesRadioButton6 + // + this.yesRadioButton6.AutoSize = true; + this.yesRadioButton6.Location = new System.Drawing.Point(226, 32); + this.yesRadioButton6.Name = "yesRadioButton6"; + this.yesRadioButton6.Size = new System.Drawing.Size(61, 27); + this.yesRadioButton6.TabIndex = 4; + this.yesRadioButton6.TabStop = true; + this.yesRadioButton6.Text = "Yes"; + this.yesRadioButton6.UseVisualStyleBackColor = true; + this.yesRadioButton6.Visible = false; + this.yesRadioButton6.CheckedChanged += new System.EventHandler(this.yesRadioButton6_CheckedChanged); + // + // noRadioButton7 + // + this.noRadioButton7.AutoSize = true; + this.noRadioButton7.Location = new System.Drawing.Point(339, 30); + this.noRadioButton7.Name = "noRadioButton7"; + this.noRadioButton7.Size = new System.Drawing.Size(54, 27); + this.noRadioButton7.TabIndex = 5; + this.noRadioButton7.TabStop = true; + this.noRadioButton7.Text = "No"; + this.noRadioButton7.UseVisualStyleBackColor = true; + this.noRadioButton7.Visible = false; + this.noRadioButton7.CheckedChanged += new System.EventHandler(this.noRadioButton7_CheckedChanged); + // + // yesRadioButton7 + // + this.yesRadioButton7.AutoSize = true; + this.yesRadioButton7.Location = new System.Drawing.Point(226, 30); + this.yesRadioButton7.Name = "yesRadioButton7"; + this.yesRadioButton7.Size = new System.Drawing.Size(61, 27); + this.yesRadioButton7.TabIndex = 4; + this.yesRadioButton7.TabStop = true; + this.yesRadioButton7.Text = "Yes"; + this.yesRadioButton7.UseVisualStyleBackColor = true; + this.yesRadioButton7.Visible = false; + this.yesRadioButton7.CheckedChanged += new System.EventHandler(this.yesRadioButton7_CheckedChanged); + // // ManualEntryForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -357,6 +567,20 @@ namespace TBF.BenchControl.TestMethods.ManualEntry private System.Windows.Forms.TextBox textBox7; private System.Windows.Forms.Label label7; private System.Windows.Forms.Label promptLabel; + private System.Windows.Forms.RadioButton noRadioButton1; + private System.Windows.Forms.RadioButton yesRadioButton1; + private System.Windows.Forms.RadioButton noRadioButton2; + private System.Windows.Forms.RadioButton yesRadioButton2; + private System.Windows.Forms.RadioButton noRadioButton3; + private System.Windows.Forms.RadioButton yesRadioButton3; + private System.Windows.Forms.RadioButton noRadioButton4; + private System.Windows.Forms.RadioButton yesRadioButton4; + private System.Windows.Forms.RadioButton noRadioButton5; + private System.Windows.Forms.RadioButton yesRadioButton5; + private System.Windows.Forms.RadioButton noRadioButton6; + private System.Windows.Forms.RadioButton yesRadioButton6; + private System.Windows.Forms.RadioButton noRadioButton7; + private System.Windows.Forms.RadioButton yesRadioButton7; } } \ No newline at end of file diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index d303d828e..f226f5118 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.24.1389.0")] -[assembly: AssemblyFileVersion("2.24.1389.0")] +[assembly: AssemblyVersion("2.24.1390.0")] +[assembly: AssemblyFileVersion("2.24.1390.0")]