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

Image compare - character inspect now works with new db

Browse Source 
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@2080 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2013-09-12 21:09:30 +00:00
parent 1905e147d5
commit 449ae08e2b
2 changed files with 153 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
src/Forms/VobSubOcr.cs
View File

@ -826,25 +826,6 @@ namespace Nikse.SubtitleEdit.Forms
}
}
}
// foreach (string bmpFileName in Directory.GetFiles(path, "*.mbmp"))
// {
// string name = Path.GetFileNameWithoutExtension(bmpFileName);
// XmlNode node = _compareDoc.DocumentElement.SelectSingleNode("FileName[.='" + name + "']");
// if (node != null)
// {
// bool isItalic = node.Attributes["Italic"] != null;
// int expandCount = 0;
// if (node.Attributes["Expand"] != null)
// {
// if (!int.TryParse(node.Attributes["Expand"].InnerText, out expandCount))
// expandCount = 0;
// }
// ManagedBitmap mbmp = new ManagedBitmap(bmpFileName);
// _compareBitmaps.Add(new CompareItem(mbmp, name, isItalic, expandCount));
// }
// }
}
private void DisposeImageCompareBitmaps()
@ -2404,6 +2385,34 @@ namespace Nikse.SubtitleEdit.Forms
int minForeColorMatch = 90;
if (smallestDifference > 0)
{
index = 0;
foreach (CompareItem compareItem in _compareBitmaps)
{
if (compareItem.Bitmap.Width == target.Width && compareItem.Bitmap.Height == target.Height) // precise math in size
{
if (compareItem.NumberOfForegroundColors < 1)
compareItem.NumberOfForegroundColors = CalculateNumberOfForegroundColors(compareItem.Bitmap);
if (Math.Abs(compareItem.NumberOfForegroundColors - numberOfForegroundColors) < 3)
{
int dif = ImageSplitter.IsBitmapsAlike(compareItem.Bitmap, target);
if (dif < smallestDifference)
{
smallestDifference = dif;
smallestIndex = index;
if (dif < 0.4)
{
break; // foreach ending
}
}
}
}
index++;
}
}
if (smallestDifference > 0.4)
{
index = 0;
foreach (CompareItem compareItem in _compareBitmaps)
@ -2433,7 +2442,7 @@ namespace Nikse.SubtitleEdit.Forms
if (target.Width > 5) // for other than very narrow letter (like 'i' and 'l' and 'I'), try more sizes
{
if (smallestDifference > 0)
if (smallestDifference > 0.5)
{
index = 0;
foreach (CompareItem compareItem in _compareBitmaps)
@ -2459,7 +2468,7 @@ namespace Nikse.SubtitleEdit.Forms
}
}
if (smallestDifference > 0)
if (smallestDifference > 0.5)
{
index = 0;
foreach (CompareItem compareItem in _compareBitmaps)
@ -2485,7 +2494,7 @@ namespace Nikse.SubtitleEdit.Forms
}
}
if (smallestDifference > 0)
if (smallestDifference > 0.5)
{
index = 0;
foreach (CompareItem compareItem in _compareBitmaps)
@ -2511,7 +2520,7 @@ namespace Nikse.SubtitleEdit.Forms
}
}
if (smallestDifference > 0)
if (smallestDifference > 1)
{
index = 0;
foreach (CompareItem compareItem in _compareBitmaps)
@ -2537,7 +2546,7 @@ namespace Nikse.SubtitleEdit.Forms
}
}
if (smallestDifference > 0)
if (smallestDifference > 1)
{
index = 0;
foreach (CompareItem compareItem in _compareBitmaps)
@ -2563,7 +2572,7 @@ namespace Nikse.SubtitleEdit.Forms
}
}
if (smallestDifference > 0)
if (smallestDifference > 1)
{
index = 0;
foreach (CompareItem compareItem in _compareBitmaps)
@ -2589,7 +2598,7 @@ namespace Nikse.SubtitleEdit.Forms
}
}
if (smallestDifference > 0 && target.Width > 10)
if (smallestDifference > 1 && target.Width > 10)
{
index = 0;
foreach (CompareItem compareItem in _compareBitmaps)
@ -2615,7 +2624,7 @@ namespace Nikse.SubtitleEdit.Forms
}
}
if (smallestDifference > 0 && target.Width > 12)
if (smallestDifference > 1 && target.Width > 12)
{
index = 0;
foreach (CompareItem compareItem in _compareBitmaps)
@ -2641,7 +2650,7 @@ namespace Nikse.SubtitleEdit.Forms
}
}
if (smallestDifference > 0 && target.Width > 12)
if (smallestDifference > 1 && target.Width > 12)
{
index = 0;
foreach (CompareItem compareItem in _compareBitmaps)
@ -2667,7 +2676,7 @@ namespace Nikse.SubtitleEdit.Forms
}
}
if (smallestDifference > 0)
if (smallestDifference > 1)
{
index = 0;
foreach (CompareItem compareItem in _compareBitmaps)
@ -3801,7 +3810,7 @@ namespace Nikse.SubtitleEdit.Forms
}
else
{
NikseBitmap target = new NikseBitmap(item.Bitmap);
var target = new NikseBitmap(item.Bitmap);
int numberOfForegroundColors = CalculateNumberOfForegroundColors(target);
int smallestDifference = 10000;
@ -3817,15 +3826,14 @@ namespace Nikse.SubtitleEdit.Forms
if (compareItem.NumberOfForegroundColors < 1)
compareItem.NumberOfForegroundColors = CalculateNumberOfForegroundColors(compareItem.Bitmap);
if (Math.Abs(compareItem.NumberOfForegroundColors - numberOfForegroundColors) < 40)
if (Math.Abs(compareItem.NumberOfForegroundColors - numberOfForegroundColors) < 30)
{
int dif = ImageSplitter.IsBitmapsAlike(compareItem.Bitmap, target);
if (dif < smallestDifference)
{
smallestDifference = dif;
smallestIndex = index;
if (dif == 0)
if (dif < 0.2)
break; // foreach ending
}
}
@ -3833,7 +3841,34 @@ namespace Nikse.SubtitleEdit.Forms
index++;
}
}
if (smallestDifference > 1)
if (smallestDifference > 1 && target.Width < 55 && target.Width > 5)
{
index = 0;
foreach (CompareItem compareItem in p.CompareBitmaps)
{
if (compareItem.Bitmap.Width == target.Width && compareItem.Bitmap.Height == target.Height + 1)
{
if (compareItem.NumberOfForegroundColors == -1)
compareItem.NumberOfForegroundColors = CalculateNumberOfForegroundColors(compareItem.Bitmap);
if (Math.Abs(compareItem.NumberOfForegroundColors - numberOfForegroundColors) < 50)
{
int dif = ImageSplitter.IsBitmapsAlike(target, compareItem.Bitmap);
if (dif < smallestDifference)
{
smallestDifference = dif;
smallestIndex = index;
if (dif < 0.5)
break; // foreach ending
}
}
}
index++;
}
}
if (smallestDifference > 1 && target.Width < 55 && target.Width > 5)
{
index = 0;
foreach (CompareItem compareItem in p.CompareBitmaps)
@ -3841,16 +3876,22 @@ namespace Nikse.SubtitleEdit.Forms
if (compareItem.Bitmap.Width == target.Width - 1 && compareItem.Bitmap.Height == target.Height ||
compareItem.Bitmap.Width == target.Width - 1 && compareItem.Bitmap.Height == target.Height - 1 ||
compareItem.Bitmap.Width == target.Width && compareItem.Bitmap.Height == target.Height - 1)
{
if (compareItem.NumberOfForegroundColors < 1)
compareItem.NumberOfForegroundColors = CalculateNumberOfForegroundColors(compareItem.Bitmap);
if (Math.Abs(compareItem.NumberOfForegroundColors - numberOfForegroundColors) < 55)
{
int dif = ImageSplitter.IsBitmapsAlike(compareItem.Bitmap, target);
if (dif < smallestDifference)
{
smallestDifference = dif;
smallestIndex = index;
if (dif == 0)
if (dif < 0.5)
break; // foreach ending
}
}
}
index++;
}
}
@ -4121,7 +4162,7 @@ namespace Nikse.SubtitleEdit.Forms
_icThreadsStop = false;
_icThreads = new List<BackgroundWorker>();
_icThreadResults = new string[_subtitle.Paragraphs.Count];
int noOfThreads = Environment.ProcessorCount - 1;
int noOfThreads = Environment.ProcessorCount - 2; // -1 or -2?
if (noOfThreads >= max)
noOfThreads = max - 1;
int start = (int)numericUpDownStartNumber.Value + 5;
@ -4136,9 +4177,6 @@ namespace Nikse.SubtitleEdit.Forms
bw.RunWorkerAsync(p);
}
}
}
else if (comboBoxOcrMethod.SelectedIndex == 3)
{
@ -5313,7 +5351,7 @@ namespace Nikse.SubtitleEdit.Forms
{
_compareDoc = formVobSubEditCharacters.ImageCompareDocument;
string path = Configuration.VobSubCompareFolder + comboBoxCharacterDatabase.SelectedItem + Path.DirectorySeparatorChar;
_compareDoc.Save(path + "CompareDescription.xml");
_compareDoc.Save(path + "Images.xml");
}
Cursor = Cursors.WaitCursor;
LoadImageCompareBitmaps();
@ -6029,7 +6067,7 @@ namespace Nikse.SubtitleEdit.Forms
Cursor = Cursors.WaitCursor;
_compareDoc = inspect.ImageCompareDocument;
string path = Configuration.VobSubCompareFolder + comboBoxCharacterDatabase.SelectedItem + Path.DirectorySeparatorChar;
_compareDoc.Save(path + "CompareDescription.xml");
_compareDoc.Save(path + "Images.xml");
LoadImageCompareBitmaps();
Cursor = Cursors.Default;
}
@ -6043,7 +6081,7 @@ namespace Nikse.SubtitleEdit.Forms
_lastAdditions = formVobSubEditCharacters.Additions;
_compareDoc = formVobSubEditCharacters.ImageCompareDocument;
string path = Configuration.VobSubCompareFolder + comboBoxCharacterDatabase.SelectedItem + Path.DirectorySeparatorChar;
_compareDoc.Save(path + "CompareDescription.xml");
_compareDoc.Save(path + "Images.xml");
}
}

