diff --git a/Greenshot/Forms/MainForm.cs b/Greenshot/Forms/MainForm.cs index 7df0ad1ad..03078804b 100644 --- a/Greenshot/Forms/MainForm.cs +++ b/Greenshot/Forms/MainForm.cs @@ -317,6 +317,9 @@ namespace Greenshot { private readonly Timer _doubleClickTimer = new Timer(); public MainForm(CopyDataTransport dataTransport) { + + var uiContext = TaskScheduler.FromCurrentSynchronizationContext(); + SimpleServiceProvider.Current.AddService(uiContext); DpiChanged += (e,o) => ApplyDpiScaling(); // The most important form is this diff --git a/GreenshotPlugin/Core/WindowCapture.cs b/GreenshotPlugin/Core/WindowCapture.cs index 93e88a5a0..494f62b77 100644 --- a/GreenshotPlugin/Core/WindowCapture.cs +++ b/GreenshotPlugin/Core/WindowCapture.cs @@ -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 . */ @@ -82,7 +82,7 @@ namespace GreenshotPlugin.Core { public void ClearDestinations() { CaptureDestinations.Clear(); - } + } public void RemoveDestination(IDestination destination) { if (CaptureDestinations.Contains(destination)) { @@ -109,7 +109,7 @@ namespace GreenshotPlugin.Core { DateTime = DateTime.Now; } } - + /// /// This class is used to pass an instance of the "Capture" around /// Having the Bitmap, eventually the Windows Title and cursor all together. @@ -158,8 +158,8 @@ namespace GreenshotPlugin.Core { } } } - - public void NullImage() { + + public void NullImage() { _image = null; } @@ -175,6 +175,11 @@ namespace GreenshotPlugin.Core { } } + /// + /// The information which OCR brings + /// + public OcrInformation OcrInformation { get; set; } + /// /// Set if the cursor is visible /// @@ -197,8 +202,8 @@ namespace GreenshotPlugin.Core { get {return _location;} set {_location = value;} } - - private CaptureDetails _captureDetails; + + private CaptureDetails _captureDetails; /// /// Get/set the CaptureDetails /// @@ -206,8 +211,8 @@ namespace GreenshotPlugin.Core { get {return _captureDetails;} set {_captureDetails = (CaptureDetails)value;} } - - /// + + /// /// Default Constructor /// public Capture() { @@ -270,8 +275,8 @@ namespace GreenshotPlugin.Core { // Move all the elements // TODO: Enable when the elements are usable again. // MoveElements(-cropRectangle.Location.X, -cropRectangle.Location.Y); - - // Remove invisible elements + + // Remove invisible elements var newElements = new List(); foreach(var captureElement in _elements) { if (captureElement.Bounds.IntersectsWith(cropRectangle)) { @@ -282,8 +287,8 @@ namespace GreenshotPlugin.Core { return true; } - - /// + + /// /// Apply a translate to the mouse location. /// e.g. needed for crop /// @@ -312,8 +317,8 @@ namespace GreenshotPlugin.Core { // MoveElements(childElement.Children, x, y); // } //} - - ///// + + ///// ///// Add a new element to the capture ///// ///// CaptureElement @@ -328,8 +333,8 @@ namespace GreenshotPlugin.Core { // elements.Add(element); // } //} - - ///// + + ///// ///// Returns a list of rectangles which represent object that are on the capture ///// //public List Elements { @@ -340,10 +345,10 @@ namespace GreenshotPlugin.Core { // elements = value; // } //} - - } - - /// + + } + + /// /// A class representing an element in the capture /// public class CaptureElement : ICaptureElement { @@ -378,7 +383,7 @@ namespace GreenshotPlugin.Core { return obj is CaptureElement other && Bounds.Equals(other.Bounds); } - + public override int GetHashCode() { // TODO: Fix this, this is not right... return Bounds.GetHashCode(); @@ -387,7 +392,7 @@ namespace GreenshotPlugin.Core { /// /// The Window Capture code /// - public class WindowCapture { + public static class WindowCapture { private static readonly ILog Log = LogManager.GetLogger(typeof(WindowCapture)); private static readonly CoreConfiguration Configuration = IniConfig.GetIniSection(); @@ -400,10 +405,7 @@ namespace GreenshotPlugin.Core { [return: MarshalAs(UnmanagedType.Bool)] private static extern bool DeleteObject(IntPtr hObject); - private WindowCapture() { - } - - /// + /// /// Get the bounds of all screens combined. /// /// A Rectangle of the bounds of the entire display area. @@ -419,7 +421,7 @@ namespace GreenshotPlugin.Core { } return new Rectangle(left, top, (right + Math.Abs(left)), (bottom + Math.Abs(top))); } - + /// /// Retrieves the cursor location safely, accounting for DPI settings in Vista/Windows 7. This implementation /// can conveniently be used when the cursor location is needed to deal with a fullscreen bitmap. @@ -430,7 +432,7 @@ namespace GreenshotPlugin.Core { public static Point GetCursorLocationRelativeToScreenBounds() { return GetLocationRelativeToScreenBounds(User32.GetCursorLocation()); } - + /// /// Converts locationRelativeToScreenOrigin to be relative to top left corner of all screen bounds, which might /// be different in multiscreen setups. This implementation @@ -467,11 +469,11 @@ namespace GreenshotPlugin.Core { var y = cursorLocation.Y - iconInfo.yHotspot - capture.ScreenBounds.Y; // Set the location capture.CursorLocation = new Point(x, y); - + using (Icon icon = Icon.FromHandle(safeIcon.DangerousGetHandle())) { capture.Cursor = icon; } - + if (iconInfo.hbmMask != IntPtr.Zero) { DeleteObject(iconInfo.hbmMask); } @@ -494,7 +496,7 @@ namespace GreenshotPlugin.Core { } return CaptureRectangle(capture, capture.ScreenBounds); } - + /// /// Helper method to create an exception that might explain what is wrong while capturing /// diff --git a/GreenshotPlugin/Interfaces/Capture.cs b/GreenshotPlugin/Interfaces/Capture.cs index 6a4dd647d..2ec761236 100644 --- a/GreenshotPlugin/Interfaces/Capture.cs +++ b/GreenshotPlugin/Interfaces/Capture.cs @@ -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 . */ @@ -42,38 +42,38 @@ namespace GreenshotPlugin.Interfaces { get; set; } - + DateTime DateTime { get; set; } - + List CaptureDestinations { get; set; } - + Dictionary MetaData { get; } - + /// /// Helper method to prevent complex code which needs to check every key /// /// The key for the meta-data /// The value for the meta-data 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; } } - + /// /// The interface to the Capture object, so Plugins can use it. /// @@ -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; } - + /// /// Crops the capture to the specified rectangle (with Bitmap coordinates!) /// @@ -156,6 +156,11 @@ namespace GreenshotPlugin.Interfaces { /// y coordinates to move the mouse void MoveMouseLocation(int x, int y); + /// + /// Store the OCR information for this capture + /// + OcrInformation OcrInformation { get; set; } + // / TODO: Enable when the elements are usable again. ///// ///// Apply a translate to the elements e.g. needed for crop @@ -163,7 +168,7 @@ namespace GreenshotPlugin.Interfaces { ///// x coordinates to move the elements ///// y coordinates to move the elements //void MoveElements(int x, int y); - + ///// ///// Add a new element to the capture ///// diff --git a/GreenshotPlugin/Interfaces/IOcrProvider.cs b/GreenshotPlugin/Interfaces/IOcrProvider.cs index 21bc531c6..5d97f85a4 100644 --- a/GreenshotPlugin/Interfaces/IOcrProvider.cs +++ b/GreenshotPlugin/Interfaces/IOcrProvider.cs @@ -25,15 +25,103 @@ using System.Threading.Tasks; namespace GreenshotPlugin.Interfaces { + /// + /// This interface describes something that can do OCR of a bitmap + /// public interface IOcrProvider { + /// + /// Start the actual OCR + /// + /// Image + /// OcrInformation + Task DoOcrAsync(Image image); + + /// + /// Start the actual OCR + /// + /// ISurface + /// OcrInformation Task DoOcrAsync(ISurface surface); } + /// + /// Contains the information about a word + /// + public class Word + { + /// + /// The actual text for the word + /// + public string Text { get; set; } + + /// + /// The location of the word + /// + public Rectangle Location { get; set; } + } + + /// + /// Describes a line of words + /// + public class Line + { + private Rectangle? _calculatedBounds; + + /// + /// Constructor will preallocate the number of words + /// + /// int + public Line(int wordCount) + { + Words = new Word[wordCount]; + for (int i = 0; i < wordCount; i++) + { + Words[i] = new Word(); + } + } + + /// + /// An array with words + /// + public Word[] Words { get; } + + /// + /// Calculate the bounds of the words + /// + /// Rectangle + 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; + } + + /// + /// Return the calculated bounds for the whole line + /// + public Rectangle CalculatedBounds + { + get { return _calculatedBounds ??= CalculateBounds(); } + } + } + + /// + /// Contains all the information on the OCR result + /// public class OcrInformation { public string Text { get; set; } - public IList<(string word, Rectangle location)> Words { get; } = new List<(string, Rectangle)>(); + public IList Lines { get; } = new List(); } } diff --git a/GreenshotWin10Plugin/Win10OcrDestination.cs b/GreenshotWin10Plugin/Win10OcrDestination.cs index 5b108c504..b426e128d 100644 --- a/GreenshotWin10Plugin/Win10OcrDestination.cs +++ b/GreenshotWin10Plugin/Win10OcrDestination.cs @@ -27,6 +27,7 @@ using Windows.Graphics.Imaging; using Windows.Media.Ocr; using GreenshotPlugin.Core; using System.Text; +using Windows.Storage.Streams; using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces.Plugin; @@ -52,6 +53,8 @@ namespace GreenshotWin10Plugin /// public Win10OcrDestination() { + // Set this as IOcrProvider + SimpleServiceProvider.Current.AddService(this); var languages = OcrEngine.AvailableRecognizerLanguages; foreach (var language in languages) { @@ -59,25 +62,58 @@ namespace GreenshotWin10Plugin } } + /// + /// Scan the surface bitmap for text, and get the OcrResult + /// + /// ISurface + /// OcrResult sync + public Task DoOcrAsync(ISurface surface) + { + using var imageStream = new MemoryStream(); + ImageOutput.SaveToStream(surface, imageStream, new SurfaceOutputSettings()); + imageStream.Position = 0; + var randomAccessStream = imageStream.AsRandomAccessStream(); + return DoOcrAsync(randomAccessStream); + } + + /// + /// Scan the Image for text, and get the OcrResult + /// + /// Image + /// OcrResult sync + public async Task DoOcrAsync(Image image) + { + OcrInformation result; + using (var imageStream = new MemoryStream()) + { + ImageOutput.SaveToStream(image, null, imageStream, new SurfaceOutputSettings()); + imageStream.Position = 0; + var randomAccessStream = imageStream.AsRandomAccessStream(); + + result = await DoOcrAsync(randomAccessStream); + } + return result; + } + /// /// Scan the surface bitmap for text, and get the OcrResult /// - /// ISurface - /// OcrResult - public async Task DoOcrAsync(ISurface surface) - { - var ocrEngine = OcrEngine.TryCreateFromUserProfileLanguages(); - using var imageStream = new MemoryStream(); - ImageOutput.SaveToStream(surface, imageStream, new SurfaceOutputSettings()); - imageStream.Position = 0; - - var decoder = await BitmapDecoder.CreateAsync(imageStream.AsRandomAccessStream()); + /// IRandomAccessStream + /// OcrResult sync + public async Task DoOcrAsync(IRandomAccessStream randomAccessStream) + { + var ocrEngine = OcrEngine.TryCreateFromUserProfileLanguages(); + if (ocrEngine is null) + { + return null; + } + var decoder = await BitmapDecoder.CreateAsync(randomAccessStream); var softwareBitmap = await decoder.GetSoftwareBitmapAsync(); var ocrResult = await ocrEngine.RecognizeAsync(softwareBitmap); var result = new OcrInformation(); - // Build the text from the lines, otherwise it's just everything concated together + // Build the text from the lines, otherwise it's just everything concatenated together var text = new StringBuilder(); foreach (var line in ocrResult.Lines) { @@ -85,16 +121,23 @@ namespace GreenshotWin10Plugin } result.Text = text.ToString(); - foreach (var line in ocrResult.Lines) + foreach (var ocrLine in ocrResult.Lines) { - foreach (var word in line.Words) - { - var rectangle = new Rectangle((int)word.BoundingRect.X, (int)word.BoundingRect.Y, (int)word.BoundingRect.Width, (int)word.BoundingRect.Height); + var line = new Line(ocrLine.Words.Count); + result.Lines.Add(line); - result.Words.Add((word.Text, rectangle)); - } - } - return result; + for (var index = 0; index < ocrLine.Words.Count; index++) + { + var ocrWord = ocrLine.Words[index]; + var location = new Rectangle((int) ocrWord.BoundingRect.X, (int) ocrWord.BoundingRect.Y, + (int) ocrWord.BoundingRect.Width, (int) ocrWord.BoundingRect.Height); + + var word = line.Words[index]; + word.Text = ocrWord.Text; + word.Location = location; + } + } + return result; } ///