mirror of
https://github.com/greenshot/greenshot
synced 2025-07-16 10:03:44 -07:00
Code quality changes
This commit is contained in:
parent
f07ed83722
commit
610f45d082
189 changed files with 4609 additions and 5203 deletions
|
@ -27,6 +27,7 @@ using Greenshot.IniFile;
|
|||
using Greenshot.Plugin;
|
||||
using GreenshotPlugin.Core;
|
||||
using Greenshot.Core;
|
||||
using GreenshotPlugin.Effects;
|
||||
|
||||
//using Microsoft.Win32;
|
||||
|
||||
|
@ -60,13 +61,11 @@ namespace GreenshotOCR {
|
|||
/// OCR Plugin Greenshot
|
||||
/// </summary>
|
||||
public class OcrPlugin : IGreenshotPlugin {
|
||||
private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(OcrPlugin));
|
||||
private const string CONFIG_FILENAME = "ocr-config.properties";
|
||||
private string OCR_COMMAND;
|
||||
private static IGreenshotHost host;
|
||||
private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(typeof(OcrPlugin));
|
||||
private string _ocrCommand;
|
||||
private static OCRConfiguration config;
|
||||
private PluginAttribute myAttributes;
|
||||
private ToolStripMenuItem ocrMenuItem = new ToolStripMenuItem();
|
||||
private PluginAttribute _myAttributes;
|
||||
private ToolStripMenuItem _ocrMenuItem = new ToolStripMenuItem();
|
||||
|
||||
public void Dispose() {
|
||||
Dispose(true);
|
||||
|
@ -75,15 +74,13 @@ namespace GreenshotOCR {
|
|||
|
||||
protected virtual void Dispose(bool disposing) {
|
||||
if (disposing) {
|
||||
if (ocrMenuItem != null) {
|
||||
ocrMenuItem.Dispose();
|
||||
ocrMenuItem = null;
|
||||
if (_ocrMenuItem != null) {
|
||||
_ocrMenuItem.Dispose();
|
||||
_ocrMenuItem = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public OcrPlugin() { }
|
||||
|
||||
public IEnumerable<IDestination> Destinations() {
|
||||
yield return new OCRDestination(this);
|
||||
}
|
||||
|
@ -98,14 +95,18 @@ namespace GreenshotOCR {
|
|||
/// <param name="myAttributes">My own attributes</param>
|
||||
/// <returns>true if plugin is initialized, false if not (doesn't show)</returns>
|
||||
public virtual bool Initialize(IGreenshotHost greenshotHost, PluginAttribute myAttributes) {
|
||||
LOG.Debug("Initialize called of " + myAttributes.Name);
|
||||
host = greenshotHost;
|
||||
this.myAttributes = myAttributes;
|
||||
|
||||
OCR_COMMAND = Path.Combine(Path.GetDirectoryName(myAttributes.DllFile), "greenshotocrcommand.exe");
|
||||
Log.Debug("Initialize called of " + myAttributes.Name);
|
||||
_myAttributes = myAttributes;
|
||||
|
||||
if (!HasMODI()) {
|
||||
LOG.Warn("No MODI found!");
|
||||
var ocrDirectory = Path.GetDirectoryName(myAttributes.DllFile);
|
||||
if (ocrDirectory == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
_ocrCommand = Path.Combine(ocrDirectory, "greenshotocrcommand.exe");
|
||||
|
||||
if (!HasModi()) {
|
||||
Log.Warn("No MODI found!");
|
||||
return false;
|
||||
}
|
||||
// Load configuration
|
||||
|
@ -121,14 +122,14 @@ namespace GreenshotOCR {
|
|||
/// Implementation of the IGreenshotPlugin.Shutdown
|
||||
/// </summary>
|
||||
public void Shutdown() {
|
||||
LOG.Debug("Shutdown of " + myAttributes.Name);
|
||||
Log.Debug("Shutdown of " + _myAttributes.Name);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Implementation of the IPlugin.Configure
|
||||
/// </summary>
|
||||
public virtual void Configure() {
|
||||
if (!HasMODI()) {
|
||||
if (!HasModi()) {
|
||||
MessageBox.Show("Sorry, is seems that Microsoft Office Document Imaging (MODI) is not installed, therefor the OCR Plugin cannot work.");
|
||||
return;
|
||||
}
|
||||
|
@ -141,62 +142,68 @@ namespace GreenshotOCR {
|
|||
}
|
||||
|
||||
|
||||
private const int MinWidth = 130;
|
||||
private const int MinHeight = 130;
|
||||
/// <summary>
|
||||
/// Handling of the CaptureTaken "event" from the ICaptureHost
|
||||
/// We do the OCR here!
|
||||
/// </summary>
|
||||
/// <param name="ImageOutputEventArgs">Has the Image and the capture details</param>
|
||||
private const int MIN_WIDTH = 130;
|
||||
private const int MIN_HEIGHT = 130;
|
||||
public string DoOCR(ISurface surface) {
|
||||
string filePath = null;
|
||||
SurfaceOutputSettings outputSettings = new SurfaceOutputSettings(OutputFormat.bmp, 0, true);
|
||||
outputSettings.ReduceColors = true;
|
||||
/// <param name="surface">Has the Image and the capture details</param>
|
||||
public string DoOcr(ISurface surface) {
|
||||
SurfaceOutputSettings outputSettings = new SurfaceOutputSettings(OutputFormat.bmp, 0, true)
|
||||
{
|
||||
ReduceColors = true,
|
||||
SaveBackgroundOnly = true
|
||||
};
|
||||
// We only want the background
|
||||
outputSettings.SaveBackgroundOnly = true;
|
||||
// Force Grayscale output
|
||||
outputSettings.Effects.Add(new GrayscaleEffect());
|
||||
|
||||
// Also we need to check the size, resize if needed to 130x130 this is the minimum
|
||||
if (surface.Image.Width < MIN_WIDTH || surface.Image.Height < MIN_HEIGHT) {
|
||||
int addedWidth = MIN_WIDTH - surface.Image.Width;
|
||||
if (surface.Image.Width < MinWidth || surface.Image.Height < MinHeight) {
|
||||
int addedWidth = MinWidth - surface.Image.Width;
|
||||
if (addedWidth < 0) {
|
||||
addedWidth = 0;
|
||||
}
|
||||
int addedHeight = MIN_HEIGHT - surface.Image.Height;
|
||||
int addedHeight = MinHeight - surface.Image.Height;
|
||||
if (addedHeight < 0) {
|
||||
addedHeight = 0;
|
||||
}
|
||||
IEffect effect = new ResizeCanvasEffect(addedWidth / 2, addedWidth / 2, addedHeight / 2, addedHeight / 2);
|
||||
outputSettings.Effects.Add(effect);
|
||||
}
|
||||
filePath = ImageOutput.SaveToTmpFile(surface, outputSettings, null);
|
||||
var filePath = ImageOutput.SaveToTmpFile(surface, outputSettings, null);
|
||||
|
||||
LOG.Debug("Saved tmp file to: " + filePath);
|
||||
Log.Debug("Saved tmp file to: " + filePath);
|
||||
|
||||
string text = "";
|
||||
try {
|
||||
ProcessStartInfo processStartInfo = new ProcessStartInfo(OCR_COMMAND, "\"" + filePath + "\" " + config.Language + " " + config.Orientimage + " " + config.StraightenImage);
|
||||
processStartInfo.CreateNoWindow = true;
|
||||
processStartInfo.RedirectStandardOutput = true;
|
||||
processStartInfo.UseShellExecute = false;
|
||||
ProcessStartInfo processStartInfo = new ProcessStartInfo(_ocrCommand, "\"" + filePath + "\" " + config.Language + " " + config.Orientimage + " " + config.StraightenImage)
|
||||
{
|
||||
CreateNoWindow = true,
|
||||
RedirectStandardOutput = true,
|
||||
UseShellExecute = false
|
||||
};
|
||||
using (Process process = Process.Start(processStartInfo)) {
|
||||
process.WaitForExit(30 * 1000);
|
||||
if (process.ExitCode == 0) {
|
||||
text = process.StandardOutput.ReadToEnd();
|
||||
if (process != null)
|
||||
{
|
||||
process.WaitForExit(30 * 1000);
|
||||
if (process.ExitCode == 0) {
|
||||
text = process.StandardOutput.ReadToEnd();
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
LOG.Error("Error while calling Microsoft Office Document Imaging (MODI) to OCR: ", e);
|
||||
Log.Error("Error while calling Microsoft Office Document Imaging (MODI) to OCR: ", e);
|
||||
} finally {
|
||||
if (File.Exists(filePath)) {
|
||||
LOG.Debug("Cleaning up tmp file: " + filePath);
|
||||
Log.Debug("Cleaning up tmp file: " + filePath);
|
||||
File.Delete(filePath);
|
||||
}
|
||||
}
|
||||
|
||||
if (text == null || text.Trim().Length == 0) {
|
||||
LOG.Info("No text returned");
|
||||
if (string.IsNullOrEmpty(text)) {
|
||||
Log.Info("No text returned");
|
||||
return null;
|
||||
}
|
||||
|
||||
|
@ -204,27 +211,30 @@ namespace GreenshotOCR {
|
|||
text = text.Trim();
|
||||
|
||||
try {
|
||||
LOG.DebugFormat("Pasting OCR Text to Clipboard: {0}", text);
|
||||
Log.DebugFormat("Pasting OCR Text to Clipboard: {0}", text);
|
||||
// Paste to Clipboard (the Plugin currently doesn't have access to the ClipboardHelper from Greenshot
|
||||
IDataObject ido = new DataObject();
|
||||
ido.SetData(DataFormats.Text, true, text);
|
||||
Clipboard.SetDataObject(ido, true);
|
||||
} catch (Exception e) {
|
||||
LOG.Error("Problem pasting text to clipboard: ", e);
|
||||
Log.Error("Problem pasting text to clipboard: ", e);
|
||||
}
|
||||
return text;
|
||||
}
|
||||
|
||||
private bool HasMODI() {
|
||||
private bool HasModi() {
|
||||
try {
|
||||
using (Process process = Process.Start(OCR_COMMAND, "-c")) {
|
||||
process.WaitForExit();
|
||||
return process.ExitCode == 0;
|
||||
using (Process process = Process.Start(_ocrCommand, "-c")) {
|
||||
if (process != null)
|
||||
{
|
||||
process.WaitForExit();
|
||||
return process.ExitCode == 0;
|
||||
}
|
||||
}
|
||||
} catch(Exception e) {
|
||||
LOG.DebugFormat("Error trying to initiate MODI: {0}", e.Message);
|
||||
Log.DebugFormat("Error trying to initiate MODI: {0}", e.Message);
|
||||
}
|
||||
LOG.InfoFormat("No Microsoft Office Document Imaging (MODI) found, disabling OCR");
|
||||
Log.InfoFormat("No Microsoft Office Document Imaging (MODI) found, disabling OCR");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue