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

DataEntry.Camera (1) loads next image after 'Enter' key, (2) dealing with test parts fixed.

Browse Source
This commit is contained in:
Milan Hanajik
2020-11-13 10:23:44 +01:00
parent 77ad6a529d
commit 09da203962
1 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/DataEntry/StandardCamera/TestStartEndForm.cs
+31 -7
View File
@@ -297,7 +297,8 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
switch (mode)
{
case Tst.Start:
if (disabled != null && wmPos <= disabled.Length && disabled[wmPos - 1])
if ((disabled != null && wmPos <= disabled.Length && disabled[wmPos - 1]) ||
(regReaders != null && wmPos <= regReaders.Length && regReaders[wmPos - 1] == null))
{
startTextBoxes[i].Enabled = false;
}
@@ -309,8 +310,9 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
break;
case Tst.End:
if (disabled != null && wmPos <= disabled.Length && disabled[wmPos - 1])
{
if ((disabled != null && wmPos <= disabled.Length && disabled[wmPos - 1]) ||
(regReaders != null && wmPos <= regReaders.Length && regReaders[wmPos - 1] == null))
{
startTextBoxes[i].Enabled = false;
endTextBoxes[i].Enabled = false;
}
@@ -324,8 +326,9 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
break;
case Tst.Both:
if (disabled != null && wmPos <= disabled.Length && disabled[wmPos - 1])
{
if ((disabled != null && wmPos <= disabled.Length && disabled[wmPos - 1]) ||
(regReaders != null && wmPos <= regReaders.Length && regReaders[wmPos - 1] == null))
{
startTextBoxes[i].Enabled = false;
endTextBoxes[i].Enabled = false;
}
@@ -561,8 +564,29 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
if (enabledTextBoxes[i] == currentFocusOwner)
{
/// Change focus to the next enabled text box
enabledTextBoxes[(i + 1) % enabledTextBoxes.Count].Focus();
return;
var currentTextBox = enabledTextBoxes[(i + 1) % enabledTextBoxes.Count];
currentTextBox.Focus();
/// Load the respective image
for (int j = 0; j < startTextBoxes.Length; j++)
{
if (startTextBoxes[j] == currentTextBox)
{
LoadImage(Tst.Start, j);
return;
}
}
for (int j = 0; j < endTextBoxes.Length; j++)
{
if (endTextBoxes[j] == currentTextBox)
{
LoadImage(Tst.End, j);
return;
}
}
/// No image found
return;
}
}
}