Compare commits

...

2 Commits

3 changed files with 19 additions and 9 deletions
+3 -3
View File
@@ -34,11 +34,11 @@ namespace OCR_Decode
switch (type) switch (type)
{ {
case WindowType.LapTime: case WindowType.LapTime:
result = Grayscale(result); result = Tresholding(result, 185);
result = InvertColors(result);
result = Tresholding(result, 165);
result = Resize(result); result = Resize(result);
result = Resize(result); result = Resize(result);
result = Dilatation(result,1);
result = Erode(result,1);
break; break;
case WindowType.Text: case WindowType.Text:
result = Grayscale(result); result = Grayscale(result);
+13 -3
View File
@@ -117,12 +117,22 @@ namespace OCR_Decode
float offset = (((float)MainZone.ZoneImage.Height - (float)(Drivers.Count * FirstZoneSize.Height)) / (float)Drivers.Count); float offset = (((float)MainZone.ZoneImage.Height - (float)(Drivers.Count * FirstZoneSize.Height)) / (float)Drivers.Count);
Bitmap MainZoneImage = MainZone.ZoneImage; Bitmap MainZoneImage = MainZone.ZoneImage;
List<Zone> zonesToAdd = new List<Zone>();
List<Bitmap> zonesImages = new List<Bitmap>();
for (int i = 0; i < NUMBER_OF_DRIVERS; i++) for (int i = 0; i < NUMBER_OF_DRIVERS; i++)
{ {
Point tmpPos = new Point(0, FirstZonePosition.Y + i * FirstZoneSize.Height - Convert.ToInt32(i * offset) /*- (i* (FirstZoneSize.Height / 32))*/); Point tmpPos = new Point(0, FirstZonePosition.Y + i * FirstZoneSize.Height - Convert.ToInt32(i * offset));
Zone newDriverZone = new Zone(MainZoneImage, new Rectangle(tmpPos, FirstZoneSize)); Zone newDriverZone = new Zone(MainZoneImage, new Rectangle(tmpPos, FirstZoneSize));
Bitmap zoneImg = newDriverZone.ZoneImage; zonesToAdd.Add(newDriverZone);
zonesImages.Add(newDriverZone.ZoneImage);
}
//Parallel.For(0, NUMBER_OF_DRIVERS, i =>
for (int i = 0; i < NUMBER_OF_DRIVERS; i++)
{
Zone newDriverZone = zonesToAdd[(int)i];
Bitmap zoneImg = zonesImages[(int)i];
newDriverZone.AddWindow(new DriverPositionWindow(zoneImg, new Rectangle(driverPositionPosition, driverPositionArea))); newDriverZone.AddWindow(new DriverPositionWindow(zoneImg, new Rectangle(driverPositionPosition, driverPositionArea)));
newDriverZone.AddWindow(new DriverGapToLeaderWindow(zoneImg, new Rectangle(driverGapToLeaderPosition, driverGapToLeaderArea))); newDriverZone.AddWindow(new DriverGapToLeaderWindow(zoneImg, new Rectangle(driverGapToLeaderPosition, driverGapToLeaderArea)));
@@ -135,7 +145,7 @@ namespace OCR_Decode
newDriverZone.AddWindow(new DriverSector3Window(zoneImg, new Rectangle(driverSector3Position, driverSector3Area))); newDriverZone.AddWindow(new DriverSector3Window(zoneImg, new Rectangle(driverSector3Position, driverSector3Area)));
MainZone.AddZone(newDriverZone); MainZone.AddZone(newDriverZone);
} }//);
//MessageBox.Show("We have a main zone with " + MainZone.Zones.Count() + " Driver zones with " + MainZone.Zones[4].Windows.Count() + " windows each and we have " + Drivers.Count + " drivers"); //MessageBox.Show("We have a main zone with " + MainZone.Zones.Count() + " Driver zones with " + MainZone.Zones[4].Windows.Count() + " windows each and we have " + Drivers.Count + " drivers");
MainZones.Add(MainZone); MainZones.Add(MainZone);
} }
+3 -3
View File
@@ -103,7 +103,7 @@ namespace OCR_Decode
} while (iter.Next(PageIteratorLevel.Word)); } while (iter.Next(PageIteratorLevel.Word));
} }
//enhancedImage.Save(Reader.DEBUG_DUMP_FOLDER + Regex.Replace(rawResult, "[^0-9A-Za-z]", "") + ".png"); enhancedImage.Save(Reader.DEBUG_DUMP_FOLDER + Regex.Replace(rawResult, "[^0-9A-Za-z]", "") + ".png");
List<string> rawNumbers; List<string> rawNumbers;
@@ -170,7 +170,7 @@ namespace OCR_Decode
result += iter.GetText(PageIteratorLevel.Word); result += iter.GetText(PageIteratorLevel.Word);
} while (iter.Next(PageIteratorLevel.Word)); } while (iter.Next(PageIteratorLevel.Word));
} }
/*
if (allowedChars.Contains("S")) if (allowedChars.Contains("S"))
{ {
enhancedImage.Save(Reader.DEBUG_DUMP_FOLDER + "Tyre" + result +".png"); enhancedImage.Save(Reader.DEBUG_DUMP_FOLDER + "Tyre" + result +".png");
@@ -179,7 +179,7 @@ namespace OCR_Decode
{ {
enhancedImage.Save(Reader.DEBUG_DUMP_FOLDER + result +".png"); enhancedImage.Save(Reader.DEBUG_DUMP_FOLDER + result +".png");
} }
*/
page.Dispose(); page.Dispose();
return result; return result;
} }