OCR Code cleanup, preparing for adding the word-rectangles to assist other Greenshot functionality (like blur/pixelate etc)

This commit is contained in:
Robin 2016-10-01 22:22:32 +02:00
parent 243a3e1418
commit cab0f21e26
19 changed files with 672 additions and 111 deletions

View file

@ -1,16 +1,37 @@
using System;
/*
* Greenshot - a free and open source screenshot tool
* Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom
*
* For more information see: http://getgreenshot.org/
* The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using Greenshot.Interop;
using GreenshotOCR;
using GreenshotOCRCommand.Modi;
namespace GreenshotOCRCommand {
public class Program {
private const string USAGE = "<-c> | <path to image.bmp> [language] [orientimage] [straightenImage]";
private const string Usage = "<-c> | <path to image.bmp> [language] [orientimage] [straightenImage]";
public static int Main(string[] args) {
// to test
//args = new string[] { @"C:\localdata\test.bmp"};
if (args.Length == 0) {
Console.WriteLine(USAGE);
Console.WriteLine(Usage);
return -1;
}
string filename = args[0];
@ -28,25 +49,43 @@ namespace GreenshotOCRCommand {
}
try {
if (File.Exists(filename) || "-c".Equals(filename)) {
using (ModiDocu modiDocument = COMWrapper.GetOrCreateInstance<ModiDocu>()) {
if (modiDocument == null) {
using (var document = COMWrapper.GetOrCreateInstance<IDocument>()) {
if (document == null) {
Console.WriteLine("MODI not installed");
return -2;
}
if ("-c".Equals(filename)) {
return 0;
}
modiDocument.Create(filename);
modiDocument.OCR(language, orientimage, straightenImage);
IImage modiImage = modiDocument.Images[0];
ILayout layout = modiImage.Layout;
if (layout.Text != null)
document.Create(filename);
document.OCR(language, orientimage, straightenImage);
var modiImage = document.Images[0];
var layout = modiImage.Layout;
if (layout != null)
{
// For for BUG-1884:
// Although this is done in the OCR Plugin, it does make sense in the command too.
Console.WriteLine(layout.Text.Trim());
#if DEBUG
if (layout.Words != null)
{
foreach (var word in ToEnumerable(layout.Words))
{
if (word.Rects != null)
{
foreach (var rect in ToEnumerable(word.Rects))
{
Debug.WriteLine($"Rect {rect.Left},{rect.Top},{rect.Right},{rect.Bottom} - Word {word.Text} : Confidence: {word.RecognitionConfidence}");
}
}
}
}
#endif
if (layout.Text != null)
{
// For for BUG-1884:
// Although trim is done in the OCR Plugin, it does make sense in the command too.
Console.WriteLine(layout.Text.Trim());
}
}
modiDocument.Close(false);
document.Close(false);
return 0;
}
}
@ -55,5 +94,29 @@ namespace GreenshotOCRCommand {
}
return -1;
}
/// <summary>
/// Helper method
/// </summary>
/// <returns>IEnumerable of IMiRect</returns>
private static IEnumerable<IMiRect> ToEnumerable(IMiRects rects)
{
for (int i = 0; i < rects.Count; i++)
{
yield return rects[i];
}
}
/// <summary>
/// Helper method
/// </summary>
/// <returns>IEnumerable of IWord</returns>
private static IEnumerable<IWord> ToEnumerable(IWords words)
{
for (int i = 0; i < words.Count; i++)
{
yield return words[i];
}
}
}
}