55
src/Forms/VobSubOcrCharacterInspect.cs
View File

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Globalization;
using System.IO;
using System.Windows.Forms;
using System.Xml;
@ -54,10 +55,10 @@ namespace Nikse.SubtitleEdit.Forms
ImageCompareDocument = new XmlDocument();
_directoryPath = Configuration.VobSubCompareFolder + databaseFolderName + Path.DirectorySeparatorChar;
if (!File.Exists(_directoryPath + "CompareDescription.xml"))
if (!File.Exists(_directoryPath + "Images.xml"))
ImageCompareDocument.LoadXml("<OcrBitmaps></OcrBitmaps>");
else
ImageCompareDocument.Load(_directoryPath + "CompareDescription.xml");
ImageCompareDocument.Load(_directoryPath + "Images.xml");
for (int i = 0; i < _matches.Count; i++)
listBoxInspectItems.Items.Add(_matches[i].Text);
@ -81,20 +82,38 @@ namespace Nikse.SubtitleEdit.Forms
var match = _matches[index];
if (!string.IsNullOrEmpty(match.Name))
{
Bitmap bitmap = new Bitmap(1,1);
foreach (XmlNode node in ImageCompareDocument.DocumentElement.ChildNodes)
{
if (node.Attributes["Text"] != null && node.InnerText == match.Name)
{
string text = node.Attributes["Text"].InnerText;
string imageFileName = node.InnerText + ".bmp";
string imageFileName = node.InnerText;
imageFileName = Path.Combine(_directoryPath, imageFileName);
textBoxText.Text = text;
checkBoxItalic.Checked = node.Attributes["Italic"] != null;
Bitmap bitmap = new Bitmap(imageFileName);
string databaseName = Path.Combine(_directoryPath, "Images.db");
using (var f = new FileStream(databaseName, FileMode.Open))
{
try
{
string name = node.InnerText;
int pos = Convert.ToInt32(name);
f.Position = pos;
ManagedBitmap mbmp = new ManagedBitmap(f);
bitmap = mbmp.ToOldBitmap();
pictureBoxCompareBitmap.Image = bitmap;
pictureBoxCompareBitmapDouble.Width = bitmap.Width * 2;
pictureBoxCompareBitmapDouble.Height = bitmap.Height * 2;
pictureBoxCompareBitmapDouble.Image = bitmap;
}
catch (Exception exception)
{
MessageBox.Show(exception.Message);
}
}
try
{
@ -189,14 +208,34 @@ namespace Nikse.SubtitleEdit.Forms
return;
}
XmlNode newNode = ImageCompareDocument.CreateElement("FileName");
XmlNode newNode = ImageCompareDocument.CreateElement("Item");
XmlAttribute text = newNode.OwnerDocument.CreateAttribute("Text");
text.InnerText = textBoxText.Text;
newNode.Attributes.Append(text);
string name = Guid.NewGuid().ToString();
string databaseName = Path.Combine(_directoryPath, "Images.db");
FileStream f;
long pos = 0;
if (!File.Exists(databaseName))
{
using (f = new FileStream(databaseName, FileMode.Create))
{
pos = f.Position;
new ManagedBitmap(pictureBoxInspectItem.Image as Bitmap).AppendToStream(f);
}
}
else
{
using (f = new FileStream(databaseName, FileMode.Append))
{
pos = f.Position;
new ManagedBitmap(pictureBoxInspectItem.Image as Bitmap).AppendToStream(f);
}
}
string name = pos.ToString(CultureInfo.InvariantCulture);
newNode.InnerText = name;
string imageFileName = Path.Combine(_directoryPath, name + ".bmp");
pictureBoxInspectItem.Image.Save(imageFileName, System.Drawing.Imaging.ImageFormat.Bmp);
SetItalic(newNode);
ImageCompareDocument.DocumentElement.AppendChild(newNode);