From 96a17b2d167560450ebb6f52cfa35b8745fe355a Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Wed, 28 Jul 2021 14:47:05 +0200 Subject: [PATCH] 1. iPelrHead.MeterType.DN26 --> MeterType.DN25_Q3_10 2. TestMethodCfg.UseMuxBoards... removed 3. iPerlhead.ProcParams.InitQ2CorrRL/LR removed 4. Default Q2 corrections --- .../iPerlCommunication/TestMethod.cs | 30 -- .../iPerlCommunication/TestMethodCfg.cs | 29 +- .../iPerlCommunication/TestMethodCfgCtrl.cs | 172 +++++-- .../TestMethodCfgCtrl.designer.cs | 421 ++++++++++++------ .../iPerlCommunicationForm.cs | 134 ++---- .../iPerlCommunicationSeq.cs | 9 +- .../iPerlCommunication/iPerlHead/Enums.cs | 12 +- .../iPerlCommunication/iPerlHead/IperlHead.cs | 23 +- .../iPerlHead/ProcParams.cs | 16 - TBF/UI/Procedures/ProcedureDlg.cs | 12 +- 10 files changed, 503 insertions(+), 355 deletions(-) diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethod.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethod.cs index c04656a66..685f8fa2a 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethod.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethod.cs @@ -75,36 +75,6 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication { if (DebugLevel == DebugMode.Normal) { - /// Check whether RFID serial ports are free - SerialPort rfidPort; - if (testMethodCfg.RfidPortNrBoard1 != 0) - { - rfidPort = new SerialPort(string.Format("COM{0}", testMethodCfg.RfidPortNrBoard1), 9600, Parity.None, 8, StopBits.One); - rfidPort.Open(); - rfidPort.Close(); - } - - if (testMethodCfg.RfidPortNrBoard2 != 0) - { - rfidPort = new SerialPort(string.Format("COM{0}", testMethodCfg.RfidPortNrBoard2), 9600, Parity.None, 8, StopBits.One); - rfidPort.Open(); - rfidPort.Close(); - } - - if (testMethodCfg.RfidPortNrBoard3 != 0) - { - rfidPort = new SerialPort(string.Format("COM{0}", testMethodCfg.RfidPortNrBoard3), 9600, Parity.None, 8, StopBits.One); - rfidPort.Open(); - rfidPort.Close(); - } - - if (testMethodCfg.RfidPortNrBoard4 != 0) - { - rfidPort = new SerialPort(string.Format("COM{0}", testMethodCfg.RfidPortNrBoard4), 9600, Parity.None, 8, StopBits.One); - rfidPort.Open(); - rfidPort.Close(); - } - rfidDataLogger.Fatal("------------------------------------------------------------------------"); rfidDataLogger.FatalFormat("Test Bench Framework ver. {0}", Program.Version); diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfg.cs index fcc2537a2..811bd6af6 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfg.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2015-2016 Sensus Metering Systems +/// Copyright (c) 2015-2021 Sensus Slovensko a.s. /// using System; using System.Collections.Generic; @@ -24,12 +24,21 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication public int DelayBetweenRetries; /// Delay between communication retries in ms (0 .. 5000) public int MaxCommRetries; /// Max. number of retries (1 .. 10) public int NrThreads; /// Numbwr of parallel threads (1, 2 or 4) - public bool UseMuxBoards; - public int RfidPortNrBoard1; - public int RfidPortNrBoard2; - public int RfidPortNrBoard3; - public int RfidPortNrBoard4; public int IperlCheckErrorsToStop; + + public int DfltQ2c_15_rl; + public int DfltQ2c_15_lr; + public int DfltQ2c_20_rl; + public int DfltQ2c_20_lr; + public int DfltQ2c_25_63_rl; + public int DfltQ2c_25_63_lr; + public int DfltQ2c_25_10_rl; + public int DfltQ2c_25_10_lr; + public int DfltQ2c_32_rl; + public int DfltQ2c_32_lr; + public int DfltQ2c_40_rl; + public int DfltQ2c_40_lr; + public bool UseWebService; public string BaseUrl; public string RelativeUrl; @@ -52,11 +61,6 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication CommTimeout = 1800; /// ms MaxCommRetries = 4; NrThreads = 2; /// 1, 2 or 4 threads - UseMuxBoards = true; - RfidPortNrBoard1 = 51; - RfidPortNrBoard1 = 52; - RfidPortNrBoard1 = 53; - RfidPortNrBoard1 = 54; IperlCheckErrorsToStop = 10; TestParams = CreateTestParamsProvider() as iPerlCommunicationParams; @@ -70,8 +74,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication public string ToString(int i) { - return string.Format("Name={0}, CommTimeout={1}, MaxRetries={2}, NrThreads={3}, MuxBrds={4}, Brd#1=COM{5}, Brd#2=COM{6}, Brd#3=COM{7}, Brd#4=COM{8}", - Name, CommTimeout, MaxCommRetries, NrThreads, UseMuxBoards, RfidPortNrBoard1, RfidPortNrBoard2, RfidPortNrBoard3, RfidPortNrBoard4); + return string.Format("Name={0}, CommTimeout={1}, MaxRetries={2}, NrThreads={3}", Name, CommTimeout, MaxCommRetries, NrThreads); } } } diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfgCtrl.cs index d812238c9..e13b0fab0 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfgCtrl.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfgCtrl.cs @@ -27,7 +27,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication public TestMethodCfgCtrl() { InitializeComponent(); - } + } private void EntryFormCfgCtrl_Load(object sender, EventArgs e) { @@ -43,16 +43,25 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication if (config == null) return; /// Control was not loaded, settings were not changed classNameLabel.Text = config.Factory.ClassName; nameTextBox.Text = config.Name; - useMuxBrdsCheckBox.Checked = config.UseMuxBoards; - rfidPortBoard1TextBox.Text = config.RfidPortNrBoard1.ToString(); - rfidPortBoard2TextBox.Text = config.RfidPortNrBoard2.ToString(); - rfidPortBoard3TextBox.Text = config.RfidPortNrBoard3.ToString(); - rfidPortBoard4TextBox.Text = config.RfidPortNrBoard4.ToString(); commTimeoutTextBox.Text = config.CommTimeout.ToString(); maxCommRetriesTextBox.Text = config.MaxCommRetries.ToString(); delayBetweenRetriesTextBox.Text = config.DelayBetweenRetries.ToString(); nrThreadsTextBox.Text = config.NrThreads.ToString(); iperlCheckErrorsToStopTextBox.Text = config.IperlCheckErrorsToStop.ToString(); + + textBox15rl.Text = config.DfltQ2c_15_rl.ToString(); + textBox15lr.Text = config.DfltQ2c_15_lr.ToString(); + textBox20rl.Text = config.DfltQ2c_20_rl.ToString(); + textBox20lr.Text = config.DfltQ2c_20_lr.ToString(); + textBox25_63rl.Text = config.DfltQ2c_25_63_rl.ToString(); + textBox25_63lr.Text = config.DfltQ2c_25_63_lr.ToString(); + textBox25_10rl.Text = config.DfltQ2c_25_10_rl.ToString(); + textBox25_10lr.Text = config.DfltQ2c_25_10_lr.ToString(); + textBox32rl.Text = config.DfltQ2c_32_rl.ToString(); + textBox32lr.Text = config.DfltQ2c_32_lr.ToString(); + textBox40rl.Text = config.DfltQ2c_40_rl.ToString(); + textBox40lr.Text = config.DfltQ2c_40_lr.ToString(); + useWebServiceCheckBox.Checked = config.UseWebService; baseUrlTextBox.Text = config.BaseUrl; relativeUrlTextBox.Text = config.RelativeUrl; @@ -61,19 +70,29 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication public void Unlock() { nameTextBox.Enabled = true; - useMuxBrdsCheckBox.Enabled = true; - rfidPortBoard1TextBox.Enabled = true; - rfidPortBoard2TextBox.Enabled = true; - rfidPortBoard3TextBox.Enabled = true; - rfidPortBoard4TextBox.Enabled = true; commTimeoutTextBox.Enabled = true; maxCommRetriesTextBox.Enabled = true; delayBetweenRetriesTextBox.Enabled = true; nrThreadsTextBox.Enabled = true; iperlCheckErrorsToStopTextBox.Enabled = true; + + textBox15rl.Enabled = true; + textBox15lr.Enabled = true; + textBox20rl.Enabled = true; + textBox20lr.Enabled = true; + textBox25_63rl.Enabled = true; + textBox25_63lr.Enabled = true; + textBox25_10rl.Enabled = true; + textBox25_10lr.Enabled = true; + textBox32rl.Enabled = true; + textBox32lr.Enabled = true; + textBox40rl.Enabled = true; + textBox40lr.Enabled = true; + useWebServiceCheckBox.Enabled = true; - baseUrlTextBox.Enabled = true; - relativeUrlTextBox.Enabled = true; + ManageCheckGroupBox(useWebServiceCheckBox, useWebServiceGroupBox); + baseUrlTextBox.Enabled = useWebServiceCheckBox.Enabled; + relativeUrlTextBox.Enabled = useWebServiceCheckBox.Enabled; } public CfgUpdateFlags VerifyCfg(ref string message) @@ -81,26 +100,6 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication CfgUpdateFlags flags = CfgUpdateFlags.None; int dummy; - if (!int.TryParse(rfidPortBoard1TextBox.Text, out dummy) || dummy < 0 || dummy > 999) - { - flags |= CfgUpdateFlags.Error; - message += Environment.NewLine + "'RFID Port #1' is not valid"; - } - if (!int.TryParse(rfidPortBoard2TextBox.Text, out dummy) || dummy < 0 || dummy > 999) - { - flags |= CfgUpdateFlags.Error; - message += Environment.NewLine + "'RFID Port #2' is not valid"; - } - if (!int.TryParse(rfidPortBoard3TextBox.Text, out dummy) || dummy < 0 || dummy > 999) - { - flags |= CfgUpdateFlags.Error; - message += Environment.NewLine + "'RFID Port #3' is not valid"; - } - if (!int.TryParse(rfidPortBoard4TextBox.Text, out dummy) || dummy < 0 || dummy > 999) - { - flags |= CfgUpdateFlags.Error; - message += Environment.NewLine + "'RFID Port #4' is not valid"; - } if (!int.TryParse(commTimeoutTextBox.Text, out dummy) || dummy < 500 || dummy > 5000) { flags |= CfgUpdateFlags.Error; @@ -127,6 +126,67 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication message += Environment.NewLine + string.Format(Strings.Invalid_0, iperlCheckErrorsToStopLabel.Text); } + if (!int.TryParse(textBox15rl.Text, out dummy) || dummy < -50 || dummy > 50) + { + flags |= CfgUpdateFlags.Error; + message += Environment.NewLine + "Default Q2 correction factor DN15 RL should be in range -50 .. 50"; + } + if (!int.TryParse(textBox15lr.Text, out dummy) || dummy < -50 || dummy > 50) + { + flags |= CfgUpdateFlags.Error; + message += Environment.NewLine + "Default Q2 correction factor DN15 LR should be in range -50 .. 50"; + } + if (!int.TryParse(textBox20rl.Text, out dummy) || dummy < -50 || dummy > 50) + { + flags |= CfgUpdateFlags.Error; + message += Environment.NewLine + "Default Q2 correction factor DN20 RL should be in range -50 .. 50"; + } + if (!int.TryParse(textBox20lr.Text, out dummy) || dummy < -50 || dummy > 50) + { + flags |= CfgUpdateFlags.Error; + message += Environment.NewLine + "Default Q2 correction factor DN20 LR should be in range -50 .. 50"; + } + if (!int.TryParse(textBox25_63rl.Text, out dummy) || dummy < -50 || dummy > 50) + { + flags |= CfgUpdateFlags.Error; + message += Environment.NewLine + "Default Q2 correction factor DN25 Q3 6.3 RL should be in range -50 .. 50"; + } + if (!int.TryParse(textBox25_63lr.Text, out dummy) || dummy < -50 || dummy > 50) + { + flags |= CfgUpdateFlags.Error; + message += Environment.NewLine + "Default Q2 correction factor DN25 Q3 6.3 LR should be in range -50 .. 50"; + } + if (!int.TryParse(textBox25_10rl.Text, out dummy) || dummy < -50 || dummy > 50) + { + flags |= CfgUpdateFlags.Error; + message += Environment.NewLine + "Default Q2 correction factor DN25 Q3 10 RL should be in range -50 .. 50"; + } + if (!int.TryParse(textBox25_10lr.Text, out dummy) || dummy < -50 || dummy > 50) + { + flags |= CfgUpdateFlags.Error; + message += Environment.NewLine + "Default Q2 correction factor DN25 Q3 10 LR should be in range -50 .. 50"; + } + if (!int.TryParse(textBox32rl.Text, out dummy) || dummy < -50 || dummy > 50) + { + flags |= CfgUpdateFlags.Error; + message += Environment.NewLine + "Default Q2 correction factor DN32 RL should be in range -50 .. 50"; + } + if (!int.TryParse(textBox32lr.Text, out dummy) || dummy < -50 || dummy > 50) + { + flags |= CfgUpdateFlags.Error; + message += Environment.NewLine + "Default Q2 correction factor DN32 LR should be in range -50 .. 50"; + } + if (!int.TryParse(textBox40rl.Text, out dummy) || dummy < -50 || dummy > 50) + { + flags |= CfgUpdateFlags.Error; + message += Environment.NewLine + "Default Q2 correction factor DN40 RL should be in range -50 .. 50"; + } + if (!int.TryParse(textBox40lr.Text, out dummy) || dummy < -50 || dummy > 50) + { + flags |= CfgUpdateFlags.Error; + message += Environment.NewLine + "Default Q2 correction factor DN40 LR should be in range -50 .. 50"; + } + return flags; } @@ -145,18 +205,25 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication flags |= UpdateDifferent(ref config.CommTimeout, commTimeoutTextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); flags |= UpdateDifferent(ref config.MaxCommRetries, maxCommRetriesTextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); flags |= UpdateDifferent(ref config.DelayBetweenRetries, delayBetweenRetriesTextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); + flags |= UpdateDifferent(ref config.NrThreads, nrThreadsTextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange); flags |= UpdateDifferent(ref config.IperlCheckErrorsToStop, iperlCheckErrorsToStopTextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); - flags |= UpdateDifferent(ref config.UseWebService, useWebServiceCheckBox.Checked, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); - flags |= UpdateDifferent(ref config.BaseUrl, baseUrlTextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); - flags |= UpdateDifferent(ref config.RelativeUrl, relativeUrlTextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); - flags |= UpdateDifferent(ref config.NrThreads, nrThreadsTextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange); - flags |= UpdateDifferent(ref config.UseMuxBoards, useMuxBrdsCheckBox.Checked, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange); - flags |= UpdateDifferent(ref config.RfidPortNrBoard1, rfidPortBoard1TextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange); - flags |= UpdateDifferent(ref config.RfidPortNrBoard2, rfidPortBoard2TextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange); - flags |= UpdateDifferent(ref config.RfidPortNrBoard3, rfidPortBoard3TextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange); - flags |= UpdateDifferent(ref config.RfidPortNrBoard4, rfidPortBoard4TextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange); + flags |= UpdateDifferent(ref config.DfltQ2c_15_rl, textBox15rl.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); + flags |= UpdateDifferent(ref config.DfltQ2c_15_lr, textBox15lr.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); + flags |= UpdateDifferent(ref config.DfltQ2c_20_rl, textBox20rl.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); + flags |= UpdateDifferent(ref config.DfltQ2c_20_lr, textBox20lr.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); + flags |= UpdateDifferent(ref config.DfltQ2c_25_63_rl, textBox25_63rl.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); + flags |= UpdateDifferent(ref config.DfltQ2c_25_63_lr, textBox25_63lr.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); + flags |= UpdateDifferent(ref config.DfltQ2c_25_10_rl, textBox25_10rl.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); + flags |= UpdateDifferent(ref config.DfltQ2c_25_10_lr, textBox25_10lr.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); + flags |= UpdateDifferent(ref config.DfltQ2c_32_rl, textBox32rl.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); + flags |= UpdateDifferent(ref config.DfltQ2c_32_lr, textBox32lr.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); + flags |= UpdateDifferent(ref config.DfltQ2c_40_rl, textBox40rl.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); + flags |= UpdateDifferent(ref config.DfltQ2c_40_lr, textBox40lr.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); + flags |= UpdateDifferent(ref config.UseWebService, useWebServiceCheckBox.Checked, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); + flags |= UpdateDifferent(ref config.BaseUrl, baseUrlTextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); + flags |= UpdateDifferent(ref config.RelativeUrl, relativeUrlTextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange); if ((flags & CfgUpdateFlags.InvokeCfgChange) != 0) { @@ -165,5 +232,24 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication return flags; } - } + + private void ManageCheckGroupBox(CheckBox chk, GroupBox grp) + { + /// Make sure the CheckBox isn't in the GroupBox. This will only happen the first time. + if (chk.Parent == grp) + { + grp.Parent.Controls.Add(chk); /// Reparent the CheckBox so it's not in the GroupBox. + chk.Location = new System.Drawing.Point(chk.Left + grp.Left, chk.Top + grp.Top); /// Adjust the CheckBox's location. + chk.BringToFront(); /// Move the CheckBox to the top of the stacking order. + } + + /// Enable or disable the GroupBox. + grp.Enabled = chk.Checked; + } + + private void useWebServiceCheckBox_CheckedChanged(object sender, EventArgs e) + { + useWebServiceGroupBox.Enabled = useWebServiceCheckBox.Checked; + } + } } diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfgCtrl.designer.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfgCtrl.designer.cs index 34c5b31df..a3295e642 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfgCtrl.designer.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfgCtrl.designer.cs @@ -35,22 +35,12 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication this.nameTextBox = new System.Windows.Forms.TextBox(); this.nameLabel = new System.Windows.Forms.Label(); this.classNameLabel = new System.Windows.Forms.Label(); - this.rfidPortBoard1TextBox = new System.Windows.Forms.TextBox(); - this.rfidPortBoard1Label = new System.Windows.Forms.Label(); - this.rfidPortBoard2TextBox = new System.Windows.Forms.TextBox(); - this.rfidPortBoard2Label = new System.Windows.Forms.Label(); - this.rfidPortBoard3TextBox = new System.Windows.Forms.TextBox(); - this.rfidPortBoard3Label = new System.Windows.Forms.Label(); - this.rfidPortBoard4TextBox = new System.Windows.Forms.TextBox(); - this.rfidPortBoard4Label = new System.Windows.Forms.Label(); this.commTimeoutTextBox = new System.Windows.Forms.TextBox(); this.commTimeoutLabel = new System.Windows.Forms.Label(); this.maxCommRetriesTextBox = new System.Windows.Forms.TextBox(); this.maxNrRetriesLabel = new System.Windows.Forms.Label(); this.nrThreadsTextBox = new System.Windows.Forms.TextBox(); this.nrThreadsLabel = new System.Windows.Forms.Label(); - this.useMuxBrdsCheckBox = new System.Windows.Forms.CheckBox(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); this.iperlCheckErrorsToStopTextBox = new System.Windows.Forms.TextBox(); this.iperlCheckErrorsToStopLabel = new System.Windows.Forms.Label(); this.delayBetweenRetriesTextBox = new System.Windows.Forms.TextBox(); @@ -60,13 +50,36 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication this.baseUrlTextBox = new System.Windows.Forms.TextBox(); this.baseUrlLabel = new System.Windows.Forms.Label(); this.useWebServiceCheckBox = new System.Windows.Forms.CheckBox(); - this.groupBox1.SuspendLayout(); + this.useWebServiceGroupBox = new System.Windows.Forms.GroupBox(); + this.dfltQ2corrFactorsGroupBox = new System.Windows.Forms.GroupBox(); + this.label8 = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.textBox40lr = new System.Windows.Forms.TextBox(); + this.textBox32lr = new System.Windows.Forms.TextBox(); + this.textBox25_10lr = new System.Windows.Forms.TextBox(); + this.textBox25_63lr = new System.Windows.Forms.TextBox(); + this.textBox20lr = new System.Windows.Forms.TextBox(); + this.textBox15lr = new System.Windows.Forms.TextBox(); + this.textBox40rl = new System.Windows.Forms.TextBox(); + this.textBox32rl = new System.Windows.Forms.TextBox(); + this.textBox25_10rl = new System.Windows.Forms.TextBox(); + this.textBox25_63rl = new System.Windows.Forms.TextBox(); + this.textBox20rl = new System.Windows.Forms.TextBox(); + this.textBox15rl = new System.Windows.Forms.TextBox(); + this.useWebServiceGroupBox.SuspendLayout(); + this.dfltQ2corrFactorsGroupBox.SuspendLayout(); this.SuspendLayout(); // // nameTextBox // this.nameTextBox.Enabled = false; - this.nameTextBox.Location = new System.Drawing.Point(88, 31); + this.nameTextBox.Location = new System.Drawing.Point(237, 31); this.nameTextBox.Name = "nameTextBox"; this.nameTextBox.Size = new System.Drawing.Size(130, 20); this.nameTextBox.TabIndex = 2; @@ -83,84 +96,16 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication // classNameLabel // this.classNameLabel.AutoSize = true; - this.classNameLabel.Location = new System.Drawing.Point(24, 7); + this.classNameLabel.Location = new System.Drawing.Point(234, 11); this.classNameLabel.Name = "classNameLabel"; this.classNameLabel.Size = new System.Drawing.Size(83, 13); this.classNameLabel.TabIndex = 0; this.classNameLabel.Text = "ComonentName"; // - // rfidPortBoard1TextBox - // - this.rfidPortBoard1TextBox.Enabled = false; - this.rfidPortBoard1TextBox.Location = new System.Drawing.Point(130, 38); - this.rfidPortBoard1TextBox.Name = "rfidPortBoard1TextBox"; - this.rfidPortBoard1TextBox.Size = new System.Drawing.Size(45, 20); - this.rfidPortBoard1TextBox.TabIndex = 2; - // - // rfidPortBoard1Label - // - this.rfidPortBoard1Label.AutoSize = true; - this.rfidPortBoard1Label.Location = new System.Drawing.Point(12, 41); - this.rfidPortBoard1Label.Name = "rfidPortBoard1Label"; - this.rfidPortBoard1Label.Size = new System.Drawing.Size(96, 13); - this.rfidPortBoard1Label.TabIndex = 1; - this.rfidPortBoard1Label.Text = "RFID COM port #1"; - // - // rfidPortBoard2TextBox - // - this.rfidPortBoard2TextBox.Enabled = false; - this.rfidPortBoard2TextBox.Location = new System.Drawing.Point(130, 60); - this.rfidPortBoard2TextBox.Name = "rfidPortBoard2TextBox"; - this.rfidPortBoard2TextBox.Size = new System.Drawing.Size(45, 20); - this.rfidPortBoard2TextBox.TabIndex = 4; - // - // rfidPortBoard2Label - // - this.rfidPortBoard2Label.AutoSize = true; - this.rfidPortBoard2Label.Location = new System.Drawing.Point(12, 63); - this.rfidPortBoard2Label.Name = "rfidPortBoard2Label"; - this.rfidPortBoard2Label.Size = new System.Drawing.Size(96, 13); - this.rfidPortBoard2Label.TabIndex = 3; - this.rfidPortBoard2Label.Text = "RFID COM port #2"; - // - // rfidPortBoard3TextBox - // - this.rfidPortBoard3TextBox.Enabled = false; - this.rfidPortBoard3TextBox.Location = new System.Drawing.Point(130, 82); - this.rfidPortBoard3TextBox.Name = "rfidPortBoard3TextBox"; - this.rfidPortBoard3TextBox.Size = new System.Drawing.Size(45, 20); - this.rfidPortBoard3TextBox.TabIndex = 6; - // - // rfidPortBoard3Label - // - this.rfidPortBoard3Label.AutoSize = true; - this.rfidPortBoard3Label.Location = new System.Drawing.Point(12, 85); - this.rfidPortBoard3Label.Name = "rfidPortBoard3Label"; - this.rfidPortBoard3Label.Size = new System.Drawing.Size(96, 13); - this.rfidPortBoard3Label.TabIndex = 5; - this.rfidPortBoard3Label.Text = "RFID COM port #3"; - // - // rfidPortBoard4TextBox - // - this.rfidPortBoard4TextBox.Enabled = false; - this.rfidPortBoard4TextBox.Location = new System.Drawing.Point(130, 104); - this.rfidPortBoard4TextBox.Name = "rfidPortBoard4TextBox"; - this.rfidPortBoard4TextBox.Size = new System.Drawing.Size(45, 20); - this.rfidPortBoard4TextBox.TabIndex = 8; - // - // rfidPortBoard4Label - // - this.rfidPortBoard4Label.AutoSize = true; - this.rfidPortBoard4Label.Location = new System.Drawing.Point(12, 107); - this.rfidPortBoard4Label.Name = "rfidPortBoard4Label"; - this.rfidPortBoard4Label.Size = new System.Drawing.Size(96, 13); - this.rfidPortBoard4Label.TabIndex = 7; - this.rfidPortBoard4Label.Text = "RFID COM port #4"; - // // commTimeoutTextBox // this.commTimeoutTextBox.Enabled = false; - this.commTimeoutTextBox.Location = new System.Drawing.Point(173, 53); + this.commTimeoutTextBox.Location = new System.Drawing.Point(237, 53); this.commTimeoutTextBox.Name = "commTimeoutTextBox"; this.commTimeoutTextBox.Size = new System.Drawing.Size(45, 20); this.commTimeoutTextBox.TabIndex = 4; @@ -177,7 +122,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication // maxCommRetriesTextBox // this.maxCommRetriesTextBox.Enabled = false; - this.maxCommRetriesTextBox.Location = new System.Drawing.Point(173, 75); + this.maxCommRetriesTextBox.Location = new System.Drawing.Point(237, 75); this.maxCommRetriesTextBox.Name = "maxCommRetriesTextBox"; this.maxCommRetriesTextBox.Size = new System.Drawing.Size(45, 20); this.maxCommRetriesTextBox.TabIndex = 6; @@ -194,7 +139,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication // nrThreadsTextBox // this.nrThreadsTextBox.Enabled = false; - this.nrThreadsTextBox.Location = new System.Drawing.Point(173, 119); + this.nrThreadsTextBox.Location = new System.Drawing.Point(237, 119); this.nrThreadsTextBox.Name = "nrThreadsTextBox"; this.nrThreadsTextBox.Size = new System.Drawing.Size(45, 20); this.nrThreadsTextBox.TabIndex = 10; @@ -208,39 +153,10 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication this.nrThreadsLabel.TabIndex = 9; this.nrThreadsLabel.Text = "Nr. threads"; // - // useMuxBrdsCheckBox - // - this.useMuxBrdsCheckBox.AutoSize = true; - this.useMuxBrdsCheckBox.Enabled = false; - this.useMuxBrdsCheckBox.Location = new System.Drawing.Point(15, 18); - this.useMuxBrdsCheckBox.Name = "useMuxBrdsCheckBox"; - this.useMuxBrdsCheckBox.Size = new System.Drawing.Size(132, 17); - this.useMuxBrdsCheckBox.TabIndex = 0; - this.useMuxBrdsCheckBox.Text = "Use multiplexer boards"; - this.useMuxBrdsCheckBox.UseVisualStyleBackColor = true; - // - // groupBox1 - // - this.groupBox1.Controls.Add(this.useMuxBrdsCheckBox); - this.groupBox1.Controls.Add(this.rfidPortBoard1Label); - this.groupBox1.Controls.Add(this.rfidPortBoard1TextBox); - this.groupBox1.Controls.Add(this.rfidPortBoard2Label); - this.groupBox1.Controls.Add(this.rfidPortBoard2TextBox); - this.groupBox1.Controls.Add(this.rfidPortBoard3Label); - this.groupBox1.Controls.Add(this.rfidPortBoard3TextBox); - this.groupBox1.Controls.Add(this.rfidPortBoard4Label); - this.groupBox1.Controls.Add(this.rfidPortBoard4TextBox); - this.groupBox1.Location = new System.Drawing.Point(231, 7); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(184, 134); - this.groupBox1.TabIndex = 11; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Mux. boards connected via USB"; - // // iperlCheckErrorsToStopTextBox // this.iperlCheckErrorsToStopTextBox.Enabled = false; - this.iperlCheckErrorsToStopTextBox.Location = new System.Drawing.Point(361, 152); + this.iperlCheckErrorsToStopTextBox.Location = new System.Drawing.Point(237, 141); this.iperlCheckErrorsToStopTextBox.Name = "iperlCheckErrorsToStopTextBox"; this.iperlCheckErrorsToStopTextBox.Size = new System.Drawing.Size(45, 20); this.iperlCheckErrorsToStopTextBox.TabIndex = 13; @@ -248,7 +164,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication // iperlCheckErrorsToStopLabel // this.iperlCheckErrorsToStopLabel.AutoSize = true; - this.iperlCheckErrorsToStopLabel.Location = new System.Drawing.Point(23, 155); + this.iperlCheckErrorsToStopLabel.Location = new System.Drawing.Point(23, 144); this.iperlCheckErrorsToStopLabel.Name = "iperlCheckErrorsToStopLabel"; this.iperlCheckErrorsToStopLabel.Size = new System.Drawing.Size(202, 13); this.iperlCheckErrorsToStopLabel.TabIndex = 12; @@ -257,7 +173,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication // delayBetweenRetriesTextBox // this.delayBetweenRetriesTextBox.Enabled = false; - this.delayBetweenRetriesTextBox.Location = new System.Drawing.Point(173, 97); + this.delayBetweenRetriesTextBox.Location = new System.Drawing.Point(237, 97); this.delayBetweenRetriesTextBox.Name = "delayBetweenRetriesTextBox"; this.delayBetweenRetriesTextBox.Size = new System.Drawing.Size(45, 20); this.delayBetweenRetriesTextBox.TabIndex = 8; @@ -274,7 +190,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication // relativeUrlTextBox // this.relativeUrlTextBox.Enabled = false; - this.relativeUrlTextBox.Location = new System.Drawing.Point(108, 229); + this.relativeUrlTextBox.Location = new System.Drawing.Point(89, 50); this.relativeUrlTextBox.Name = "relativeUrlTextBox"; this.relativeUrlTextBox.Size = new System.Drawing.Size(298, 20); this.relativeUrlTextBox.TabIndex = 18; @@ -282,7 +198,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication // relativeUrlLabel // this.relativeUrlLabel.AutoSize = true; - this.relativeUrlLabel.Location = new System.Drawing.Point(24, 232); + this.relativeUrlLabel.Location = new System.Drawing.Point(13, 53); this.relativeUrlLabel.Name = "relativeUrlLabel"; this.relativeUrlLabel.Size = new System.Drawing.Size(71, 13); this.relativeUrlLabel.TabIndex = 17; @@ -291,7 +207,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication // baseUrlTextBox // this.baseUrlTextBox.Enabled = false; - this.baseUrlTextBox.Location = new System.Drawing.Point(108, 206); + this.baseUrlTextBox.Location = new System.Drawing.Point(89, 24); this.baseUrlTextBox.Name = "baseUrlTextBox"; this.baseUrlTextBox.Size = new System.Drawing.Size(298, 20); this.baseUrlTextBox.TabIndex = 16; @@ -299,7 +215,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication // baseUrlLabel // this.baseUrlLabel.AutoSize = true; - this.baseUrlLabel.Location = new System.Drawing.Point(24, 209); + this.baseUrlLabel.Location = new System.Drawing.Point(13, 27); this.baseUrlLabel.Name = "baseUrlLabel"; this.baseUrlLabel.Size = new System.Drawing.Size(56, 13); this.baseUrlLabel.TabIndex = 15; @@ -309,27 +225,234 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication // this.useWebServiceCheckBox.AutoSize = true; this.useWebServiceCheckBox.Enabled = false; - this.useWebServiceCheckBox.Location = new System.Drawing.Point(25, 184); + this.useWebServiceCheckBox.Location = new System.Drawing.Point(15, 0); this.useWebServiceCheckBox.Name = "useWebServiceCheckBox"; this.useWebServiceCheckBox.Size = new System.Drawing.Size(189, 17); this.useWebServiceCheckBox.TabIndex = 14; this.useWebServiceCheckBox.Text = "Use web service for default values"; this.useWebServiceCheckBox.UseVisualStyleBackColor = true; + this.useWebServiceCheckBox.CheckedChanged += new System.EventHandler(this.useWebServiceCheckBox_CheckedChanged); + // + // useWebServiceGroupBox + // + this.useWebServiceGroupBox.Controls.Add(this.baseUrlTextBox); + this.useWebServiceGroupBox.Controls.Add(this.useWebServiceCheckBox); + this.useWebServiceGroupBox.Controls.Add(this.relativeUrlTextBox); + this.useWebServiceGroupBox.Controls.Add(this.relativeUrlLabel); + this.useWebServiceGroupBox.Controls.Add(this.baseUrlLabel); + this.useWebServiceGroupBox.Location = new System.Drawing.Point(11, 266); + this.useWebServiceGroupBox.Name = "useWebServiceGroupBox"; + this.useWebServiceGroupBox.Size = new System.Drawing.Size(404, 83); + this.useWebServiceGroupBox.TabIndex = 0; + this.useWebServiceGroupBox.TabStop = false; + // + // dfltQ2corrFactorsGroupBox + // + this.dfltQ2corrFactorsGroupBox.Controls.Add(this.label8); + this.dfltQ2corrFactorsGroupBox.Controls.Add(this.label7); + this.dfltQ2corrFactorsGroupBox.Controls.Add(this.label6); + this.dfltQ2corrFactorsGroupBox.Controls.Add(this.label5); + this.dfltQ2corrFactorsGroupBox.Controls.Add(this.label4); + this.dfltQ2corrFactorsGroupBox.Controls.Add(this.label3); + this.dfltQ2corrFactorsGroupBox.Controls.Add(this.label2); + this.dfltQ2corrFactorsGroupBox.Controls.Add(this.label1); + this.dfltQ2corrFactorsGroupBox.Controls.Add(this.textBox40lr); + this.dfltQ2corrFactorsGroupBox.Controls.Add(this.textBox32lr); + this.dfltQ2corrFactorsGroupBox.Controls.Add(this.textBox25_10lr); + this.dfltQ2corrFactorsGroupBox.Controls.Add(this.textBox25_63lr); + this.dfltQ2corrFactorsGroupBox.Controls.Add(this.textBox20lr); + this.dfltQ2corrFactorsGroupBox.Controls.Add(this.textBox15lr); + this.dfltQ2corrFactorsGroupBox.Controls.Add(this.textBox40rl); + this.dfltQ2corrFactorsGroupBox.Controls.Add(this.textBox32rl); + this.dfltQ2corrFactorsGroupBox.Controls.Add(this.textBox25_10rl); + this.dfltQ2corrFactorsGroupBox.Controls.Add(this.textBox25_63rl); + this.dfltQ2corrFactorsGroupBox.Controls.Add(this.textBox20rl); + this.dfltQ2corrFactorsGroupBox.Controls.Add(this.textBox15rl); + this.dfltQ2corrFactorsGroupBox.Location = new System.Drawing.Point(11, 175); + this.dfltQ2corrFactorsGroupBox.Name = "dfltQ2corrFactorsGroupBox"; + this.dfltQ2corrFactorsGroupBox.Size = new System.Drawing.Size(404, 85); + this.dfltQ2corrFactorsGroupBox.TabIndex = 14; + this.dfltQ2corrFactorsGroupBox.TabStop = false; + this.dfltQ2corrFactorsGroupBox.Text = "Default Q2 correction factors"; + // + // label8 + // + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(344, 17); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(35, 13); + this.label8.TabIndex = 19; + this.label8.Text = "DN40"; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(289, 17); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(35, 13); + this.label7.TabIndex = 18; + this.label7.Text = "DN32"; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(233, 17); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(45, 13); + this.label6.TabIndex = 17; + this.label6.Text = "...Q3 10"; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(163, 17); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(70, 13); + this.label5.TabIndex = 16; + this.label5.Text = "DN25 Q3 6.3"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(121, 17); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(35, 13); + this.label4.TabIndex = 15; + this.label4.Text = "DN20"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(65, 17); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(35, 13); + this.label3.TabIndex = 14; + this.label3.Text = "DN15"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(22, 57); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(24, 13); + this.label2.TabIndex = 13; + this.label2.Text = "L-R"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(22, 34); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(24, 13); + this.label1.TabIndex = 12; + this.label1.Text = "R-L"; + // + // textBox40lr + // + this.textBox40lr.Enabled = false; + this.textBox40lr.Location = new System.Drawing.Point(337, 54); + this.textBox40lr.Name = "textBox40lr"; + this.textBox40lr.Size = new System.Drawing.Size(50, 20); + this.textBox40lr.TabIndex = 11; + // + // textBox32lr + // + this.textBox32lr.Enabled = false; + this.textBox32lr.Location = new System.Drawing.Point(281, 54); + this.textBox32lr.Name = "textBox32lr"; + this.textBox32lr.Size = new System.Drawing.Size(50, 20); + this.textBox32lr.TabIndex = 10; + // + // textBox25_10lr + // + this.textBox25_10lr.Enabled = false; + this.textBox25_10lr.Location = new System.Drawing.Point(225, 54); + this.textBox25_10lr.Name = "textBox25_10lr"; + this.textBox25_10lr.Size = new System.Drawing.Size(50, 20); + this.textBox25_10lr.TabIndex = 9; + // + // textBox25_63lr + // + this.textBox25_63lr.Enabled = false; + this.textBox25_63lr.Location = new System.Drawing.Point(169, 54); + this.textBox25_63lr.Name = "textBox25_63lr"; + this.textBox25_63lr.Size = new System.Drawing.Size(50, 20); + this.textBox25_63lr.TabIndex = 8; + // + // textBox20lr + // + this.textBox20lr.Enabled = false; + this.textBox20lr.Location = new System.Drawing.Point(113, 54); + this.textBox20lr.Name = "textBox20lr"; + this.textBox20lr.Size = new System.Drawing.Size(50, 20); + this.textBox20lr.TabIndex = 7; + // + // textBox15lr + // + this.textBox15lr.Enabled = false; + this.textBox15lr.Location = new System.Drawing.Point(57, 54); + this.textBox15lr.Name = "textBox15lr"; + this.textBox15lr.Size = new System.Drawing.Size(50, 20); + this.textBox15lr.TabIndex = 6; + // + // textBox40rl + // + this.textBox40rl.Enabled = false; + this.textBox40rl.Location = new System.Drawing.Point(337, 31); + this.textBox40rl.Name = "textBox40rl"; + this.textBox40rl.Size = new System.Drawing.Size(50, 20); + this.textBox40rl.TabIndex = 5; + // + // textBox32rl + // + this.textBox32rl.Enabled = false; + this.textBox32rl.Location = new System.Drawing.Point(281, 31); + this.textBox32rl.Name = "textBox32rl"; + this.textBox32rl.Size = new System.Drawing.Size(50, 20); + this.textBox32rl.TabIndex = 4; + // + // textBox25_10rl + // + this.textBox25_10rl.Enabled = false; + this.textBox25_10rl.Location = new System.Drawing.Point(225, 31); + this.textBox25_10rl.Name = "textBox25_10rl"; + this.textBox25_10rl.Size = new System.Drawing.Size(50, 20); + this.textBox25_10rl.TabIndex = 3; + // + // textBox25_63rl + // + this.textBox25_63rl.Enabled = false; + this.textBox25_63rl.Location = new System.Drawing.Point(169, 31); + this.textBox25_63rl.Name = "textBox25_63rl"; + this.textBox25_63rl.Size = new System.Drawing.Size(50, 20); + this.textBox25_63rl.TabIndex = 2; + // + // textBox20rl + // + this.textBox20rl.Enabled = false; + this.textBox20rl.Location = new System.Drawing.Point(113, 31); + this.textBox20rl.Name = "textBox20rl"; + this.textBox20rl.Size = new System.Drawing.Size(50, 20); + this.textBox20rl.TabIndex = 1; + // + // textBox15rl + // + this.textBox15rl.Enabled = false; + this.textBox15rl.Location = new System.Drawing.Point(57, 31); + this.textBox15rl.Name = "textBox15rl"; + this.textBox15rl.Size = new System.Drawing.Size(50, 20); + this.textBox15rl.TabIndex = 0; // // TestMethodCfgCtrl // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.relativeUrlTextBox); - this.Controls.Add(this.relativeUrlLabel); - this.Controls.Add(this.baseUrlTextBox); - this.Controls.Add(this.baseUrlLabel); - this.Controls.Add(this.useWebServiceCheckBox); + this.Controls.Add(this.dfltQ2corrFactorsGroupBox); + this.Controls.Add(this.useWebServiceGroupBox); this.Controls.Add(this.delayBetweenRetriesTextBox); this.Controls.Add(this.delayBetweenRetriesLabel); this.Controls.Add(this.iperlCheckErrorsToStopTextBox); this.Controls.Add(this.iperlCheckErrorsToStopLabel); - this.Controls.Add(this.groupBox1); this.Controls.Add(this.nrThreadsTextBox); this.Controls.Add(this.nrThreadsLabel); this.Controls.Add(this.maxCommRetriesTextBox); @@ -340,10 +463,12 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication this.Controls.Add(this.nameLabel); this.Controls.Add(this.classNameLabel); this.Name = "TestMethodCfgCtrl"; - this.Size = new System.Drawing.Size(427, 305); + this.Size = new System.Drawing.Size(427, 363); this.Load += new System.EventHandler(this.EntryFormCfgCtrl_Load); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); + this.useWebServiceGroupBox.ResumeLayout(false); + this.useWebServiceGroupBox.PerformLayout(); + this.dfltQ2corrFactorsGroupBox.ResumeLayout(false); + this.dfltQ2corrFactorsGroupBox.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -353,23 +478,13 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication private System.Windows.Forms.TextBox nameTextBox; private System.Windows.Forms.Label nameLabel; - private System.Windows.Forms.Label classNameLabel; - private System.Windows.Forms.TextBox rfidPortBoard1TextBox; - private System.Windows.Forms.Label rfidPortBoard1Label; - private System.Windows.Forms.TextBox rfidPortBoard2TextBox; - private System.Windows.Forms.Label rfidPortBoard2Label; - private System.Windows.Forms.TextBox rfidPortBoard3TextBox; - private System.Windows.Forms.Label rfidPortBoard3Label; - private System.Windows.Forms.TextBox rfidPortBoard4TextBox; - private System.Windows.Forms.Label rfidPortBoard4Label; + private System.Windows.Forms.Label classNameLabel; private System.Windows.Forms.TextBox commTimeoutTextBox; private System.Windows.Forms.Label commTimeoutLabel; private System.Windows.Forms.TextBox maxCommRetriesTextBox; private System.Windows.Forms.Label maxNrRetriesLabel; private System.Windows.Forms.TextBox nrThreadsTextBox; - private System.Windows.Forms.Label nrThreadsLabel; - private System.Windows.Forms.CheckBox useMuxBrdsCheckBox; - private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.Label nrThreadsLabel; private System.Windows.Forms.TextBox iperlCheckErrorsToStopTextBox; private System.Windows.Forms.Label iperlCheckErrorsToStopLabel; private System.Windows.Forms.TextBox delayBetweenRetriesTextBox; @@ -379,5 +494,27 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication private System.Windows.Forms.TextBox baseUrlTextBox; private System.Windows.Forms.Label baseUrlLabel; private System.Windows.Forms.CheckBox useWebServiceCheckBox; + private System.Windows.Forms.GroupBox useWebServiceGroupBox; + private System.Windows.Forms.GroupBox dfltQ2corrFactorsGroupBox; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.TextBox textBox40lr; + private System.Windows.Forms.TextBox textBox32lr; + private System.Windows.Forms.TextBox textBox25_10lr; + private System.Windows.Forms.TextBox textBox25_63lr; + private System.Windows.Forms.TextBox textBox20lr; + private System.Windows.Forms.TextBox textBox15lr; + private System.Windows.Forms.TextBox textBox40rl; + private System.Windows.Forms.TextBox textBox32rl; + private System.Windows.Forms.TextBox textBox25_10rl; + private System.Windows.Forms.TextBox textBox25_63rl; + private System.Windows.Forms.TextBox textBox20rl; + private System.Windows.Forms.TextBox textBox15rl; } } diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs index 48c1a7e18..f9790f13c 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs @@ -130,30 +130,13 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication { if (iperlHead.DebugLevel != DebugMode.Normal) return 0; /// No function in debug mode - int rfidPortNr; - if (cfg.UseMuxBoards) - { - switch (iperlHead.MuxBoardNrOrGroup14) - { - default: - case 1: rfidPortNr = cfg.RfidPortNrBoard1; break; - case 2: rfidPortNr = cfg.RfidPortNrBoard2; break; - case 3: rfidPortNr = cfg.RfidPortNrBoard3; break; - case 4: rfidPortNr = cfg.RfidPortNrBoard4; break; - } - } - else - { - rfidPortNr = iperlHead.RfidComPortNr; - } - switch (threadID) { default: - case 0: return openPort1(rfidPortNr); - case 1: return openPort2(rfidPortNr); - case 2: return openPort3(rfidPortNr); - case 3: return openPort4(rfidPortNr); + case 0: return openPort1(iperlHead.RfidComPortNr); + case 1: return openPort2(iperlHead.RfidComPortNr); + case 2: return openPort3(iperlHead.RfidComPortNr); + case 3: return openPort4(iperlHead.RfidComPortNr); } } @@ -350,8 +333,6 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication static IList waterMeterPositions0; /// keeps original 0-based indices in RegisterReaders list static int commonWMType; - Modbus.QuidoRS.QuidoRS quido; - /// /// RFID multiplexer PCB / RFID serial port and worker thread related variables @@ -440,21 +421,6 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication startTime = DateTime.Now; startTimeSec = StateMachine.Time; - /// Find QuidoRS - quido = null; - if (StateMachine.Components != null) - { - foreach (var comp in StateMachine.Components) - { - Modbus.QuidoRS.QuidoRS q = comp as Modbus.QuidoRS.QuidoRS; - if ((q != null) && (q.Variant == Modbus.QuidoRS.QuidoVariant.QuidoRS_2_16)) - { - quido = q; - break; - } - } - } - /// Attach to 'CommCompleted' handler CommCompletedHandler += delegate(object sender, CommCompletedEventArgs args) { @@ -526,15 +492,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication if (!muxBrdOrGroup14Nrs.Contains(iPerl.MuxBoardNrOrGroup14)) muxBrdOrGroup14Nrs.Add(iPerl.MuxBoardNrOrGroup14); } - StringBuilder sb = new StringBuilder(); - if (cfg.UseMuxBoards) - { - sb.Append("rfidPortNrs = ["); - foreach (var v in muxBrdOrGroup14Nrs) sb.Append(string.Format(" {0}", v)); - sb.Append(" ], "); - } - sb.Append(string.Format("nrThreads = {0}", workerThreads.Count)); - log.WarnFormat(sb.ToString()); + log.WarnFormat("nrThreads = {0}", workerThreads.Count); } /// @@ -705,15 +663,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication counters[i].BackColor = OptoNokColor; } - /// Set QuidoRS outputs and start the whole communication process - /// by incrementing 'currentGroup'. - /// - if (cfg.UseMuxBoards && (quido != null)) - { - quido.SetOutputs((ushort)(16 - currentGroup - 1)); - Thread.Sleep(2000); - } - + /// Start communication process by incrementing 'currentGroup'. currentGroup++; int wtId = 0; @@ -825,8 +775,6 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication for (int threadIx = threadID; threadIx < threadID + 4; threadIx += cfg.NrThreads) #endif { - if (cfg.UseMuxBoards && threadIx >= muxBrdOrGroup14Nrs.Count) break; // quit, all RFID ports of all water meters done - bool wmFound = false; for (int wmNr0 = 0; wmNr0 < iperlHeads.Count; wmNr0++) @@ -1695,13 +1643,22 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication UInt16 defaultCalibFactor; switch (ihead.CalibrationStruct.MeterType) { - case MeterType.DN15: defaultCalibFactor = 2710; break; - case MeterType.DN20: defaultCalibFactor = 3746; break; - case MeterType.DN25: defaultCalibFactor = 3300; break; - case MeterType.DN32: defaultCalibFactor = 2500; break; - case MeterType.DN40: defaultCalibFactor = 3080; break; - - case MeterType.DN26: + case MeterType.DN15: + defaultCalibFactor = 2710; + break; + case MeterType.DN20: + defaultCalibFactor = 3746; + break; + case MeterType.DN25: + defaultCalibFactor = 3300; + break; + case MeterType.DN32: + defaultCalibFactor = 2500; + break; + case MeterType.DN40: + defaultCalibFactor = 3080; + break; + case MeterType.DN25_Q3_10: case MeterType.CoaxManifold: default: defaultCalibFactor = 3040; @@ -1773,13 +1730,22 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication UInt16 defaultCalibFactor; switch (ihead.CalibrationStructV4.MeterType) { - case MeterType.DN15: defaultCalibFactor = 2710; break; - case MeterType.DN20: defaultCalibFactor = 3746; break; - case MeterType.DN25: defaultCalibFactor = 3300; break; - case MeterType.DN32: defaultCalibFactor = 2500; break; - case MeterType.DN40: defaultCalibFactor = 3080; break; - - case MeterType.DN26: + case MeterType.DN15: + defaultCalibFactor = 2710; + break; + case MeterType.DN20: + defaultCalibFactor = 3746; + break; + case MeterType.DN25: + defaultCalibFactor = 3300; + break; + case MeterType.DN32: + defaultCalibFactor = 2500; + break; + case MeterType.DN40: + defaultCalibFactor = 3080; + break; + case MeterType.DN25_Q3_10: case MeterType.CoaxManifold: default: defaultCalibFactor = 3040; @@ -1984,12 +1950,12 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication return WriteQ2Corrections(threadId, ihead, wm, ref resultStr, ProcessData.CalculatedQ2PreCorrectionLR, ProcessData.CalculatedQ2PreCorrectionRL); } - else - { - return WriteQ2Corrections(threadId, ihead, wm, ref resultStr, ihead.Q2PreCorrectionLR, ihead.Q2PreCorrectionRL); - } + //else + //{ + // return WriteQ2Corrections(threadId, ihead, wm, ref resultStr, ihead.Q2PreCorrectionLR, ihead.Q2PreCorrectionRL); + //} } - else + //else { return ReadQ2Correction(threadId, ihead, wm, ref resultStr); } @@ -2673,9 +2639,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication /// lock (this) { - completedCommCount++; - if (cfg.UseMuxBoards && completedCommCount < muxBrdOrGroup14Nrs.Count) return; - if (!cfg.UseMuxBoards && completedCommCount < 4) return; + if (++completedCommCount < 4) return; completedCommCount = 0; } #endif @@ -2683,11 +2647,6 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication if (currentGroup < lastGroup) { /// Go to the next step / next group - if (quido != null) - { - quido.SetOutputs((ushort)(16 - currentGroup - 1)); - Thread.Sleep(2000); - } currentGroup++; } else if (currentActivityStep + 1 < multiTestParams.Count) @@ -2695,11 +2654,6 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication currentGroup = 0; currentActivityStep++; activityLabel.Text = multiTestParams[currentActivityStep].Activity; - if (quido != null) - { - quido.SetOutputs((ushort)(16 - currentGroup - 1)); - Thread.Sleep(2000); - } currentGroup++; } else diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs index 189064742..8dd00c1f8 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs @@ -78,7 +78,14 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication } } - IsQ2PreCorrectionCalculated = GetQ2PreCorrectionsOrBackups(cfg, wmType, out CalculatedQ2PreCorrectionLR, out CalculatedQ2PreCorrectionRL); + if (cfg.UseWebService) + { + IsQ2PreCorrectionCalculated = GetQ2PreCorrectionsOrBackups(cfg, wmType, out CalculatedQ2PreCorrectionLR, out CalculatedQ2PreCorrectionRL); + } + else + { + + } /// Generate test results Results.Entities.TestRslt tstRslt = BatchRslts.GetTestRslt(test.Name, 0); diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/Enums.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/Enums.cs index 646076c50..c17213ad7 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/Enums.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/Enums.cs @@ -40,13 +40,13 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication.iPerlHead public enum MeterType : byte { - DN15 = 0, + DN15 = 0, CoaxManifold = 1, - DN20 = 2, - DN25 = 3, - DN26 = 4, /// DN25* - DN32 = 5, - DN40 = 6, + DN20 = 2, + DN25 = 3, /// DN25 Q3 = 6.3 m3/h + DN25_Q3_10 = 4, /// DN25 Q3 = 10 m3/h + DN32 = 5, + DN40 = 6, AutoDetect, Count /// Number of meter types } diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs index 683fbd116..60b7ced0d 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs @@ -58,8 +58,6 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication.iPerlHead public ushort FactorLimitHi { get { return (ushort)iperlHeadCfg.ProcParams.FactorLimitHi; } } public Counting InitFlowDir { get { return (iperlHeadCfg != null && iperlHeadCfg.ProcParams != null) ? iperlHeadCfg.ProcParams.Counting : Counting.Arbitrary; } } public int WMType_ID { get { return iperlHeadCfg.ProcParams.WMType_ID; } } /// Required by Oracle DB - public int Q2PreCorrectionLR { get { return iperlHeadCfg.ProcParams.InitQ2CorrLR; } } /// Used by InitOrReadQ2Corrections activity - public int Q2PreCorrectionRL { get { return iperlHeadCfg.ProcParams.InitQ2CorrRL; } } /// Required by Oracle DB /// Properties set by the Begin and the End form @@ -978,12 +976,21 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication.iPerlHead { default: case MeterType.DN15: - case MeterType.CoaxManifold: return 1.0; - case MeterType.DN20: return 2.0; - case MeterType.DN25: return 4.0; - case MeterType.DN26: - case MeterType.DN32: return 8.0; - case MeterType.DN40: return 16.0; + case MeterType.CoaxManifold: + return 1.0; + + case MeterType.DN20: + return 2.0; + + case MeterType.DN25: + return 4.0; + + case MeterType.DN25_Q3_10: + case MeterType.DN32: + return 8.0; + + case MeterType.DN40: + return 16.0; } } diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/ProcParams.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/ProcParams.cs index 1ac452167..9a14ab946 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/ProcParams.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/ProcParams.cs @@ -22,8 +22,6 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication.iPerlHead public int FactorLimitHi; /// Upper limit for the calibration factor public Counting Counting; /// Initial iPerl counting (Artbitrary, Positive or Negative) public int WMType_ID; /// Required for Oracle DB: ID_WZTyp in table VT_PRUEFPUNKT_SOLL_SD - public int InitQ2CorrLR; - public int InitQ2CorrRL; public override void InitializeAll() @@ -35,8 +33,6 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication.iPerlHead FactorLimitHi = 8000; Counting = Counting.Arbitrary; WMType_ID = 2; /// Value for iPerl DN15 - InitQ2CorrLR = 0; - InitQ2CorrRL = 0; } string[] paramNames = new string[] @@ -48,8 +44,6 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication.iPerlHead "Calib. factor Hi", "Counting", "WM type ID", - "Init. Q2 corr. LR", - "Init. Q2 corr. RL", }; public override string ParamName(int i) { return paramNames[i]; } public override int ParamsCount() { return paramNames.Length; } @@ -82,8 +76,6 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication.iPerlHead case 4: return FactorLimitHi.ToString(); case 5: return Counting.ToString(); case 6: return WMType_ID.ToString(); - case 7: return InitQ2CorrLR.ToString(); - case 8: return InitQ2CorrRL.ToString(); default: return string.Empty; } } @@ -109,8 +101,6 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication.iPerlHead } break; case 6: WMType_ID = int.Parse(strValue); return CfgUpdateFlags.None; - case 7: InitQ2CorrLR = int.Parse(strValue); return CfgUpdateFlags.None; - case 8: InitQ2CorrRL = int.Parse(strValue); return CfgUpdateFlags.None; default: return CfgUpdateFlags.None; } @@ -142,10 +132,6 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication.iPerlHead break; case 6: /// WMType_ID if (int.TryParse(strValue, out iDummy)) return true; - break; - case 7: /// InitQ2CorrLR - case 8: /// InitQ2CorrRL - if (int.TryParse(strValue, out iDummy) || (iDummy < -127) || (iDummy > 127)) return true; break; default: message = "Invalid index"; @@ -165,8 +151,6 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication.iPerlHead prms.FactorLimitHi = this.FactorLimitHi; prms.Counting = this.Counting; prms.WMType_ID = this.WMType_ID; - prms.InitQ2CorrLR = this.InitQ2CorrLR; - prms.InitQ2CorrRL = this.InitQ2CorrRL; } public IParamsProvider Clone() diff --git a/TBF/UI/Procedures/ProcedureDlg.cs b/TBF/UI/Procedures/ProcedureDlg.cs index 53178f264..a061ffe02 100644 --- a/TBF/UI/Procedures/ProcedureDlg.cs +++ b/TBF/UI/Procedures/ProcedureDlg.cs @@ -2839,12 +2839,12 @@ namespace TBF.UI.Procedures switch (oracleDlg.MeterType) { - case MeterType.DN15: wmpp.DN = 15.0F; break; - case MeterType.DN20: wmpp.DN = 20.0F; break; - case MeterType.DN25: wmpp.DN = 25.0F; break; - case MeterType.DN26: wmpp.DN = 25.0F; break; - case MeterType.DN32: wmpp.DN = 32.0F; break; - case MeterType.DN40: wmpp.DN = 40.0F; break; + case MeterType.DN15: wmpp.DN = 15.0F; break; + case MeterType.DN20: wmpp.DN = 20.0F; break; + case MeterType.DN25: wmpp.DN = 25.0F; break; + case MeterType.DN25_Q3_10: wmpp.DN = 25.0F; break; + case MeterType.DN32: wmpp.DN = 32.0F; break; + case MeterType.DN40: wmpp.DN = 40.0F; break; default: case MeterType.AutoDetect: wmpp.DN = 0; break; }