mirror of
https://github.com/greenshot/greenshot
synced 2025-08-20 13:33:27 -07:00
Worked on the OCR to improve the usage, it would now be possible to add a processor which scans all captures.
This commit is contained in:
parent
a4e4ae86cc
commit
b49b01c9be
5 changed files with 215 additions and 74 deletions
|
@ -1,20 +1,20 @@
|
|||
/*
|
||||
* Greenshot - a free and open source screenshot tool
|
||||
* Copyright (C) 2007-2020 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/>.
|
||||
*/
|
||||
|
@ -42,38 +42,38 @@ namespace GreenshotPlugin.Interfaces {
|
|||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
|
||||
DateTime DateTime {
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
|
||||
List<IDestination> CaptureDestinations {
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
|
||||
Dictionary<string, string> MetaData {
|
||||
get;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Helper method to prevent complex code which needs to check every key
|
||||
/// </summary>
|
||||
/// <param name="key">The key for the meta-data</param>
|
||||
/// <param name="value">The value for the meta-data</param>
|
||||
void AddMetaData(string key, string value);
|
||||
|
||||
|
||||
void ClearDestinations();
|
||||
void RemoveDestination(IDestination captureDestination);
|
||||
void AddDestination(IDestination captureDestination);
|
||||
bool HasDestination(string designation);
|
||||
|
||||
|
||||
CaptureMode CaptureMode {
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
|
||||
float DpiX {
|
||||
get;
|
||||
set;
|
||||
|
@ -98,7 +98,7 @@ namespace GreenshotPlugin.Interfaces {
|
|||
set;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// The interface to the Capture object, so Plugins can use it.
|
||||
/// </summary>
|
||||
|
@ -116,33 +116,33 @@ namespace GreenshotPlugin.Interfaces {
|
|||
}
|
||||
|
||||
void NullImage();
|
||||
|
||||
|
||||
Rectangle ScreenBounds {
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
|
||||
Icon Cursor {
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
|
||||
// Boolean to specify if the cursor is available
|
||||
bool CursorVisible {
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
|
||||
Point CursorLocation {
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
|
||||
Point Location {
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Crops the capture to the specified rectangle (with Bitmap coordinates!)
|
||||
/// </summary>
|
||||
|
@ -156,6 +156,11 @@ namespace GreenshotPlugin.Interfaces {
|
|||
/// <param name="y">y coordinates to move the mouse</param>
|
||||
void MoveMouseLocation(int x, int y);
|
||||
|
||||
/// <summary>
|
||||
/// Store the OCR information for this capture
|
||||
/// </summary>
|
||||
OcrInformation OcrInformation { get; set; }
|
||||
|
||||
// / TODO: Enable when the elements are usable again.
|
||||
///// <summary>
|
||||
///// Apply a translate to the elements e.g. needed for crop
|
||||
|
@ -163,7 +168,7 @@ namespace GreenshotPlugin.Interfaces {
|
|||
///// <param name="x">x coordinates to move the elements</param>
|
||||
///// <param name="y">y coordinates to move the elements</param>
|
||||
//void MoveElements(int x, int y);
|
||||
|
||||
|
||||
///// <summary>
|
||||
///// Add a new element to the capture
|
||||
///// </summary>
|
||||
|
|
|
@ -25,15 +25,103 @@ using System.Threading.Tasks;
|
|||
|
||||
namespace GreenshotPlugin.Interfaces
|
||||
{
|
||||
/// <summary>
|
||||
/// This interface describes something that can do OCR of a bitmap
|
||||
/// </summary>
|
||||
public interface IOcrProvider
|
||||
{
|
||||
/// <summary>
|
||||
/// Start the actual OCR
|
||||
/// </summary>
|
||||
/// <param name="image">Image</param>
|
||||
/// <returns>OcrInformation</returns>
|
||||
Task<OcrInformation> DoOcrAsync(Image image);
|
||||
|
||||
/// <summary>
|
||||
/// Start the actual OCR
|
||||
/// </summary>
|
||||
/// <param name="surface">ISurface</param>
|
||||
/// <returns>OcrInformation</returns>
|
||||
Task<OcrInformation> DoOcrAsync(ISurface surface);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Contains the information about a word
|
||||
/// </summary>
|
||||
public class Word
|
||||
{
|
||||
/// <summary>
|
||||
/// The actual text for the word
|
||||
/// </summary>
|
||||
public string Text { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// The location of the word
|
||||
/// </summary>
|
||||
public Rectangle Location { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Describes a line of words
|
||||
/// </summary>
|
||||
public class Line
|
||||
{
|
||||
private Rectangle? _calculatedBounds;
|
||||
|
||||
/// <summary>
|
||||
/// Constructor will preallocate the number of words
|
||||
/// </summary>
|
||||
/// <param name="wordCount">int</param>
|
||||
public Line(int wordCount)
|
||||
{
|
||||
Words = new Word[wordCount];
|
||||
for (int i = 0; i < wordCount; i++)
|
||||
{
|
||||
Words[i] = new Word();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// An array with words
|
||||
/// </summary>
|
||||
public Word[] Words { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Calculate the bounds of the words
|
||||
/// </summary>
|
||||
/// <returns>Rectangle</returns>
|
||||
private Rectangle CalculateBounds()
|
||||
{
|
||||
if (Words.Length == 0)
|
||||
{
|
||||
return Rectangle.Empty;
|
||||
}
|
||||
|
||||
var result = Words[0].Location;
|
||||
for (var index = 0; index < Words.Length; index++)
|
||||
{
|
||||
result = Rectangle.Union(result, Words[index].Location);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Return the calculated bounds for the whole line
|
||||
/// </summary>
|
||||
public Rectangle CalculatedBounds
|
||||
{
|
||||
get { return _calculatedBounds ??= CalculateBounds(); }
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Contains all the information on the OCR result
|
||||
/// </summary>
|
||||
public class OcrInformation
|
||||
{
|
||||
public string Text { get; set; }
|
||||
|
||||
public IList<(string word, Rectangle location)> Words { get; } = new List<(string, Rectangle)>();
|
||||
public IList<Line> Lines { get; } = new List<Line>();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue