mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 14:32:35 +01:00
Quicker start of ocr when doing 'image compare' ocr
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@2139 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
parent
46cab87a3b
commit
74409dcb71
@ -4312,26 +4312,7 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
else if (comboBoxOcrMethod.SelectedIndex == 1)
|
else if (comboBoxOcrMethod.SelectedIndex == 1)
|
||||||
{
|
{
|
||||||
if (_compareBitmaps == null)
|
if (_compareBitmaps == null)
|
||||||
LoadImageCompareBitmaps();
|
LoadImageCompareBitmaps();
|
||||||
|
|
||||||
//_icThreadsStop = false;
|
|
||||||
//_icThreads = new List<BackgroundWorker>();
|
|
||||||
//_icThreadResults = new string[_subtitle.Paragraphs.Count];
|
|
||||||
//int noOfThreads = Environment.ProcessorCount - 2; // -1 or -2?
|
|
||||||
//if (noOfThreads >= max)
|
|
||||||
// noOfThreads = max - 1;
|
|
||||||
//int start = (int)numericUpDownStartNumber.Value + 5;
|
|
||||||
//for (int i = 0; i < noOfThreads; i++)
|
|
||||||
//{
|
|
||||||
// if (start + i < max)
|
|
||||||
// {
|
|
||||||
// var bw = new BackgroundWorker();
|
|
||||||
// var p = new ImageCompareThreadParameter(GetSubtitleBitmap(start + i), start + i, _compareBitmaps, bw, noOfThreads, (int)numericUpDownPixelsIsSpace.Value, checkBoxRightToLeft.Checked, (float)numericUpDownMaxErrorPct.Value, _compareDoc);
|
|
||||||
// bw.DoWork += ImageCompareThreadDoWork;
|
|
||||||
// bw.RunWorkerCompleted += ImageCompareThreadRunWorkerCompleted;
|
|
||||||
// bw.RunWorkerAsync(p);
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
}
|
}
|
||||||
else if (comboBoxOcrMethod.SelectedIndex == 3)
|
else if (comboBoxOcrMethod.SelectedIndex == 3)
|
||||||
{
|
{
|
||||||
@ -4388,7 +4369,7 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
_mainOcrTimer.Tick += mainOcrTimer_Tick;
|
_mainOcrTimer.Tick += mainOcrTimer_Tick;
|
||||||
_mainOcrTimer.Interval = 5;
|
_mainOcrTimer.Interval = 5;
|
||||||
_mainOcrRunning = true;
|
_mainOcrRunning = true;
|
||||||
_mainOcrTimer.Start();
|
mainOcrTimer_Tick(null, null);
|
||||||
|
|
||||||
if (comboBoxOcrMethod.SelectedIndex == 1)
|
if (comboBoxOcrMethod.SelectedIndex == 1)
|
||||||
{
|
{
|
||||||
@ -4399,10 +4380,13 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
if (noOfThreads >= max)
|
if (noOfThreads >= max)
|
||||||
noOfThreads = max - 1;
|
noOfThreads = max - 1;
|
||||||
int start = (int)numericUpDownStartNumber.Value + 5;
|
int start = (int)numericUpDownStartNumber.Value + 5;
|
||||||
|
if (noOfThreads > 1)
|
||||||
|
noOfThreads = 1; // Threading is not really good - subtitle picture creation should probably be threaded instead
|
||||||
for (int i = 0; i < noOfThreads; i++)
|
for (int i = 0; i < noOfThreads; i++)
|
||||||
{
|
{
|
||||||
if (start + i < max)
|
if (start + i < max)
|
||||||
{
|
{
|
||||||
|
Application.DoEvents();
|
||||||
var bw = new BackgroundWorker();
|
var bw = new BackgroundWorker();
|
||||||
var p = new ImageCompareThreadParameter(GetSubtitleBitmap(start + i), start + i, _compareBitmaps, bw, noOfThreads, (int)numericUpDownPixelsIsSpace.Value, checkBoxRightToLeft.Checked, (float)numericUpDownMaxErrorPct.Value, _compareDoc);
|
var p = new ImageCompareThreadParameter(GetSubtitleBitmap(start + i), start + i, _compareBitmaps, bw, noOfThreads, (int)numericUpDownPixelsIsSpace.Value, checkBoxRightToLeft.Checked, (float)numericUpDownMaxErrorPct.Value, _compareDoc);
|
||||||
bw.DoWork += ImageCompareThreadDoWork;
|
bw.DoWork += ImageCompareThreadDoWork;
|
||||||
|
Loading…
Reference in New Issue
Block a user