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

Remember last "Binary image compare db"

Browse Source
This commit is contained in:
niksedk 2016-01-15 23:30:27 +01:00
parent e2b19c42cf
commit 83978d06a7
3 changed files with 94 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libse/Settings.cs
View File

@ -730,6 +730,7 @@ namespace Nikse.SubtitleEdit.Core
public int LineOcrXOrMorePixelsMakesSpace { get; set; }
public int LineOcrMinLineHeight { get; set; }
public int LineOcrMaxLineHeight { get; set; }
public string LastBinaryImageCompareDb { get; set; }
public VobSubOcrSettings()
{
@ -2240,6 +2241,9 @@ namespace Nikse.SubtitleEdit.Core
subNode = node.SelectSingleNode("LineOcrMaxLineHeight");
if (subNode != null)
settings.VobSubOcr.LineOcrMaxLineHeight = Convert.ToInt32(subNode.InnerText);
subNode = node.SelectSingleNode("LastBinaryImageCompareDb");
if (subNode != null)
settings.VobSubOcr.LastBinaryImageCompareDb = subNode.InnerText;
foreach (XmlNode listNode in doc.DocumentElement.SelectNodes("MultipleSearchAndReplaceList/MultipleSearchAndReplaceItem"))
{
@ -3104,6 +3108,7 @@ namespace Nikse.SubtitleEdit.Core
textWriter.WriteElementString("LineOcrXOrMorePixelsMakesSpace", settings.VobSubOcr.LineOcrXOrMorePixelsMakesSpace.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("LineOcrMinLineHeight", settings.VobSubOcr.LineOcrMinLineHeight.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("LineOcrMaxLineHeight", settings.VobSubOcr.LineOcrMaxLineHeight.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("LastBinaryImageCompareDb", settings.VobSubOcr.LastBinaryImageCompareDb);
textWriter.WriteEndElement();
textWriter.WriteStartElement("MultipleSearchAndReplaceList", string.Empty);

148
src/Forms/VobSubOcr.Designer.cs generated
View File

@ -91,12 +91,6 @@ namespace Nikse.SubtitleEdit.Forms
this.tabControlLogs = new System.Windows.Forms.TabControl();
this.contextMenuStripAllFixes = new System.Windows.Forms.ContextMenuStrip(this.components);
this.toolStripMenuItemClearFixes = new System.Windows.Forms.ToolStripMenuItem();
this.tabPageAllFixes = new System.Windows.Forms.TabPage();
this.listBoxLog = new System.Windows.Forms.ListBox();
this.tabPageSuggestions = new System.Windows.Forms.TabPage();
this.listBoxLogSuggestions = new System.Windows.Forms.ListBox();
this.contextMenuStripGuessesUsed = new System.Windows.Forms.ContextMenuStrip(this.components);
this.toolStripMenuItemClearGuesses = new System.Windows.Forms.ToolStripMenuItem();
this.tabPageUnknownWords = new System.Windows.Forms.TabPage();
this.buttonGoogleIt = new System.Windows.Forms.Button();
this.buttonAddToOcrReplaceList = new System.Windows.Forms.Button();
@ -105,6 +99,12 @@ namespace Nikse.SubtitleEdit.Forms
this.listBoxUnknownWords = new System.Windows.Forms.ListBox();
this.contextMenuStripUnknownWords = new System.Windows.Forms.ContextMenuStrip(this.components);
this.clearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tabPageAllFixes = new System.Windows.Forms.TabPage();
this.listBoxLog = new System.Windows.Forms.ListBox();
this.tabPageSuggestions = new System.Windows.Forms.TabPage();
this.listBoxLogSuggestions = new System.Windows.Forms.ListBox();
this.contextMenuStripGuessesUsed = new System.Windows.Forms.ContextMenuStrip(this.components);
this.toolStripMenuItemClearGuesses = new System.Windows.Forms.ToolStripMenuItem();
this.checkBoxPromptForUnknownWords = new System.Windows.Forms.CheckBox();
this.checkBoxAutoBreakLines = new System.Windows.Forms.CheckBox();
this.labelDictionaryLoaded = new System.Windows.Forms.Label();
@ -153,11 +153,11 @@ namespace Nikse.SubtitleEdit.Forms
this.groupBoxOcrAutoFix.SuspendLayout();
this.tabControlLogs.SuspendLayout();
this.contextMenuStripAllFixes.SuspendLayout();
this.tabPageUnknownWords.SuspendLayout();
this.contextMenuStripUnknownWords.SuspendLayout();
this.tabPageAllFixes.SuspendLayout();
this.tabPageSuggestions.SuspendLayout();
this.contextMenuStripGuessesUsed.SuspendLayout();
this.tabPageUnknownWords.SuspendLayout();
this.contextMenuStripUnknownWords.SuspendLayout();
this.groupBoxImagePalette.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxBackground)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxEmphasis2)).BeginInit();
@ -402,10 +402,10 @@ namespace Nikse.SubtitleEdit.Forms
// groupBoxOcrMethod
//
this.groupBoxOcrMethod.Controls.Add(this.comboBoxOcrMethod);
this.groupBoxOcrMethod.Controls.Add(this.groupBoxNOCR);
this.groupBoxOcrMethod.Controls.Add(this.groupBoxImageCompareMethod);
this.groupBoxOcrMethod.Controls.Add(this.GroupBoxTesseractMethod);
this.groupBoxOcrMethod.Controls.Add(this.groupBoxModiMethod);
this.groupBoxOcrMethod.Controls.Add(this.groupBoxNOCR);
this.groupBoxOcrMethod.Location = new System.Drawing.Point(13, 5);
this.groupBoxOcrMethod.Name = "groupBoxOcrMethod";
this.groupBoxOcrMethod.Size = new System.Drawing.Size(392, 192);
@ -954,69 +954,6 @@ namespace Nikse.SubtitleEdit.Forms
this.toolStripMenuItemClearFixes.Text = "Clear";
this.toolStripMenuItemClearFixes.Click += new System.EventHandler(this.toolStripMenuItemClearFixes_Click);
//
// tabPageAllFixes
//
this.tabPageAllFixes.Controls.Add(this.listBoxLog);
this.tabPageAllFixes.Location = new System.Drawing.Point(4, 22);
this.tabPageAllFixes.Name = "tabPageAllFixes";
this.tabPageAllFixes.Padding = new System.Windows.Forms.Padding(3);
this.tabPageAllFixes.Size = new System.Drawing.Size(375, 155);
this.tabPageAllFixes.TabIndex = 0;
this.tabPageAllFixes.Text = "All fixes";
this.tabPageAllFixes.UseVisualStyleBackColor = true;
//
// listBoxLog
//
this.listBoxLog.Dock = System.Windows.Forms.DockStyle.Fill;
this.listBoxLog.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.listBoxLog.FormattingEnabled = true;
this.listBoxLog.HorizontalScrollbar = true;
this.listBoxLog.Location = new System.Drawing.Point(3, 3);
this.listBoxLog.Name = "listBoxLog";
this.listBoxLog.Size = new System.Drawing.Size(369, 149);
this.listBoxLog.TabIndex = 0;
this.listBoxLog.SelectedIndexChanged += new System.EventHandler(this.ListBoxLogSelectedIndexChanged);
this.listBoxLog.KeyDown += new System.Windows.Forms.KeyEventHandler(this.listBoxCopyToClipboard_KeyDown);
//
// tabPageSuggestions
//
this.tabPageSuggestions.Controls.Add(this.listBoxLogSuggestions);
this.tabPageSuggestions.Location = new System.Drawing.Point(4, 22);
this.tabPageSuggestions.Name = "tabPageSuggestions";
this.tabPageSuggestions.Padding = new System.Windows.Forms.Padding(3);
this.tabPageSuggestions.Size = new System.Drawing.Size(375, 155);
this.tabPageSuggestions.TabIndex = 1;
this.tabPageSuggestions.Text = "Guesses used";
this.tabPageSuggestions.UseVisualStyleBackColor = true;
//
// listBoxLogSuggestions
//
this.listBoxLogSuggestions.ContextMenuStrip = this.contextMenuStripGuessesUsed;
this.listBoxLogSuggestions.Dock = System.Windows.Forms.DockStyle.Fill;
this.listBoxLogSuggestions.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.listBoxLogSuggestions.FormattingEnabled = true;
this.listBoxLogSuggestions.HorizontalScrollbar = true;
this.listBoxLogSuggestions.Location = new System.Drawing.Point(3, 3);
this.listBoxLogSuggestions.Name = "listBoxLogSuggestions";
this.listBoxLogSuggestions.Size = new System.Drawing.Size(369, 149);
this.listBoxLogSuggestions.TabIndex = 40;
this.listBoxLogSuggestions.SelectedIndexChanged += new System.EventHandler(this.ListBoxLogSelectedIndexChanged);
this.listBoxLogSuggestions.KeyDown += new System.Windows.Forms.KeyEventHandler(this.listBoxCopyToClipboard_KeyDown);
//
// contextMenuStripGuessesUsed
//
this.contextMenuStripGuessesUsed.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripMenuItemClearGuesses});
this.contextMenuStripGuessesUsed.Name = "contextMenuStripUnknownWords";
this.contextMenuStripGuessesUsed.Size = new System.Drawing.Size(102, 26);
//
// toolStripMenuItemClearGuesses
//
this.toolStripMenuItemClearGuesses.Name = "toolStripMenuItemClearGuesses";
this.toolStripMenuItemClearGuesses.Size = new System.Drawing.Size(101, 22);
this.toolStripMenuItemClearGuesses.Text = "Clear";
this.toolStripMenuItemClearGuesses.Click += new System.EventHandler(this.toolStripMenuItemClearGuesses_Click);
//
// tabPageUnknownWords
//
this.tabPageUnknownWords.Controls.Add(this.buttonGoogleIt);
@ -1109,6 +1046,69 @@ namespace Nikse.SubtitleEdit.Forms
this.clearToolStripMenuItem.Text = "Clear";
this.clearToolStripMenuItem.Click += new System.EventHandler(this.clearToolStripMenuItem_Click);
//
// tabPageAllFixes
//
this.tabPageAllFixes.Controls.Add(this.listBoxLog);
this.tabPageAllFixes.Location = new System.Drawing.Point(4, 22);
this.tabPageAllFixes.Name = "tabPageAllFixes";
this.tabPageAllFixes.Padding = new System.Windows.Forms.Padding(3);
this.tabPageAllFixes.Size = new System.Drawing.Size(375, 155);
this.tabPageAllFixes.TabIndex = 0;
this.tabPageAllFixes.Text = "All fixes";
this.tabPageAllFixes.UseVisualStyleBackColor = true;
//
// listBoxLog
//
this.listBoxLog.Dock = System.Windows.Forms.DockStyle.Fill;
this.listBoxLog.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.listBoxLog.FormattingEnabled = true;
this.listBoxLog.HorizontalScrollbar = true;
this.listBoxLog.Location = new System.Drawing.Point(3, 3);
this.listBoxLog.Name = "listBoxLog";
this.listBoxLog.Size = new System.Drawing.Size(369, 149);
this.listBoxLog.TabIndex = 0;
this.listBoxLog.SelectedIndexChanged += new System.EventHandler(this.ListBoxLogSelectedIndexChanged);
this.listBoxLog.KeyDown += new System.Windows.Forms.KeyEventHandler(this.listBoxCopyToClipboard_KeyDown);
//
// tabPageSuggestions
//
this.tabPageSuggestions.Controls.Add(this.listBoxLogSuggestions);
this.tabPageSuggestions.Location = new System.Drawing.Point(4, 22);
this.tabPageSuggestions.Name = "tabPageSuggestions";
this.tabPageSuggestions.Padding = new System.Windows.Forms.Padding(3);
this.tabPageSuggestions.Size = new System.Drawing.Size(375, 155);
this.tabPageSuggestions.TabIndex = 1;
this.tabPageSuggestions.Text = "Guesses used";
this.tabPageSuggestions.UseVisualStyleBackColor = true;
//
// listBoxLogSuggestions
//
this.listBoxLogSuggestions.ContextMenuStrip = this.contextMenuStripGuessesUsed;
this.listBoxLogSuggestions.Dock = System.Windows.Forms.DockStyle.Fill;
this.listBoxLogSuggestions.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.listBoxLogSuggestions.FormattingEnabled = true;
this.listBoxLogSuggestions.HorizontalScrollbar = true;
this.listBoxLogSuggestions.Location = new System.Drawing.Point(3, 3);
this.listBoxLogSuggestions.Name = "listBoxLogSuggestions";
this.listBoxLogSuggestions.Size = new System.Drawing.Size(369, 149);
this.listBoxLogSuggestions.TabIndex = 40;
this.listBoxLogSuggestions.SelectedIndexChanged += new System.EventHandler(this.ListBoxLogSelectedIndexChanged);
this.listBoxLogSuggestions.KeyDown += new System.Windows.Forms.KeyEventHandler(this.listBoxCopyToClipboard_KeyDown);
//
// contextMenuStripGuessesUsed
//
this.contextMenuStripGuessesUsed.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripMenuItemClearGuesses});
this.contextMenuStripGuessesUsed.Name = "contextMenuStripUnknownWords";
this.contextMenuStripGuessesUsed.Size = new System.Drawing.Size(102, 26);
//
// toolStripMenuItemClearGuesses
//
this.toolStripMenuItemClearGuesses.Name = "toolStripMenuItemClearGuesses";
this.toolStripMenuItemClearGuesses.Size = new System.Drawing.Size(101, 22);
this.toolStripMenuItemClearGuesses.Text = "Clear";
this.toolStripMenuItemClearGuesses.Click += new System.EventHandler(this.toolStripMenuItemClearGuesses_Click);
//
// checkBoxPromptForUnknownWords
//
this.checkBoxPromptForUnknownWords.AutoSize = true;
@ -1543,11 +1543,11 @@ namespace Nikse.SubtitleEdit.Forms
this.groupBoxOcrAutoFix.PerformLayout();
this.tabControlLogs.ResumeLayout(false);
this.contextMenuStripAllFixes.ResumeLayout(false);
this.tabPageUnknownWords.ResumeLayout(false);
this.contextMenuStripUnknownWords.ResumeLayout(false);
this.tabPageAllFixes.ResumeLayout(false);
this.tabPageSuggestions.ResumeLayout(false);
this.contextMenuStripGuessesUsed.ResumeLayout(false);
this.tabPageUnknownWords.ResumeLayout(false);
this.contextMenuStripUnknownWords.ResumeLayout(false);
this.groupBoxImagePalette.ResumeLayout(false);
this.groupBoxImagePalette.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxBackground)).EndInit();

