diff --git a/利乐包装OCR/App.config b/利乐包装OCR/App.config
index 18f8340..e96c4c0 100644
--- a/利乐包装OCR/App.config
+++ b/利乐包装OCR/App.config
@@ -7,15 +7,15 @@
-
+
-
+
-
+
@@ -35,7 +35,15 @@
-
+
+
+
+
+
+
+
+
+
diff --git a/利乐包装OCR/Form1.cs b/利乐包装OCR/Form1.cs
index ebf36ba..1fdd194 100644
--- a/利乐包装OCR/Form1.cs
+++ b/利乐包装OCR/Form1.cs
@@ -45,9 +45,6 @@ namespace TetraPackOCR
{
public Form1()
{
- double a = CogMisc.RadToDeg(0.0273672);
- double r1 = Math.Cos((a * Math.PI) / 180);
- double r2 = Math.Sin((a * Math.PI) / 180);
InitializeComponent();
LogInit();
}
@@ -149,8 +146,8 @@ namespace TetraPackOCR
log.Info("软件正在加载...");
Action action = (() =>
{
- //InitializeCamer1();
- //InitializeCamer2();
+ InitializeCamer1();
+ InitializeCamer2();
InitializePaddleOCR();
myJobManager1 = CogSerializer.LoadObjectFromFile(vppdetFile) as CogJobManager;
myJobManager2 = CogSerializer.LoadObjectFromFile(vppocrFile) as CogJobManager;
diff --git a/利乐包装OCR/TetraParkOCR.csproj b/利乐包装OCR/TetraParkOCR.csproj
index f577c79..2a846cd 100644
--- a/利乐包装OCR/TetraParkOCR.csproj
+++ b/利乐包装OCR/TetraParkOCR.csproj
@@ -1,5 +1,6 @@
+
Debug
@@ -101,6 +102,9 @@
..\packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll
+
+ ..\packages\BouncyCastle.Cryptography.2.7.0-beta.98\lib\net461\BouncyCastle.Cryptography.dll
+
dll\CLIDelegate.dll
@@ -140,20 +144,23 @@
False
dll\Cognex.VisionPro.ToolGroup.dll
-
- ..\packages\Enums.NET.4.0.0\lib\net45\Enums.NET.dll
+
+ ..\packages\Enums.NET.5.0.0\lib\net461\Enums.NET.dll
-
- ..\packages\EPPlus.7.0.0-preview1\lib\net462\EPPlus.dll
+
+ ..\packages\EPPlus.8.2.1\lib\net462\EPPlus.dll
-
- ..\packages\EPPlus.Interfaces.6.1.1\lib\net462\EPPlus.Interfaces.dll
+
+ ..\packages\EPPlus.Interfaces.8.1.0\lib\net462\EPPlus.Interfaces.dll
-
- ..\packages\EPPlus.System.Drawing.6.1.1\lib\net462\EPPlus.System.Drawing.dll
+
+ ..\packages\EPPlus.System.Drawing.8.1.0\lib\net462\EPPlus.System.Drawing.dll
-
- ..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll
+
+ ..\packages\ExtendedNumerics.BigDecimal.3001.1.0.233\lib\net472\ExtendedNumerics.BigDecimal.dll
+
+
+ ..\packages\SharpZipLib.1.4.2\lib\netstandard2.0\ICSharpCode.SharpZipLib.dll
False
@@ -162,32 +169,38 @@
dll\LogShowLib.dll
-
- ..\packages\MathNet.Numerics.Signed.4.15.0\lib\net461\MathNet.Numerics.dll
+
+ ..\packages\MathNet.Numerics.Signed.5.0.0\lib\net461\MathNet.Numerics.dll
-
- ..\packages\Microsoft.IO.RecyclableMemoryStream.2.2.0\lib\net462\Microsoft.IO.RecyclableMemoryStream.dll
+
+ ..\packages\Microsoft.Bcl.Cryptography.10.0.0-rc.2.25502.107\lib\net462\Microsoft.Bcl.Cryptography.dll
-
- ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll
+
+ ..\packages\Microsoft.IO.RecyclableMemoryStream.3.0.1\lib\netstandard2.0\Microsoft.IO.RecyclableMemoryStream.dll
-
- ..\packages\NPOI.2.6.0\lib\net472\NPOI.dll
+
+ ..\packages\Newtonsoft.Json.13.0.4\lib\net45\Newtonsoft.Json.dll
-
- ..\packages\NPOI.2.6.0\lib\net472\NPOI.OOXML.dll
+
+ ..\packages\NPOI.2.7.5\lib\net472\NPOI.Core.dll
-
- ..\packages\NPOI.2.6.0\lib\net472\NPOI.OpenXml4Net.dll
+
+ ..\packages\NPOI.2.7.5\lib\net472\NPOI.OOXML.dll
-
- ..\packages\NPOI.2.6.0\lib\net472\NPOI.OpenXmlFormats.dll
+
+ ..\packages\NPOI.2.7.5\lib\net472\NPOI.OpenXml4Net.dll
+
+
+ ..\packages\NPOI.2.7.5\lib\net472\NPOI.OpenXmlFormats.dll
+
+
+ ..\packages\NSax.1.0.2\lib\net472\NSax.dll
- ..\packages\OpenCvSharp4.4.8.0.20230708\lib\netstandard2.0\OpenCvSharp.dll
+ ..\packages\OpenCvSharp4.4.11.0.20250507\lib\netstandard2.0\OpenCvSharp.dll
-
- ..\packages\PaddleOCRSharp.3.1.0\lib\net472\PaddleOCRSharp.dll
+
+ ..\packages\PaddleOCRSharp.5.1.0\lib\net47\PaddleOCRSharp.dll
@@ -196,18 +209,21 @@
- ..\packages\SixLabors.Fonts.1.0.0-beta19\lib\netstandard2.0\SixLabors.Fonts.dll
-
-
- ..\packages\SixLabors.ImageSharp.2.1.3\lib\net472\SixLabors.ImageSharp.dll
+ ..\packages\SixLabors.Fonts.1.0.1\lib\netstandard2.0\SixLabors.Fonts.dll
-
- ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll
+
+ ..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll
+
+
+ ..\packages\System.ComponentModel.Annotations.5.0.0\lib\net461\System.ComponentModel.Annotations.dll
+
+ ..\packages\System.Formats.Asn1.10.0.0-rc.2.25502.107\lib\net462\System.Formats.Asn1.dll
+
..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll
True
@@ -223,24 +239,27 @@
True
True
-
- ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll
+
+ ..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll
-
- ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll
+
+ ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll
-
- ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll
+
+ ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll
-
- ..\packages\System.Text.Encoding.CodePages.5.0.0\lib\net461\System.Text.Encoding.CodePages.dll
+
+ ..\packages\System.Security.Cryptography.Xml.10.0.0-rc.2.25502.107\lib\net462\System.Security.Cryptography.Xml.dll
+
+
+ ..\packages\System.Text.Encoding.CodePages.10.0.0-rc.2.25502.107\lib\net462\System.Text.Encoding.CodePages.dll
-
- ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll
+
+ ..\packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll
@@ -257,6 +276,9 @@
+
+ ..\packages\ZString.2.6.0\lib\netstandard2.0\ZString.dll
+
@@ -315,11 +337,16 @@
-
这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/利乐包装OCR/packages.config b/利乐包装OCR/packages.config
index 5aa5d36..246c8fb 100644
--- a/利乐包装OCR/packages.config
+++ b/利乐包装OCR/packages.config
@@ -1,27 +1,37 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
-
+
+
\ No newline at end of file