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

DataEntry.Uni bug fixes, ver. 3.6.2086

Browse Source
This commit is contained in:
Milan Hanajik
2023-08-09 12:36:15 +02:00
parent ed5cd89d6a
commit 0fbc9e2bad
3 changed files with 15 additions and 7 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.6.2072.0")] [assembly: AssemblyVersion("3.6.2086.0")]
[assembly: AssemblyFileVersion("3.6.2072.0")] [assembly: AssemblyFileVersion("3.6.2086.0")]
TBF/Rig/DataEntry/Uni/CycleBgEnForm.cs
+3
View File
@@ -317,6 +317,9 @@ namespace TBF.Rig.DataEntry.Uni
checkBoxes[wmPos0] = checkBox; checkBoxes[wmPos0] = checkBox;
this.Controls.Add(checkBox); this.Controls.Add(checkBox);
} }
okButton.TabIndex = tabIndex++;
clearButton.TabIndex = tabIndex++;
} }
/// ///
TBF/Rig/DataEntry/Uni/TestStartEndForm.cs
+10 -5
View File
@@ -670,6 +670,8 @@ namespace TBF.Rig.DataEntry.Uni
public void OnOcrTextObtained(int ix, bool _isEnd, string text) public void OnOcrTextObtained(int ix, bool _isEnd, string text)
{ {
if (!isCameraPicture) return;
if (_isEnd) if (_isEnd)
{ {
if (endStateColumn>= 0 && textBoxes[endStateColumn, ix].Enabled) if (endStateColumn>= 0 && textBoxes[endStateColumn, ix].Enabled)
@@ -774,7 +776,7 @@ namespace TBF.Rig.DataEntry.Uni
largeTextBox.Text = string.Format("{0}: {1}", j + 1, textBoxes[k, j].Text); largeTextBox.Text = string.Format("{0}: {1}", j + 1, textBoxes[k, j].Text);
largeExclamationLabel.Visible = false; largeExclamationLabel.Visible = false;
if (k == startStateColumn || k == endStateColumn) if (isCameraPicture && (k == startStateColumn || k == endStateColumn))
{ {
LoadImage(sender, (k == startStateColumn) ? Tst.Start : Tst.End, j); LoadImage(sender, (k == startStateColumn) ? Tst.Start : Tst.End, j);
} }
@@ -832,15 +834,16 @@ namespace TBF.Rig.DataEntry.Uni
private void textBox_AcceptsTabChanged(object sender, EventArgs e) private void textBox_AcceptsTabChanged(object sender, EventArgs e)
{ {
if (!isHandlersEnabled) return; if (!isHandlersEnabled || !isCameraPicture) return;
string[] kj = (sender as TextBox).Name.Split(new char[] { '~' }); string[] kj = (sender as TextBox).Name.Split(new char[] { '~' });
int k = int.Parse(kj[0]); int k = int.Parse(kj[0]);
int j = int.Parse(kj[1]); int j = int.Parse(kj[1]);
if (k != startStateColumn && k != endStateColumn) return; if (k == startStateColumn || k == endStateColumn)
{
LoadImage(sender, (k == startStateColumn) ? Tst.Start : Tst.End, j); LoadImage(sender, (k == startStateColumn) ? Tst.Start : Tst.End, j);
}
} }
@@ -1030,6 +1033,8 @@ namespace TBF.Rig.DataEntry.Uni
/// </summary> /// </summary>
void ShowImage() void ShowImage()
{ {
if (pictureBox1 == null) return;
if (lastImage == null) if (lastImage == null)
{ {
pictureBox1.Image = new Bitmap(TBF.Properties.Resources.Empty); pictureBox1.Image = new Bitmap(TBF.Properties.Resources.Empty);