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

Updated change log + minor ocr fix

Browse Source 
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@2295 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2013-12-08 09:10:11 +00:00
parent 279e3686fa
commit bf002c3565
2 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Changelog.txt
View File

@ -10,6 +10,7 @@
* Now remembers RTL mode - thx FTABoy
* FIXED:
* Fixed bug in "Fix common errors: Remove hyphen" - thx honeybunny
* Fixed bug in "Remove text for HI" issue - thx cipry15
3.3.11 (6th December 2013)

48
src/Forms/VobSubOcr.cs
View File

@ -1354,20 +1354,27 @@ namespace Nikse.SubtitleEdit.Forms
private void ShowSubtitleImage(int index, Bitmap bmp)
{
int numberOfImages = GetSubtitleCount();
if (index < numberOfImages)
try
{
groupBoxSubtitleImage.Text = string.Format(Configuration.Settings.Language.VobSubOcr.SubtitleImageXofY, index + 1, numberOfImages) + " " + bmp.Width + "x" + bmp.Height;
int numberOfImages = GetSubtitleCount();
if (index < numberOfImages)
{
groupBoxSubtitleImage.Text = string.Format(Configuration.Settings.Language.VobSubOcr.SubtitleImageXofY, index + 1, numberOfImages) + " " + bmp.Width + "x" + bmp.Height;
}
else
{
groupBoxSubtitleImage.Text = Configuration.Settings.Language.VobSubOcr.SubtitleImage;
}
Bitmap old = pictureBoxSubtitleImage.Image as Bitmap;
pictureBoxSubtitleImage.Image = bmp.Clone() as Bitmap;
pictureBoxSubtitleImage.Invalidate();
if (old != null)
old.Dispose();
}
else
{
groupBoxSubtitleImage.Text = Configuration.Settings.Language.VobSubOcr.SubtitleImage;
catch
{
// can crash is user is clicking around...
}
Bitmap old = pictureBoxSubtitleImage.Image as Bitmap;
pictureBoxSubtitleImage.Image = bmp.Clone() as Bitmap;
pictureBoxSubtitleImage.Invalidate();
if (old != null)
old.Dispose();
}
private static Point MakePointItalic(Point p, int height, int moveLeftPixels, double unItalicFactor)
@ -5095,7 +5102,13 @@ namespace Nikse.SubtitleEdit.Forms
line = unItalicText.Replace("<i>", string.Empty).Replace("</i>", string.Empty);
if (checkBoxAutoFixCommonErrors.Checked)
{
if (line.Contains("'.") && !textWithOutFixes.Contains("'.") && textWithOutFixes.Contains(":") && !line.EndsWith("'.") && Configuration.Settings.Tools.OcrFixUseHardcodedRules)
{
line = line.Replace("'.", ":");
}
line = _ocrFixEngine.FixOcrErrors(line, index, _lastLine, true, checkBoxGuessUnknownWords.Checked);
}
line = "<i>" + line + "</i>";
}
else
@ -5561,12 +5574,19 @@ namespace Nikse.SubtitleEdit.Forms
{
if (subtitleListView1.SelectedItems.Count > 0)
{
_selectedIndex = subtitleListView1.SelectedItems[0].Index;
try
{
_selectedIndex = subtitleListView1.SelectedItems[0].Index;
}
catch
{
return;
}
textBoxCurrentText.Text = _subtitle.Paragraphs[_selectedIndex].Text;
if (_mainOcrRunning && _mainOcrBitmap != null)
ShowSubtitleImage(subtitleListView1.SelectedItems[0].Index, _mainOcrBitmap);
ShowSubtitleImage(_selectedIndex, _mainOcrBitmap);
else
ShowSubtitleImage(subtitleListView1.SelectedItems[0].Index);
ShowSubtitleImage(_selectedIndex);
numericUpDownStartNumber.Value = _selectedIndex + 1;
}
else