cyanfish/naps2
1
1
Fork 0
mirror of https://github.com/cyanfish/naps2.git synced 2024-08-16 10:40:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Parallel OCR WIP

Browse Source
This commit is contained in:
Ben Olden-Cooligan 2016-05-24 23:00:00 -04:00
parent 11cfbbdd2a
commit fcc0399e23
3 changed files with 52 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
NAPS2.Core/ImportExport/Pdf/PdfSharpExporter.cs
View File

@ -23,6 +23,8 @@ using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using NAPS2.Ocr;
using NAPS2.Scan.Images;
using NAPS2.Util;
@ -74,15 +76,30 @@ namespace NAPS2.ImportExport.Pdf
document.SecuritySettings.PermitPrint = settings.Encryption.AllowPrinting;
}
int i = 0;
foreach (ScannedImage scannedImage in images)
var imageList = images.ToList();
var pageList = imageList.Select(x => document.AddPage()).ToList();
double maxImageSizeMB = imageList.Select(x => x.Size / 1048576.0).Max();
double memoryLimitMB = Environment.Is64BitOperatingSystem ? 3000 : 1000;
int maxThreads = (int)Math.Floor(memoryLimitMB / (maxImageSizeMB * 4));
int progress = 0;
Parallel.For(0, imageList.Count, new ParallelOptions { MaxDegreeOfParallelism = maxThreads }, (i, loop) =>
{
using (Stream stream = scannedImage.GetImageStream())
if (!progressCallback(progress))
{
loop.Stop();
return;
}
using (Stream stream = imageList[i].GetImageStream())
using (var img = new Bitmap(stream))
{
if (!progressCallback(i))
if (!progressCallback(progress))
{
return false;
loop.Stop();
return;
}
OcrResult ocrResult = null;
@ -98,32 +115,41 @@ namespace NAPS2.ImportExport.Pdf
}
}
if (!progressCallback(progress))
{
loop.Stop();
return;
}
float hAdjust = 72 / img.HorizontalResolution;
float vAdjust = 72 / img.VerticalResolution;
double realWidth = img.Width * hAdjust;
double realHeight = img.Height * vAdjust;
PdfPage newPage = document.AddPage();
newPage.Width = (int)realWidth;
newPage.Height = (int)realHeight;
using (XGraphics gfx = XGraphics.FromPdfPage(newPage))
lock (document)
{
if (ocrResult != null)
PdfPage newPage = pageList[i];
newPage.Width = (int)realWidth;
newPage.Height = (int)realHeight;
using (XGraphics gfx = XGraphics.FromPdfPage(newPage))
{
var tf = new XTextFormatter(gfx);
foreach (var element in ocrResult.Elements)
if (ocrResult != null)
{
var adjustedBounds = AdjustBounds(element.Bounds, hAdjust, vAdjust);
var adjustedFontSize = CalculateFontSize(element.Text, adjustedBounds, gfx);
var font = new XFont("Times New Roman", adjustedFontSize, XFontStyle.Regular,
new XPdfFontOptions(PdfFontEncoding.Unicode));
tf.DrawString(element.Text, font, XBrushes.Transparent, adjustedBounds);
var tf = new XTextFormatter(gfx);
foreach (var element in ocrResult.Elements)
{
var adjustedBounds = AdjustBounds(element.Bounds, hAdjust, vAdjust);
var adjustedFontSize = CalculateFontSize(element.Text, adjustedBounds, gfx);
var font = new XFont("Times New Roman", adjustedFontSize, XFontStyle.Regular,
new XPdfFontOptions(PdfFontEncoding.Unicode));
tf.DrawString(element.Text, font, XBrushes.Transparent, adjustedBounds);
}
}
gfx.DrawImage(img, 0, 0, (int)realWidth, (int)realHeight);
}
gfx.DrawImage(img, 0, 0, (int)realWidth, (int)realHeight);
}
i++;
Interlocked.Increment(ref progress);
}
}
});
PathHelper.EnsureParentDirExists(path);
document.Save(path);
return true;

5
NAPS2.Core/Scan/Images/ScannedImage.cs
View File

@ -72,6 +72,11 @@ namespace NAPS2.Scan.Images
}
}
public long Size
{
get { return new FileInfo(recoveryImage.FilePath).Length; }
}
public Bitmap GetImage()
{
var bitmap = new Bitmap(recoveryImage.FilePath);

1
NAPS2.sln.DotSettings
View File

@ -1,4 +1,5 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MB/@EntryIndexedValue">MB</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Constants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>