16
src/Forms/VobSubOcr.cs
View File

@ -805,7 +805,12 @@ namespace Nikse.SubtitleEdit.Forms
foreach (string dir in Directory.GetFiles(characterDatabasePath, "*.db"))
{
comboBoxCharacterDatabase.Items.Add(Path.GetFileNameWithoutExtension(dir));
string s = Path.GetFileNameWithoutExtension(dir);
comboBoxCharacterDatabase.Items.Add(s);
if (s == Configuration.Settings.VobSubOcr.LastBinaryImageCompareDb)
{
comboBoxCharacterDatabase.SelectedIndex = comboBoxCharacterDatabase.Items.Count - 1;
}
}
if (comboBoxCharacterDatabase.Items.Count == 0)
@ -5497,7 +5502,7 @@ namespace Nikse.SubtitleEdit.Forms
}
}
// public List<double> _elapseds = new List<double>();
// public List<double> _elapseds = new List<double>();
private bool MainLoop(int max, int i)
{
if (i >= max)
@ -5533,7 +5538,7 @@ namespace Nikse.SubtitleEdit.Forms
subtitleListView1.Items[j].EnsureVisible();
string text = string.Empty;
// var sw = Stopwatch.StartNew();
// var sw = Stopwatch.StartNew();
if (_ocrMethodIndex == _ocrMethodTesseract)
text = OcrViaTesseract(bmp, i);
else if (_ocrMethodIndex == _ocrMethodImageCompare)
@ -7906,6 +7911,11 @@ namespace Nikse.SubtitleEdit.Forms
Configuration.Settings.VobSubOcr.AutoBreakSubtitleIfMoreThanTwoLines = checkBoxAutoBreakLines.Checked;
Configuration.Settings.VobSubOcr.LineOcrDraw = checkBoxNOcrCorrect.Checked;
Configuration.Settings.VobSubOcr.LineOcrAdvancedItalic = checkBoxNOcrItalic.Checked;
if (_ocrMethodIndex == _ocrMethodBinaryImageCompare)
{
Configuration.Settings.VobSubOcr.LastBinaryImageCompareDb = comboBoxCharacterDatabase.SelectedItem.ToString();
}
if (_bluRaySubtitlesOriginal != null)
Configuration.Settings.VobSubOcr.BlurayAllowDifferenceInPercent = (double)numericUpDownMaxErrorPct.Value;