Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-28 06:52:35 +01:00
Code Issues Projects Releases Wiki Activity

Fix slow selection/deselection in ocr listview

Browse Source
This commit is contained in:
niksedk 2019-08-30 05:20:53 +02:00
parent 73c731d4bc
commit 84d0dce24a
1 changed files with 59 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/Forms/Ocr/VobSubOcr.cs
View File

@ -6516,12 +6516,54 @@ namespace Nikse.SubtitleEdit.Forms.Ocr
SetButtonsEnabledAfterOcrDone();
}
private void ChangeDelayTimerTick(object sender, EventArgs e)
{
_changeDelayTimer.Enabled = false;
_changeDelayTimer.Dispose();
_changeDelayTimer = null;
_slvSelIdxChangedTicks = 0;
if (_slvSelIdx.Key == _slvSelIdxChangedTicks)
{
_selectedIndex = _slvSelIdx.Value;
if (_selectedIndex < 0)
{
textBoxCurrentText.Text = string.Empty;
return;
}
SelectedIndexChangedAction();
}
}
private long _slvSelIdxChangedTicks;
private Timer _changeDelayTimer = null;
private KeyValuePair<long, int> _slvSelIdx;
private void SubtitleListView1SelectedIndexChanged(object sender, EventArgs e)
{
if (subtitleListView1.SelectedItems.Count > 0)
{
try
{
if (subtitleListView1.SelectedItems.Count > 1)
{
if (DateTime.UtcNow.Ticks - _slvSelIdxChangedTicks < 100000)
{
_slvSelIdx = new KeyValuePair<long, int>(_slvSelIdxChangedTicks, subtitleListView1.SelectedItems[0].Index);
if (_changeDelayTimer == null)
{
_changeDelayTimer = new Timer();
_changeDelayTimer.Tick += ChangeDelayTimerTick;
_changeDelayTimer.Interval = 200;
}
else
{
_changeDelayTimer.Stop();
_changeDelayTimer.Start();
}
_slvSelIdxChangedTicks = DateTime.UtcNow.Ticks;
return;
}
_slvSelIdxChangedTicks = DateTime.UtcNow.Ticks;
}
_selectedIndex = subtitleListView1.SelectedItems[0].Index;
}
catch
@ -6529,19 +6571,7 @@ namespace Nikse.SubtitleEdit.Forms.Ocr
return;
}
textBoxCurrentText.Text = _subtitle.Paragraphs[_selectedIndex].Text;
if (_mainOcrRunning && _mainOcrBitmap != null)
{
ShowSubtitleImage(_selectedIndex, _mainOcrBitmap);
}
else
{
// TODO: Refactor ShowSubtitleImage
var bmp = ShowSubtitleImage(_selectedIndex);
bmp.Dispose();
}
numericUpDownStartNumber.Value = _selectedIndex + 1;
SelectedIndexChangedAction();
}
else
{
@ -6550,6 +6580,22 @@ namespace Nikse.SubtitleEdit.Forms.Ocr
}
}
private void SelectedIndexChangedAction()
{
textBoxCurrentText.Text = _subtitle.Paragraphs[_selectedIndex].Text;
if (_mainOcrRunning && _mainOcrBitmap != null)
{
ShowSubtitleImage(_selectedIndex, _mainOcrBitmap);
}
else
{
var bmp = ShowSubtitleImage(_selectedIndex);
bmp.Dispose();
}
numericUpDownStartNumber.Value = _selectedIndex + 1;
}
private void TextBoxCurrentTextTextChanged(object sender, EventArgs e)
{
if (_selectedIndex >= 0)