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

Inplementing mass collection update.

Browse Source 
Update AssemblyVersion to 3.9.2149.4, refactor mass collection sequence in StandingStartMassCollection, extend PoseidonCmd with enhanced configuration and dialog options, and improve task handling and UI automation.
This commit is contained in:
Michal Buzik 2025-11-18 10:59:21 +01:00
parent f1d32a39ba
commit 6311df49c3
8 changed files with 226 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TBF/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.9.2149.2")]
[assembly: AssemblyFileVersion("3.9.2149.2")]
[assembly: AssemblyVersion("3.9.2149.4")]
[assembly: AssemblyFileVersion("3.9.2149.4")]

20
TBF/Rig/DataEntry/PoseidonCmd/CycleBeginningForm.cs
View File

@ -10,6 +10,7 @@ using Common;
using TBF.Rig.Sequences;
using TBF.Resources;
using System.Drawing;
using System.Threading.Tasks;
namespace TBF.Rig.DataEntry.PoseidonCmd
{
@ -218,6 +219,25 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
orderComboBox.Text = orderComboBox.Items[0].ToString();
}
}
public void AutoClickOkAfterDelay(int delayMs = 10000)
{
_ = AutoClickInternal(okButton, delayMs);
}
private async Task AutoClickInternal(Button clickButton, int delayMs)
{
await Task.Delay(delayMs);
if (clickButton.IsHandleCreated && clickButton.Enabled && clickButton.Visible)
{
// Invoke on UI thread
if (clickButton.InvokeRequired)
clickButton.BeginInvoke(new Action(() => clickButton.PerformClick()));
else
clickButton.PerformClick();
}
}
private void okButton_Click(object sender, EventArgs e)
{

28
TBF/Rig/DataEntry/PoseidonCmd/EntryForm.cs
View File

@ -178,16 +178,17 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
///
void OpenBeginningDlg(EntryForm myRef)
{
if (!ShowForm)
if (ShowForm == 0)
return;
myRef.modelessDlg = new CycleBeginningForm(TBF.Data.WMsCount, myRef.entryFormCfg,
ProcessData.SelectedProcedure.OrderInfo != null ? ProcessData.SelectedProcedure.OrderInfo.POName : string.Empty);
(myRef.modelessDlg as CycleBeginningForm)?.AutoClickOkAfterDelay();
modelessDlg.Show();
}
///
void OpenTestStartStatesDlg(EntryForm myRef)
{
if (!ShowForm)
if (ShowForm == 0)
return;
myRef.modelessDlg = new TestStartEndForm(myRef.waterMeters.Count, myRef.regReaders, disabled);
modelessDlg.Show();
@ -195,7 +196,7 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
///
void OpenTestEndStatesDlg(EntryForm myRef)
{
if (!ShowForm)
if (ShowForm == 0)
return;
myRef.modelessDlg = new TestStartEndForm(TBF.Data.WMsCount, myRef.regReaders, wmStartStateStr, disabled, refVolume, errLimLo, errLimHi);
modelessDlg.Show();
@ -208,7 +209,7 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
readAndSetDataToMeters = false;
filedDataToMeters = false;
if (!ShowForm)
if (ShowForm == 0)
return ;
resultSaved = false;
@ -246,7 +247,7 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
if (!readAndSetDataToMeters) // run until not finished
readAndSetDataToMeters = ReadAndSetDataToMeters();
if (!ShowForm)
if (ShowForm == 0)
if(readAndSetDataToMeters)
return Event.ModelessFormClosed;
else
@ -286,11 +287,22 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
if (dlg.InvokeRequired)
{
dlg.BeginInvoke(new Action(() =>
dlg.UpdateValues(currentOp == CurrentOp.ReadDatastream_StartStates, true)));
{
dlg.UpdateValues(currentOp == CurrentOp.ReadDatastream_StartStates, true);
if (entryFormCfg.ShowDialogType == ShowDialogType.ContinueAutomatically)
{
dlg.AutoClickOkAfterDelay();
}
}));
}
else
{
dlg.UpdateValues(currentOp == CurrentOp.ReadDatastream_StartStates, true);
if (entryFormCfg.ShowDialogType == ShowDialogType.ContinueAutomatically)
{
dlg.AutoClickOkAfterDelay();
}
}
}
filedDataToMeters = true;
@ -363,9 +375,9 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
filedDataToMeters = false;
}
public bool ShowForm
public int ShowForm
{
get { return entryFormCfg == null ? false : entryFormCfg.ShowDialog; }
get { return entryFormCfg == null ? ShowDialogType.Hide.GetHashCode() : entryFormCfg.ShowDialogType.GetHashCode(); }
set {} // only for read - svia dilalog
}

55
TBF/Rig/DataEntry/PoseidonCmd/EntryFormCfg.cs
View File

@ -3,6 +3,7 @@
///
using System;
using System.Collections.Generic;
using System.Linq;
using System.Xml.Serialization;
using Common;
using Config.Entities;
@ -52,6 +53,15 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
#endif
Count,
}
public enum ShowDialogType
{
[Description("Do not Show")] Hide,
[Description("Continue Automatically")] ContinueAutomatically,
[Description("Continue Manually")] ContinueManually,
Count,
}
public class EntryFormCfg : ComponentCfgBase, IComponentCfg, IParamsProvider
{
@ -69,6 +79,7 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
public Direction Direction;
public Orders Orders;
public bool ShowDialog;
public ShowDialogType ShowDialogType;
public bool SaveCommunication;
/// Private parameterless constructor invoked by all other (public) constructors
@ -89,7 +100,7 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
{
Direction = Direction.Forward_RL;
Orders = Orders.Arbitrary;
ShowDialog = true;
ShowDialogType = ShowDialogType.Hide;
SaveCommunication = false;
}
@ -115,8 +126,9 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
for (Orders o = 0; o < Orders.Count; o++) list.Add(o.ToDescription());
return list;
case 2:
list.Add("True");
list.Add("False");
list.Add(ShowDialogType.Hide.ToDescription());
list.Add(ShowDialogType.ContinueAutomatically.ToDescription());
list.Add(ShowDialogType.ContinueManually.ToDescription());
return list;
case 3:
list.Add("True");
@ -126,6 +138,19 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
return null;
}
}
public static bool TryFromInt<TEnum>(int value, out TEnum result)
where TEnum : struct, Enum
{
if (Enum.IsDefined(typeof(TEnum), value))
{
result = (TEnum)(object)value;
return true;
}
result = default;
return false;
}
public string ToString(int i)
@ -134,10 +159,10 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
{
case 0: return Direction.ToDescription();
case 1: return Orders.ToDescription();
case 2: return ShowDialog.ToString();
case 2: return ShowDialogType.ToDescription();
case 3: return SaveCommunication.ToString();
default:
return string.Format("Name={0}, Direction={1}, Orders={2}, ShowDialog={3}, StoreCommunication={4}", Name, Direction, Orders, ShowDialog, SaveCommunication);
return string.Format("Name={0}, Direction={1}, Orders={2}, ShowDialog={3}, StoreCommunication={4}", Name, Direction, Orders, ShowDialogType, SaveCommunication);
}
}
@ -164,11 +189,14 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
break;
case 2:
{
bool lastSetting = ShowDialog;
if (str == "True") ShowDialog = true;
else ShowDialog = false;
if (lastSetting != ShowDialog)
return CfgUpdateFlags.RestartRqrd;
ShowDialogType lastSetting = ShowDialogType;
for (ShowDialogType s = 0; s < ShowDialogType.Count; s++)
if (s.ToDescription() == str)
{
ShowDialogType = s;
if (lastSetting != ShowDialogType)
return CfgUpdateFlags.RestartRqrd;
}
}
break;
case 3:
@ -196,6 +224,11 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
if (ParamValues(i).Contains(str)) return true;
break;
case 2:
bool exists = Enum.GetValues(typeof(ShowDialogType))
.Cast<ShowDialogType>()
.Any(d => d.ToDescription() == str);
if (exists) return true;
break;
case 3:
if (str == "True" || str == "False") return true;
break;
@ -212,7 +245,7 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
{
prms.Direction = this.Direction;
prms.Orders = this.Orders;
prms.ShowDialog = this.ShowDialog;
prms.ShowDialogType = this.ShowDialogType;
prms.SaveCommunication = this.SaveCommunication;
}

25
TBF/Rig/DataEntry/PoseidonCmd/TestStartEndForm.cs
View File

