Michal Buzik
52bd0d01ce
A – Registration and execution - Register GenesisCommunication Factory in the component list. - Separate the Genesis form and sequence from iPerl communication. B – Communication activities - Restore initialization, connection, PCB reading, password and login. - Include grouped login, mode switching and disconnection. - Support processing up to 10 slots. C1 – Input calibration factors - Read three factors from Water meters / Text1–Text3. - Validate integer values in the range 1–65535. - Preserve the default of 15625 when all three fields are empty. D – Q3 calibration - Connect the Prepare Q3 → measurement → Write Q3 workflow. - Add channel processing to FlyingStart and FlyingStartMassCollection. - Reset previous measurement data and validate calculated factors. - Mark factors as stored only after StoreCalibration succeeds. E – Results and database - Store calibration factors separately for each meter and channel. - Add result entities, mappings and Q3 data. - Extend DB.cs / EnsureSchema to create and update the schema. - Preserve compatibility with the existing binary format. Validation: - Debug build and 18 tests passed. - Simulated communication runs follow the same activity sequence. - The complete Q3 workflow has not yet been verified on hardware. Known limitation: - An inherited mismatch in simulated responses and error propagation can produce an incorrect OK result; this change does not fix it.
308 lines
15 KiB
C#
308 lines
15 KiB
C#
///
|
|
/// Copyright (c) 2015-2020 Sensus Slovensko a.s.
|
|
///
|
|
|
|
using System;
|
|
using System.Windows.Forms;
|
|
using Common;
|
|
using TBF.Resources;
|
|
using TBF.Rig.Generic;
|
|
|
|
namespace TBF.Rig.TestMethods.GenesisCommunication
|
|
{
|
|
public partial class TestMethodCfgCtrl : Configs.ConfigCtrlUtils, IComponentCfgCtrl
|
|
{
|
|
public bool ShowMore { get { return false; } }
|
|
|
|
iPerlCommunication.TestMethodCfg config;
|
|
public IComponentCfg Config
|
|
{
|
|
get { return config as IComponentCfg; }
|
|
set
|
|
{
|
|
config = value as iPerlCommunication.TestMethodCfg;
|
|
Redraw();
|
|
}
|
|
}
|
|
|
|
public TestMethodCfgCtrl()
|
|
{
|
|
InitializeComponent();
|
|
dfltQ2corrFactorsGroupBox.Visible = false;
|
|
useWebServiceGroupBox.Visible = false;
|
|
var factorHint = new System.Windows.Forms.Label
|
|
{
|
|
AutoSize = true, Location = dfltQ2corrFactorsGroupBox.Location,
|
|
Text = "Q3 factors: Water meters / Text1, Text2, Text3 (CH1, CH2, CH3)."
|
|
};
|
|
Controls.Add(factorHint);
|
|
}
|
|
|
|
private void EntryFormCfgCtrl_Load(object sender, EventArgs e)
|
|
{
|
|
Redraw();
|
|
}
|
|
|
|
public void Closing()
|
|
{
|
|
}
|
|
|
|
void Redraw()
|
|
{
|
|
if (config == null) return; /// Control was not loaded, settings were not changed
|
|
classNameLabel.Text = config.Factory.ClassName;
|
|
nameTextBox.Text = config.Name;
|
|
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;
|
|
}
|
|
|
|
public void Unlock()
|
|
{
|
|
nameTextBox.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;
|
|
ManageCheckGroupBox(useWebServiceCheckBox, useWebServiceGroupBox);
|
|
baseUrlTextBox.Enabled = useWebServiceCheckBox.Enabled;
|
|
relativeUrlTextBox.Enabled = useWebServiceCheckBox.Enabled;
|
|
}
|
|
|
|
public CfgUpdateFlags VerifyCfg(ref string message)
|
|
{
|
|
CfgUpdateFlags flags = CfgUpdateFlags.None;
|
|
|
|
int dummy;
|
|
if (!int.TryParse(commTimeoutTextBox.Text, out dummy) || dummy < 500 || dummy > 5000)
|
|
{
|
|
flags |= CfgUpdateFlags.Error;
|
|
message += Environment.NewLine + "'Comm. timeout' should be in range 500 .. 5000";
|
|
}
|
|
if (!int.TryParse(maxCommRetriesTextBox.Text, out dummy) || dummy < 1 || dummy > 10)
|
|
{
|
|
flags |= CfgUpdateFlags.Error;
|
|
message += Environment.NewLine + "'Max. retries' should be in range 1 .. 10";
|
|
}
|
|
if (!int.TryParse(delayBetweenRetriesTextBox.Text, out dummy) || dummy < 0 || dummy > 5000)
|
|
{
|
|
flags |= CfgUpdateFlags.Error;
|
|
message += Environment.NewLine + "'Comm. timeout' should be in range 0 .. 5000";
|
|
}
|
|
if (!int.TryParse(nrThreadsTextBox.Text, out dummy) || (dummy < 1 || dummy > 10))
|
|
{
|
|
flags |= CfgUpdateFlags.Error;
|
|
message += Environment.NewLine + "'Nr. threads' should be in range 1 .. 10";
|
|
}
|
|
if (!int.TryParse(iperlCheckErrorsToStopTextBox.Text, out dummy) || ((dummy < 1) && (dummy > 40)))
|
|
{
|
|
flags |= CfgUpdateFlags.Error;
|
|
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;
|
|
}
|
|
|
|
public CfgUpdateFlags UpdateCfg()
|
|
{
|
|
CfgUpdateFlags flags = CfgUpdateFlags.None;
|
|
|
|
if (config == null) return CfgUpdateFlags.Error; /// Control was not loaded, settings were not changed
|
|
|
|
if (config.Name != nameTextBox.Text)
|
|
{
|
|
config.Name = nameTextBox.Text;
|
|
flags |= (CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd);
|
|
}
|
|
|
|
var CommTimeout = config.CommTimeout;;
|
|
var MaxCommRetries = config.MaxCommRetries;
|
|
var DelayBetweenRetries = config.DelayBetweenRetries;
|
|
var NrThreads = config.NrThreads;
|
|
var IperlCheckErrorsToStop = config.IperlCheckErrorsToStop;
|
|
var DfltQ2c_15_rl = config.DfltQ2c_15_rl;
|
|
var DfltQ2c_15_lr = config.DfltQ2c_15_lr;
|
|
var DfltQ2c_20_rl = config.DfltQ2c_20_rl;
|
|
var DfltQ2c_20_lr = config.DfltQ2c_20_lr;
|
|
var DfltQ2c_25_63_rl = config.DfltQ2c_25_63_rl;
|
|
var DfltQ2c_25_63_lr = config.DfltQ2c_25_63_lr;
|
|
var DfltQ2c_25_10_rl = config.DfltQ2c_25_10_rl;
|
|
var DfltQ2c_25_10_lr = config.DfltQ2c_25_10_lr;
|
|
var DfltQ2c_32_rl = config.DfltQ2c_32_rl;
|
|
var DfltQ2c_32_lr = config.DfltQ2c_32_lr;
|
|
var DfltQ2c_40_rl = config.DfltQ2c_40_rl;
|
|
var DfltQ2c_40_lr = config.DfltQ2c_40_lr;
|
|
var UseWebService = config.UseWebService;
|
|
var BaseUrl = config.BaseUrl;
|
|
var RelativeUrl = config.RelativeUrl;
|
|
|
|
flags |= UpdateDifferent(ref CommTimeout, commTimeoutTextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
|
flags |= UpdateDifferent(ref MaxCommRetries, maxCommRetriesTextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
|
flags |= UpdateDifferent(ref DelayBetweenRetries, delayBetweenRetriesTextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
|
flags |= UpdateDifferent(ref NrThreads, nrThreadsTextBox.Text, CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
|
|
flags |= UpdateDifferent(ref IperlCheckErrorsToStop, iperlCheckErrorsToStopTextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
|
|
|
flags |= UpdateDifferent(ref DfltQ2c_15_rl, textBox15rl.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
|
flags |= UpdateDifferent(ref DfltQ2c_15_lr, textBox15lr.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
|
flags |= UpdateDifferent(ref DfltQ2c_20_rl, textBox20rl.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
|
flags |= UpdateDifferent(ref DfltQ2c_20_lr, textBox20lr.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
|
flags |= UpdateDifferent(ref DfltQ2c_25_63_rl, textBox25_63rl.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
|
flags |= UpdateDifferent(ref DfltQ2c_25_63_lr, textBox25_63lr.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
|
flags |= UpdateDifferent(ref DfltQ2c_25_10_rl, textBox25_10rl.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
|
flags |= UpdateDifferent(ref DfltQ2c_25_10_lr, textBox25_10lr.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
|
flags |= UpdateDifferent(ref DfltQ2c_32_rl, textBox32rl.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
|
flags |= UpdateDifferent(ref DfltQ2c_32_lr, textBox32lr.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
|
flags |= UpdateDifferent(ref DfltQ2c_40_rl, textBox40rl.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
|
flags |= UpdateDifferent(ref DfltQ2c_40_lr, textBox40lr.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
|
|
|
flags |= UpdateDifferent(ref UseWebService, useWebServiceCheckBox.Checked, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
|
flags |= UpdateDifferent(ref BaseUrl, baseUrlTextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
|
flags |= UpdateDifferent(ref RelativeUrl, relativeUrlTextBox.Text, CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.AnyChange);
|
|
|
|
|
|
config.CommTimeout = CommTimeout;
|
|
config.MaxCommRetries = MaxCommRetries;
|
|
config.DelayBetweenRetries = DelayBetweenRetries;
|
|
config.NrThreads = NrThreads;
|
|
config.IperlCheckErrorsToStop = IperlCheckErrorsToStop;
|
|
config.DfltQ2c_15_rl = DfltQ2c_15_rl;
|
|
config.DfltQ2c_15_lr = DfltQ2c_15_lr;
|
|
config.DfltQ2c_20_rl = DfltQ2c_20_rl;
|
|
config.DfltQ2c_20_lr = DfltQ2c_20_lr;
|
|
config.DfltQ2c_25_63_rl = DfltQ2c_25_63_rl;
|
|
config.DfltQ2c_25_63_lr = DfltQ2c_25_63_lr;
|
|
config.DfltQ2c_25_10_rl = DfltQ2c_25_10_rl;
|
|
config.DfltQ2c_25_10_lr = DfltQ2c_25_10_lr;
|
|
config.DfltQ2c_32_rl = DfltQ2c_32_rl;
|
|
config.DfltQ2c_32_lr = DfltQ2c_32_lr;
|
|
config.DfltQ2c_40_rl = DfltQ2c_40_rl;
|
|
config.DfltQ2c_40_lr = DfltQ2c_40_lr;
|
|
config.UseWebService = UseWebService;
|
|
config.BaseUrl = BaseUrl;
|
|
config.RelativeUrl = RelativeUrl;
|
|
|
|
if ((flags & CfgUpdateFlags.InvokeCfgChange) != 0)
|
|
{
|
|
iPerlCommunication.TestMethod.OnCfgChange(this, new CfgChangeArgs(CfgChangeCmd.CfgChange, config));
|
|
}
|
|
|
|
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;
|
|
}
|
|
}
|
|
}
|