CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-30 12:11:07 +12:00
Code Issues Packages Projects Releases Wiki Activity

Fix OCR async issue

Browse source
This commit is contained in:
Jaex 2018-11-30 10:43:56 +03:00
parent 7baeb193c6
commit c802383311
5 changed files with 31 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ShareX.HelpersLib/Extensions/Extensions.cs
View file

@ -359,18 +359,21 @@ public static void InvokeSafe(this Control control, Action action)
public static void ForceActivate(this Form form)
{
if (!form.Visible)
if (!form.IsDisposed)
{
form.Show();
}
if (!form.Visible)
{
form.Show();
}
if (form.WindowState == FormWindowState.Minimized)
{
form.WindowState = FormWindowState.Normal;
}
if (form.WindowState == FormWindowState.Minimized)
{
form.WindowState = FormWindowState.Normal;
}
form.BringToFront();
form.Activate();
form.BringToFront();
form.Activate();
}
}
public static int WeekOfYear(this DateTime dateTime)

17
ShareX/Forms/MainForm.cs
View file

@ -1470,7 +1470,7 @@ private void tsmiTextCapture_Click(object sender, EventArgs e)
try
{
TaskHelpers.OCRImage().RunSynchronously();
_ = TaskHelpers.OCRImage();
}
catch (Exception ex)
{
@ -1842,9 +1842,16 @@ private void tsmiTrayLastRegion_Click(object sender, EventArgs e)
new CaptureLastRegion().Capture();
}
private void tsmiTrayTextCapture_Click(object sender, EventArgs e)
private async void tsmiTrayTextCapture_Click(object sender, EventArgs e)
{
TaskHelpers.OCRImage().RunSynchronously();
try
{
await TaskHelpers.OCRImage();
}
catch (Exception ex)
{
DebugHelper.WriteException(ex);
}
}
private void tsmiTrayToggleHotkeys_Click(object sender, EventArgs e)
@ -2094,9 +2101,9 @@ private void tsmiShowQRCode_Click(object sender, EventArgs e)
uim.ShowQRCode();
}
private void tsmiOCRImage_Click(object sender, EventArgs e)
private async void tsmiOCRImage_Click(object sender, EventArgs e)
{
uim.OCRImage();
await uim.OCRImage();
}
private void tsmiCombineImages_Click(object sender, EventArgs e)

4
ShareX/TaskHelpers.cs
View file

@ -134,7 +134,7 @@ public static void ExecuteJob(TaskSettings taskSettings, HotkeyType job, CLIComm
OpenWebpageCapture(safeTaskSettings);
break;
case HotkeyType.TextCapture:
OCRImage(safeTaskSettings).RunSynchronously();
_ = OCRImage(safeTaskSettings);
break;
case HotkeyType.AutoCapture:
OpenAutoCapture(safeTaskSettings);
@ -1144,7 +1144,7 @@ public static async Task OCRImage(string filePath, TaskSettings taskSettings = n
}
}
public static async Task OCRImage(Stream stream, string fileName, string filePath = null, TaskSettings taskSettings = null)
private static async Task OCRImage(Stream stream, string fileName, string filePath = null, TaskSettings taskSettings = null)
{
if (stream != null)
{

5
ShareX/UploadInfoManager.cs
View file

@ -30,6 +30,7 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace ShareX
@ -362,9 +363,9 @@ public void ShowQRCode()
if (IsItemSelected && SelectedItem.IsURLExist) new QRCodeForm(SelectedItem.Info.Result.URL).Show();
}
public void OCRImage()
public async Task OCRImage()
{
if (IsItemSelected && SelectedItem.IsImageFile) TaskHelpers.OCRImage(SelectedItem.Info.FilePath).RunSynchronously();
if (IsItemSelected && SelectedItem.IsImageFile) await TaskHelpers.OCRImage(SelectedItem.Info.FilePath);
}
public void CombineImages()

4
ShareX/WorkerTask.cs
View file

@ -1007,9 +1007,9 @@ private bool DownloadFromURL(bool upload)
private void DoOCR()
{
if (Data != null && Info.DataType == EDataType.Image)
if (Image != null && Info.DataType == EDataType.Image)
{
TaskHelpers.OCRImage(Data, Info.FileName, Info.FilePath, Info.TaskSettings).RunSynchronously();
_ = TaskHelpers.OCRImage(Image, Info.TaskSettings);
}
}