@ -3,6 +3,7 @@
///
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using System.Windows.Forms;
using log4net;
using TBF.Rig.GenericDevices;
@ -149,7 +150,7 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
// block editing textboxes
for (int i = 0; i < enabledTextBoxes.Count; i++)
{
enabledTextBoxes[i].ReadOnly = busy;
enabledTextBoxes[i].Enabled = !busy;
}
// disable buttons while busy
@ -314,7 +315,9 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
}
if (enableEdit)
{
SetUiBusy(false, deltaTime);
}
// if you also need to enable/disable editing, do it here,
// it's now safely on the UI thread.
}
@ -366,6 +369,26 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
completed = true;
Close();
}
public void AutoClickOkAfterDelay(int delayMs = 10000)
{
_ = AutoClickInternal(okButton, delayMs);
}
private async Task AutoClickInternal(Button okButton, int delayMs)
{
await Task.Delay(delayMs);
if (okButton.IsHandleCreated && okButton.Enabled && okButton.Visible)
{
// Invoke on UI thread
if (okButton.InvokeRequired)
okButton.BeginInvoke(new Action(() => okButton.PerformClick()));
else
okButton.PerformClick();
}
}
#region Forced close handling

5
TBF/Rig/GenericDevices/IHasFromUNIDisablePossibility.cs
View File

