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
-4
View File
@@ -68,9 +68,6 @@ namespace OCR_Decode
} }
public Rectangle GetBox() public Rectangle GetBox()
{ {
using (var Engine = new TesseractEngine(TESS_DATA_FOLDER.FullName, "eng", EngineMode.Default))
{
Engine.DefaultPageSegMode = PageSegMode.SingleLine;
var tessImage = Pix.LoadFromMemory(ImageToByte(WindowImage)); var tessImage = Pix.LoadFromMemory(ImageToByte(WindowImage));
Engine.SetVariable("tessedit_char_whitelist", ""); Engine.SetVariable("tessedit_char_whitelist", "");
Page page = Engine.Process(tessImage); Page page = Engine.Process(tessImage);
@@ -96,4 +93,3 @@ namespace OCR_Decode
} }
} }
} }
}
-4
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))
{
Engine.DefaultPageSegMode = PageSegMode.SingleLine;
int result = await GetTimeFromPng(WindowImage, OcrImage.WindowType.Gap, Engine); int result = await GetTimeFromPng(WindowImage, OcrImage.WindowType.Gap, Engine);
return result; return result;
} }
} }
} }
}
-4
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))
{
Engine.DefaultPageSegMode = PageSegMode.SingleLine;
int result = await GetTimeFromPng(WindowImage, OcrImage.WindowType.LapTime,Engine); int result = await GetTimeFromPng(WindowImage, OcrImage.WindowType.LapTime,Engine);
return result; return result;
} }
} }
} }
}
-4
View File
@@ -17,9 +17,6 @@ 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))
{
Engine.DefaultPageSegMode = PageSegMode.SingleLine;
string result = ""; string result = "";
result = await GetStringFromPng(WindowImage,Engine); result = await GetStringFromPng(WindowImage,Engine);
@@ -30,7 +27,6 @@ namespace OCR_Decode
} }
return result; return result;
} }
}
private static bool IsADriver(List<string> drivers, string potentialDriver) private static bool IsADriver(List<string> drivers, string potentialDriver)
{ {
bool result = false; bool result = false;
-4
View File
@@ -16,9 +16,6 @@ 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))
{
Engine.DefaultPageSegMode = PageSegMode.SingleLine;
string result = await GetStringFromPng(WindowImage,Engine, "0123456789"); string result = await GetStringFromPng(WindowImage,Engine, "0123456789");
int position; int position;
@@ -35,4 +32,3 @@ namespace OCR_Decode
} }
} }
} }
}
-4
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))
{
Engine.DefaultPageSegMode = PageSegMode.SingleLine;
int result = await GetTimeFromPng(WindowImage, OcrImage.WindowType.Sector, Engine); int result = await GetTimeFromPng(WindowImage, OcrImage.WindowType.Sector, Engine);
return result; return result;
} }
} }
} }
}
-4
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))
{
Engine.DefaultPageSegMode = PageSegMode.SingleLine;
int result = await GetTimeFromPng(WindowImage, OcrImage.WindowType.Sector,Engine); int result = await GetTimeFromPng(WindowImage, OcrImage.WindowType.Sector,Engine);
return result; return result;
} }
} }
} }
}
+1 -4
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))
{
Engine.DefaultPageSegMode = PageSegMode.SingleLine;
int result = await GetTimeFromPng(WindowImage, OcrImage.WindowType.Sector,Engine); int result = await GetTimeFromPng(WindowImage, OcrImage.WindowType.Sector,Engine);
return result; return result;
} }
} }
} }
}
+1 -4
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,9 +35,6 @@ 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))
{
Engine.DefaultPageSegMode = PageSegMode.SingleLine;
//MHIWsmhiw so we can detect Soft Medium Hard Inters and Wet tyres //MHIWsmhiw so we can detect Soft Medium Hard Inters and Wet tyres
string text = await GetStringFromPng(tyreZone,Engine, "SMHIW", OcrImage.WindowType.Tyre); string text = await GetStringFromPng(tyreZone,Engine, "SMHIW", OcrImage.WindowType.Tyre);
if (text.Length == 1 && text != "") if (text.Length == 1 && text != "")
@@ -83,7 +81,6 @@ namespace OCR_Decode
//tyreZone.Save(Reader.DEBUG_DUMP_FOLDER + "Tyre" + type + "Laps" + laps + '#' + rnd.Next(0, 1000) + ".png"); //tyreZone.Save(Reader.DEBUG_DUMP_FOLDER + "Tyre" + type + "Laps" + laps + '#' + rnd.Next(0, 1000) + ".png");
return new Tyre(type, laps); return new Tyre(type, laps);
} }
}
private Rectangle FindTyreZone() private Rectangle FindTyreZone()
{ {
Bitmap bmp = WindowImage; Bitmap bmp = WindowImage;
+1 -6
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,14 +37,9 @@ namespace OCR_Decode
{ {
Image = image; Image = image;
Bounds = bounds; Bounds = bounds;
/*
if (Engine == null)
{
Engine = new TesseractEngine(TESS_DATA_FOLDER.FullName, "eng", EngineMode.Default); Engine = new TesseractEngine(TESS_DATA_FOLDER.FullName, "eng", EngineMode.Default);
Engine.DefaultPageSegMode = PageSegMode.SingleLine; Engine.DefaultPageSegMode = PageSegMode.SingleLine;
} }
*/
}
public virtual async Task<Object> DecodePng() public virtual async Task<Object> DecodePng()
{ {
return "NaN"; return "NaN";