Now the loading is trash but the OCR is starting to be fast

This commit is contained in:
2023-04-11 11:05:25 +02:00
parent fde3bcaae6
commit 0c84d468b2
10 changed files with 91 additions and 130 deletions
+17 -21
View File
@@ -68,31 +68,27 @@ namespace OCR_Decode
} }
public Rectangle GetBox() public Rectangle GetBox()
{ {
using (var Engine = new TesseractEngine(TESS_DATA_FOLDER.FullName, "eng", EngineMode.Default)) var tessImage = Pix.LoadFromMemory(ImageToByte(WindowImage));
Engine.SetVariable("tessedit_char_whitelist", "");
Page page = Engine.Process(tessImage);
using (var iter = page.GetIterator())
{ {
Engine.DefaultPageSegMode = PageSegMode.SingleLine; iter.Begin();
var tessImage = Pix.LoadFromMemory(ImageToByte(WindowImage)); do
Engine.SetVariable("tessedit_char_whitelist", "");
Page page = Engine.Process(tessImage);
using (var iter = page.GetIterator())
{ {
iter.Begin(); Rect boundingBox;
do
// Get the bounding box for the current element
if (iter.TryGetBoundingBox(PageIteratorLevel.Word, out boundingBox))
{ {
Rect boundingBox; page.Dispose();
return new Rectangle(boundingBox.X1, boundingBox.X2, boundingBox.Width, boundingBox.Height);
}
} while (iter.Next(PageIteratorLevel.Word));
// Get the bounding box for the current element page.Dispose();
if (iter.TryGetBoundingBox(PageIteratorLevel.Word, out boundingBox)) return new Rectangle(0, 0, 0, 0);
{
page.Dispose();
return new Rectangle(boundingBox.X1, boundingBox.X2, boundingBox.Width, boundingBox.Height);
}
} while (iter.Next(PageIteratorLevel.Word));
page.Dispose();
return new Rectangle(0, 0, 0, 0);
}
} }
} }
} }
+2 -6
View File
@@ -16,12 +16,8 @@ namespace OCR_Decode
} }
public override async Task<object> DecodePng() public override async Task<object> DecodePng()
{ {
using (var Engine = new TesseractEngine(TESS_DATA_FOLDER.FullName, "eng", EngineMode.Default)) int result = await GetTimeFromPng(WindowImage, OcrImage.WindowType.Gap, Engine);
{ return result;
Engine.DefaultPageSegMode = PageSegMode.SingleLine;
int result = await GetTimeFromPng(WindowImage, OcrImage.WindowType.Gap,Engine);
return result;
}
} }
} }
} }
+2 -6
View File
@@ -16,12 +16,8 @@ namespace OCR_Decode
} }
public override async Task<object> DecodePng() public override async Task<object> DecodePng()
{ {
using (var Engine = new TesseractEngine(TESS_DATA_FOLDER.FullName, "eng", EngineMode.Default)) int result = await GetTimeFromPng(WindowImage, OcrImage.WindowType.LapTime,Engine);
{ return result;
Engine.DefaultPageSegMode = PageSegMode.SingleLine;
int result = await GetTimeFromPng(WindowImage, OcrImage.WindowType.LapTime,Engine);
return result;
}
} }
} }
} }
+7 -11
View File
@@ -17,19 +17,15 @@ namespace OCR_Decode
} }
public override async Task<object> DecodePng(List<string> DriverList) public override async Task<object> DecodePng(List<string> DriverList)
{ {
using (var Engine = new TesseractEngine(TESS_DATA_FOLDER.FullName, "eng", EngineMode.Default)) string result = "";
{ result = await GetStringFromPng(WindowImage,Engine);
Engine.DefaultPageSegMode = PageSegMode.SingleLine;
string result = "";
result = await GetStringFromPng(WindowImage,Engine);
if (!IsADriver(DriverList, result)) if (!IsADriver(DriverList, result))
{ {
//I put everything in uppercase to try to lower the chances of bad answers //I put everything in uppercase to try to lower the chances of bad answers
result = FindClosestMatch(DriverList.ConvertAll(d => d.ToUpper()), result.ToUpper()); result = FindClosestMatch(DriverList.ConvertAll(d => d.ToUpper()), result.ToUpper());
}
return result;
} }
return result;
} }
private static bool IsADriver(List<string> drivers, string potentialDriver) private static bool IsADriver(List<string> drivers, string potentialDriver)
{ {
+11 -15
View File
@@ -16,23 +16,19 @@ namespace OCR_Decode
} }
public override async Task<object> DecodePng() public override async Task<object> DecodePng()
{ {
using (var Engine = new TesseractEngine(TESS_DATA_FOLDER.FullName, "eng", EngineMode.Default)) string result = await GetStringFromPng(WindowImage,Engine, "0123456789");
{
Engine.DefaultPageSegMode = PageSegMode.SingleLine;
string result = await GetStringFromPng(WindowImage,Engine, "0123456789");
int position; int position;
try try
{ {
position = Convert.ToInt32(result); position = Convert.ToInt32(result);
}
catch
{
position = -1;
//WindowImage.Save(Reader.DEBUG_DUMP_FOLDER + "FailedPosition" + ".png");
}
return position;
} }
catch
{
position = -1;
//WindowImage.Save(Reader.DEBUG_DUMP_FOLDER + "FailedPosition" + ".png");
}
return position;
} }
} }
} }
+2 -6
View File
@@ -16,12 +16,8 @@ namespace OCR_Decode
} }
public override async Task<object> DecodePng() public override async Task<object> DecodePng()
{ {
using (var Engine = new TesseractEngine(TESS_DATA_FOLDER.FullName, "eng", EngineMode.Default)) int result = await GetTimeFromPng(WindowImage, OcrImage.WindowType.Sector, Engine);
{ return result;
Engine.DefaultPageSegMode = PageSegMode.SingleLine;
int result = await GetTimeFromPng(WindowImage,OcrImage.WindowType.Sector,Engine);
return result;
}
} }
} }
} }
+2 -6
View File
@@ -16,12 +16,8 @@ namespace OCR_Decode
} }
public override async Task<object> DecodePng() public override async Task<object> DecodePng()
{ {
using (var Engine = new TesseractEngine(TESS_DATA_FOLDER.FullName, "eng", EngineMode.Default)) int result = await GetTimeFromPng(WindowImage, OcrImage.WindowType.Sector,Engine);
{ return result;
Engine.DefaultPageSegMode = PageSegMode.SingleLine;
int result = await GetTimeFromPng(WindowImage, OcrImage.WindowType.Sector,Engine);
return result;
}
} }
} }
} }
+3 -6
View File
@@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
@@ -16,12 +17,8 @@ namespace OCR_Decode
} }
public override async Task<object> DecodePng() public override async Task<object> DecodePng()
{ {
using (var Engine = new TesseractEngine(TESS_DATA_FOLDER.FullName, "eng", EngineMode.Default)) int result = await GetTimeFromPng(WindowImage, OcrImage.WindowType.Sector,Engine);
{ return result;
Engine.DefaultPageSegMode = PageSegMode.SingleLine;
int result = await GetTimeFromPng(WindowImage, OcrImage.WindowType.Sector,Engine);
return result;
}
} }
} }
} }
+42 -45
View File
@@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
@@ -34,55 +35,51 @@ namespace OCR_Decode
//tyreZone.Save(Reader.DEBUG_DUMP_FOLDER + "ZONE" + ".png"); //tyreZone.Save(Reader.DEBUG_DUMP_FOLDER + "ZONE" + ".png");
Tyre.Type type = Tyre.Type.Undefined; Tyre.Type type = Tyre.Type.Undefined;
int laps = -1; int laps = -1;
using (var Engine = new TesseractEngine(TESS_DATA_FOLDER.FullName, "eng", EngineMode.Default)) //MHIWsmhiw so we can detect Soft Medium Hard Inters and Wet tyres
string text = await GetStringFromPng(tyreZone,Engine, "SMHIW", OcrImage.WindowType.Tyre);
if (text.Length == 1 && text != "")
{ {
Engine.DefaultPageSegMode = PageSegMode.SingleLine; //We found a tire letter
//MHIWsmhiw so we can detect Soft Medium Hard Inters and Wet tyres laps = 0;
string text = await GetStringFromPng(tyreZone, Engine, "SMHIW", OcrImage.WindowType.Tyre); text = text.ToUpper();
if (text.Length == 1 && text != "") switch (text[0])
{ {
//We found a tire letter case 'S':
laps = 0; type = Tyre.Type.Soft;
text = text.ToUpper(); break;
switch (text[0]) case 'M':
{ type = Tyre.Type.Medium;
case 'S': break;
type = Tyre.Type.Soft; case 'H':
break; type = Tyre.Type.Hard;
case 'M': break;
type = Tyre.Type.Medium; case 'I':
break; type = Tyre.Type.Inter;
case 'H': break;
type = Tyre.Type.Hard; case 'W':
break; type = Tyre.Type.Wet;
case 'I': break;
type = Tyre.Type.Inter; default:
break; type = Tyre.Type.Undefined;
case 'W': break;
type = Tyre.Type.Wet;
break;
default:
type = Tyre.Type.Undefined;
break;
}
} }
else
{
string number = await GetStringFromPng(tyreZone, Engine, "0123456789", OcrImage.WindowType.Tyre);
try
{
laps = Convert.ToInt32(number);
}
catch
{
laps = -1;
}
type = GetTyreTypeFromColor(OcrImage.GetAvgColorFromBitmap(OcrImage.Resize(tyreZone)));
}
//tyreZone.Save(Reader.DEBUG_DUMP_FOLDER + "Tyre" + type + "Laps" + laps + '#' + rnd.Next(0, 1000) + ".png");
return new Tyre(type, laps);
} }
else
{
string number = await GetStringFromPng(tyreZone, Engine, "0123456789", OcrImage.WindowType.Tyre);
try
{
laps = Convert.ToInt32(number);
}
catch
{
laps = -1;
}
type = GetTyreTypeFromColor(OcrImage.GetAvgColorFromBitmap(OcrImage.Resize(tyreZone)));
}
//tyreZone.Save(Reader.DEBUG_DUMP_FOLDER + "Tyre" + type + "Laps" + laps + '#' + rnd.Next(0, 1000) + ".png");
return new Tyre(type, laps);
} }
private Rectangle FindTyreZone() private Rectangle FindTyreZone()
{ {
+3 -8
View File
@@ -16,7 +16,7 @@ namespace OCR_Decode
private Rectangle _bounds; private Rectangle _bounds;
private Bitmap _image; private Bitmap _image;
private string _name; private string _name;
//protected static TesseractEngine Engine = null; protected TesseractEngine Engine;
public Rectangle Bounds { get => _bounds; private set => _bounds = value; } public Rectangle Bounds { get => _bounds; private set => _bounds = value; }
public Bitmap Image { get => _image; set => _image = value; } public Bitmap Image { get => _image; set => _image = value; }
public string Name { get => _name; protected set => _name = value; } public string Name { get => _name; protected set => _name = value; }
@@ -37,13 +37,8 @@ namespace OCR_Decode
{ {
Image = image; Image = image;
Bounds = bounds; Bounds = bounds;
/* Engine = new TesseractEngine(TESS_DATA_FOLDER.FullName, "eng", EngineMode.Default);
if (Engine == null) Engine.DefaultPageSegMode = PageSegMode.SingleLine;
{
Engine = new TesseractEngine(TESS_DATA_FOLDER.FullName, "eng", EngineMode.Default);
Engine.DefaultPageSegMode = PageSegMode.SingleLine;
}
*/
} }
public virtual async Task<Object> DecodePng() public virtual async Task<Object> DecodePng()
{ {