@ -2,7 +2,10 @@ namespace TBF.Rig.GenericDevices
{
public interface IHasFromUNIDisablePossibility
{
bool ShowForm { get; set; }
/// <summary>
/// 0 - disabled, > 1 - enabled but can have variable uses how form is shown
/// </summary>
int ShowForm { get; set; }
bool ReadAndSetDataToMeters();
}

88
TBF/Rig/RegisterReaders/PoseidonCmdStartStop/PoseidonReader.cs
View File

@ -316,7 +316,7 @@ namespace TBF.Rig.RegisterReaders.PoseidonCmdStartStop
private void ReadPulses()
{
wmRefPulses = controlBoard.RefPulses;
wmRefPulses = controlBoard?.RefPulses ?? 0;
}
@ -363,8 +363,20 @@ namespace TBF.Rig.RegisterReaders.PoseidonCmdStartStop
}
else if (_currentOp == CurrentPoseidonOp.SendStartDataStream_Done)
{
var first = CliRunner.TaskPool.FindLast(t => t is Task<string>);
var firstTask = CliRunner.TaskPool.FindLast(t => t is Task<string>);
if (firstTask != null && firstTask is Task<string>)
{
string data = null;
data = (firstTask as Task<string>).Result;
if (data != null && TryGetDeviceId(data, out wmSerialNr))
{
}
}
_currentOp = CurrentPoseidonOp.Done;
return Event.Done;
}
@ -398,6 +410,20 @@ namespace TBF.Rig.RegisterReaders.PoseidonCmdStartStop
{
data = (first as Task<JsonDataFromPoseidon>).Result;
//GET serial number
if (string.IsNullOrEmpty(wmSerialNr))
{
try
{
wmSerialNr = data?.DeviceId ?? wmSerialNr;
}
catch (Exception e)
{
log.Error("Serial Nr - parse error!");
}
}
//GET volume
if (data != null && Double.TryParse(data.Reading, out double Volume))
{
double VolumeLi = Units.ConvertFrom(Unit.USgal, Volume);
@ -415,6 +441,8 @@ namespace TBF.Rig.RegisterReaders.PoseidonCmdStartStop
}
}
//Finish reading and loop
_currentOp = CurrentPoseidonOp.Done;
return Event.Done;
}
@ -476,34 +504,38 @@ namespace TBF.Rig.RegisterReaders.PoseidonCmdStartStop
public void StartSession()
{
ValidateCliFileExistence(false);
if (DebugLevel == DebugMode.Simulate)
{
wmSerialNr = "777321";
}
else
{
//TODO BUMI start session - CMD send data to Poseidon
CliRunner.AddSendAsync(serialPort, SerialPortData.EMeterArg.DeviceId);
CliRunner.WaitAll();
foreach (Task task in CliRunner.TaskPool)
{
if (task is Task<string>)
{
string result = (task as Task<string>).Result;
if (TryGetDeviceId(result, out wmSerialNr))
{
break;
}
}
}
CliRunner.Clear();
}
//this is no place to get device id
}
// private void RetrieveDeviceIdFromResponse()
// {
// if (DebugLevel == DebugMode.Simulate)
// {
// wmSerialNr = "777321";
// }
// else
// {
// //TODO BUMI start session - CMD send data to Poseidon
//
// CliRunner.AddSendAsync(serialPort, SerialPortData.EMeterArg.DeviceId);
// CliRunner.WaitAll();
// foreach (Task task in CliRunner.TaskPool)
// {
// if (task is Task<string>)
// {
// string result = (task as Task<string>).Result;
// if (TryGetDeviceId(result, out wmSerialNr))
// {
// break;
// }
// }
// }
//
// CliRunner.Clear();
// }
// }
private static readonly Regex DeviceIdRegex = new Regex(
@"(?im)(?:" +
@"^\s*Device\s*Id\s*:\s*([^\r\n]+)\s*$" + // old format

55
TBF/Rig/TestMethods/StandingStartMassCollection/StandingStartMassCollectionSeq.cs
View File

@ -559,7 +559,6 @@ namespace TBF.Rig.TestMethods.StandingStartMassCollection
State.Create(string.Format("{0}({1}) : Enter start states of water meters", test.Method, test.Name))
.AddOperation(checkUiOp)
.AddOperations(readTempPressOps)
.AddOperation(readStartMassOp)
.AddOperation(testInProgress)
.AddOperation((dataEntryCmpnt as GenericDevices.IHasWMStatesForm).ShowTestStartFormOp(sensPath.RegisterReaders))
.AddOperation(processDataLoggingOp)
@ -641,6 +640,28 @@ namespace TBF.Rig.TestMethods.StandingStartMassCollection
}
}
}
//...MF...kvapkania... robime to pridanim casovej konstanty, ktora sa konfiguruje
State.Create(string.Format("{0}({1}) : Measure the start mass", test.Method, test.Name))
.AddOperation(checkUiOp)
.AddOperations(readTempPressOps)
.AddOperation(testInProgress)
.AddOperation(scale.ReadStableMassOp(ref StartMass, test.TimeFlow2Mass, test.MassMethod, test.MassRepeats, test.MassSpread))
.AddOperation(processDataLoggingOp)
.EnterState();
do
{
e = StateMachine.WaitRunDevsRunOps();
if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
if (e.Contains(Event.ScaleTimeout))
{
Bridge.OnError(this, Strings.Mass_measurement_timeout);
retVal = Event.RecoverableError;
goto stopTest;
}
}
while (!e.Contains(Event.ScaleDone) && !e.Contains(Event.Next));
}
else
{
@ -648,7 +669,8 @@ namespace TBF.Rig.TestMethods.StandingStartMassCollection
.AddOperation(checkUiOp)
.AddOperations(readTempPressOps)
.AddOperation(testInProgress)
.AddOperation(readStartMassOp)
//.AddOperation(readStartMassOp)
.AddOperation(scale.ReadStableMassOp(ref StartMass, test.TimeFlow2Mass, test.MassMethod, test.MassRepeats, test.MassSpread))
.AddOperation(processDataLoggingOp)
.EnterState();
do {
@ -977,7 +999,34 @@ namespace TBF.Rig.TestMethods.StandingStartMassCollection
}
}
}
}
//...MF...kvapkanie
//------------------------------------------------
Bridge.OnActivity(this, Strings.Measuring_the_weight);
//------------------------------------------------
State.Create(string.Format("{0}({1}) : Measuring the end mass", test.Method, test.Name))
.AddOperation(checkUiOp)
.AddOperations(readTempPressOps)
.AddOperation(testInProgress)
.AddOperation(scale.ReadStableMassOp(ref EndMass, test.TimeStop2Mass, test.MassMethod, test.MassRepeats, test.MassSpread))
.AddOperation(new Operations.TimerOp(StableMassMsrmntTimeoutSec))
.AddOperation(processDataLoggingOp)
.EnterState();
do
{
e = StateMachine.WaitRunDevsRunOps();
if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
if (e.Contains(Event.ScaleTimeout))
{
Bridge.OnError(this, Strings.Mass_measurement_timeout);
retVal = Event.RecoverableError;
goto stopTest;
}
}
while (!e.Contains(Event.ScaleDone) && !e.Contains(Event.Next));
///
}
//------------------------------------------------
Bridge.OnActivity(this, Strings.Test_completed);