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

Bug fixes : 1. DaEntry.Std24.TestStartEndForm, 2. StandingStartMassColl mass msrmnt, not finished, process data logging, ver. 3.1.1864

Browse Source
This commit is contained in:
Milan Hanajik
2022-01-28 16:36:58 +01:00
parent 851c51aa7c
commit 08a08282b5
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("3.1.1861.0")] [assembly: AssemblyVersion("3.1.1864.0")]
[assembly: AssemblyFileVersion("3.1.1861.0")] [assembly: AssemblyFileVersion("3.1.1864.0")]
TBF/Rig/DataEntry/Standard24/TestStartEndForm.cs
+5 -5
View File
@@ -237,17 +237,17 @@ namespace TBF.Rig.DataEntry.Standard24
/// End of test /// End of test
for (int i = 0; i < TextBoxesCount; i++) for (int i = 0; i < TextBoxesCount; i++)
{ {
if (WMStartStateStr != null && i < WMStartStateStr.Length)
{
startTextBoxes[i].Text = WMStartStateStr[i];
}
if (((i < disabled.Length) && disabled[i]) || ((i < regReaders.Length) && (regReaders[i] == null))) if (((i < disabled.Length) && disabled[i]) || ((i < regReaders.Length) && (regReaders[i] == null)))
{ {
endTextBoxes[i].Enabled = false; endTextBoxes[i].Enabled = false;
} }
else else
{ {
if (WMStartStateStr != null && i < WMStartStateStr.Length)
{
startTextBoxes[i].Text = WMStartStateStr[i];
}
endTextBoxes[i].Enabled = true; endTextBoxes[i].Enabled = true;
activeTextBoxes.Add(endTextBoxes[i]); activeTextBoxes.Add(endTextBoxes[i]);
activeWmNrs.Add(i); activeWmNrs.Add(i);
TBF/Rig/TestMethods/StandingStartMassCollection/StandingStartMassCollectionSeq.cs
+5 -3
View File
@@ -518,7 +518,8 @@ namespace TBF.Rig.TestMethods.StandingStartMassCollection
.AddOperation(checkUiOp) .AddOperation(checkUiOp)
.AddOperations(readTempPressOps) .AddOperations(readTempPressOps)
.AddOperation(readStartMassOp) .AddOperation(readStartMassOp)
.AddOperation(testInProgress); .AddOperation(testInProgress)
.AddOperation(processDataLoggingOp);
for (int i = 0; i < sensPath.RegisterReaders.Length; i++) for (int i = 0; i < sensPath.RegisterReaders.Length; i++)
{ {
@@ -552,12 +553,13 @@ namespace TBF.Rig.TestMethods.StandingStartMassCollection
.AddOperation(readStartMassOp) .AddOperation(readStartMassOp)
.AddOperation(testInProgress) .AddOperation(testInProgress)
.AddOperation((dataEntryCmpnt as GenericDevices.IHasWMStatesForm).ShowTestStartFormOp(sensPath.RegisterReaders)) .AddOperation((dataEntryCmpnt as GenericDevices.IHasWMStatesForm).ShowTestStartFormOp(sensPath.RegisterReaders))
.AddOperation(processDataLoggingOp)
.EnterState(); .EnterState();
do { do {
e = StateMachine.WaitRunDevsRunOps(); e = StateMachine.WaitRunDevsRunOps();
if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; } if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
} }
while (!e.Contains(Event.ModelessFormClosed)); while ((!e.Contains(Event.ModelessFormClosed) || !e.Contains(Event.ScaleDone)) && !e.Contains(Event.Next));
if (heatMetersTestParams != null) if (heatMetersTestParams != null)
{ {
@@ -618,12 +620,12 @@ namespace TBF.Rig.TestMethods.StandingStartMassCollection
} }
else else
{ {
State.Create(string.Format("{0}({1}) : Measure the start mass", test.Method, test.Name)) State.Create(string.Format("{0}({1}) : Measure the start mass", test.Method, test.Name))
.AddOperation(checkUiOp) .AddOperation(checkUiOp)
.AddOperations(readTempPressOps) .AddOperations(readTempPressOps)
.AddOperation(testInProgress) .AddOperation(testInProgress)
.AddOperation(readStartMassOp) .AddOperation(readStartMassOp)
.AddOperation(processDataLoggingOp)
.EnterState(); .EnterState();
do { do {
e = StateMachine.WaitRunDevsRunOps(); e = StateMachine.WaitRunDevsRunOps();