diff --git a/BetterGenshinImpact/Core/Recognition/OCR/engine/OcrUtils.cs b/BetterGenshinImpact/Core/Recognition/OCR/Engine/OcrUtils.cs similarity index 98% rename from BetterGenshinImpact/Core/Recognition/OCR/engine/OcrUtils.cs rename to BetterGenshinImpact/Core/Recognition/OCR/Engine/OcrUtils.cs index 620c7190..f4be7343 100644 --- a/BetterGenshinImpact/Core/Recognition/OCR/engine/OcrUtils.cs +++ b/BetterGenshinImpact/Core/Recognition/OCR/Engine/OcrUtils.cs @@ -2,13 +2,13 @@ using System; using System.Buffers; using System.Collections.Generic; using System.Linq; -using BetterGenshinImpact.Core.Recognition.OCR.engine.data; +using BetterGenshinImpact.Core.Recognition.OCR.Engine.data; using BetterGenshinImpact.Core.Recognition.OpenCv; using Microsoft.ML.OnnxRuntime.Tensors; using OpenCvSharp; using OpenCvSharp.Dnn; -namespace BetterGenshinImpact.Core.Recognition.OCR.engine; +namespace BetterGenshinImpact.Core.Recognition.OCR.Engine; public static class OcrUtils { diff --git a/BetterGenshinImpact/Core/Recognition/OCR/engine/OcrVersionConfig.cs b/BetterGenshinImpact/Core/Recognition/OCR/Engine/OcrVersionConfig.cs similarity index 88% rename from BetterGenshinImpact/Core/Recognition/OCR/engine/OcrVersionConfig.cs rename to BetterGenshinImpact/Core/Recognition/OCR/Engine/OcrVersionConfig.cs index 3e0f5d84..e769bbc1 100644 --- a/BetterGenshinImpact/Core/Recognition/OCR/engine/OcrVersionConfig.cs +++ b/BetterGenshinImpact/Core/Recognition/OCR/Engine/OcrVersionConfig.cs @@ -1,6 +1,6 @@ -using BetterGenshinImpact.Core.Recognition.OCR.engine.data; +using BetterGenshinImpact.Core.Recognition.OCR.Engine.data; -namespace BetterGenshinImpact.Core.Recognition.OCR.engine; +namespace BetterGenshinImpact.Core.Recognition.OCR.Engine; /// /// ppocr的版本配置 diff --git a/BetterGenshinImpact/Core/Recognition/OCR/engine/data/OcrImgMode.cs b/BetterGenshinImpact/Core/Recognition/OCR/Engine/data/OcrImgMode.cs similarity index 61% rename from BetterGenshinImpact/Core/Recognition/OCR/engine/data/OcrImgMode.cs rename to BetterGenshinImpact/Core/Recognition/OCR/Engine/data/OcrImgMode.cs index f89f09b2..9e67ae51 100644 --- a/BetterGenshinImpact/Core/Recognition/OCR/engine/data/OcrImgMode.cs +++ b/BetterGenshinImpact/Core/Recognition/OCR/Engine/data/OcrImgMode.cs @@ -1,4 +1,4 @@ -namespace BetterGenshinImpact.Core.Recognition.OCR.engine.data; +namespace BetterGenshinImpact.Core.Recognition.OCR.Engine.data; /// /// 图像的颜色顺序 diff --git a/BetterGenshinImpact/Core/Recognition/OCR/engine/data/OcrMatOrder.cs b/BetterGenshinImpact/Core/Recognition/OCR/Engine/data/OcrMatOrder.cs similarity index 72% rename from BetterGenshinImpact/Core/Recognition/OCR/engine/data/OcrMatOrder.cs rename to BetterGenshinImpact/Core/Recognition/OCR/Engine/data/OcrMatOrder.cs index 908f5e4b..5acc4ccf 100644 --- a/BetterGenshinImpact/Core/Recognition/OCR/engine/data/OcrMatOrder.cs +++ b/BetterGenshinImpact/Core/Recognition/OCR/Engine/data/OcrMatOrder.cs @@ -1,4 +1,4 @@ -namespace BetterGenshinImpact.Core.Recognition.OCR.engine.data; +namespace BetterGenshinImpact.Core.Recognition.OCR.Engine.data; /// /// Mat的通道顺序 diff --git a/BetterGenshinImpact/Core/Recognition/OCR/engine/data/OcrNormalizeImage.cs b/BetterGenshinImpact/Core/Recognition/OCR/Engine/data/OcrNormalizeImage.cs similarity index 68% rename from BetterGenshinImpact/Core/Recognition/OCR/engine/data/OcrNormalizeImage.cs rename to BetterGenshinImpact/Core/Recognition/OCR/Engine/data/OcrNormalizeImage.cs index 20992bd2..9c339946 100644 --- a/BetterGenshinImpact/Core/Recognition/OCR/engine/data/OcrNormalizeImage.cs +++ b/BetterGenshinImpact/Core/Recognition/OCR/Engine/data/OcrNormalizeImage.cs @@ -1,4 +1,4 @@ -namespace BetterGenshinImpact.Core.Recognition.OCR.engine.data; +namespace BetterGenshinImpact.Core.Recognition.OCR.Engine.data; /// /// 标准归一化的三个参数 diff --git a/BetterGenshinImpact/Core/Recognition/OCR/engine/data/OcrShape.cs b/BetterGenshinImpact/Core/Recognition/OCR/Engine/data/OcrShape.cs similarity index 67% rename from BetterGenshinImpact/Core/Recognition/OCR/engine/data/OcrShape.cs rename to BetterGenshinImpact/Core/Recognition/OCR/Engine/data/OcrShape.cs index cbdf1c37..6eba244c 100644 --- a/BetterGenshinImpact/Core/Recognition/OCR/engine/data/OcrShape.cs +++ b/BetterGenshinImpact/Core/Recognition/OCR/Engine/data/OcrShape.cs @@ -1,4 +1,4 @@ -namespace BetterGenshinImpact.Core.Recognition.OCR.engine.data; +namespace BetterGenshinImpact.Core.Recognition.OCR.Engine.data; /// /// 图像形状表示 diff --git a/BetterGenshinImpact/Core/Recognition/OCR/OcrFactory.cs b/BetterGenshinImpact/Core/Recognition/OCR/OcrFactory.cs index 254b423d..64673f6e 100644 --- a/BetterGenshinImpact/Core/Recognition/OCR/OcrFactory.cs +++ b/BetterGenshinImpact/Core/Recognition/OCR/OcrFactory.cs @@ -2,6 +2,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Threading.Tasks; +using BetterGenshinImpact.Core.Recognition.OCR.Paddle; using BetterGenshinImpact.Core.Recognition.ONNX; using BetterGenshinImpact.GameTask; using Microsoft.Extensions.DependencyInjection; diff --git a/BetterGenshinImpact/Core/Recognition/OCR/paddle/Det.cs b/BetterGenshinImpact/Core/Recognition/OCR/Paddle/Det.cs similarity index 98% rename from BetterGenshinImpact/Core/Recognition/OCR/paddle/Det.cs rename to BetterGenshinImpact/Core/Recognition/OCR/Paddle/Det.cs index 35587c62..226a06b3 100644 --- a/BetterGenshinImpact/Core/Recognition/OCR/paddle/Det.cs +++ b/BetterGenshinImpact/Core/Recognition/OCR/Paddle/Det.cs @@ -1,12 +1,12 @@ using System; using System.Linq; -using BetterGenshinImpact.Core.Recognition.OCR.engine; +using BetterGenshinImpact.Core.Recognition.OCR.Engine; using BetterGenshinImpact.Core.Recognition.ONNX; using Microsoft.ML.OnnxRuntime; using Microsoft.ML.OnnxRuntime.Tensors; using OpenCvSharp; -namespace BetterGenshinImpact.Core.Recognition.OCR.paddle; +namespace BetterGenshinImpact.Core.Recognition.OCR.Paddle; public class Det { diff --git a/BetterGenshinImpact/Core/Recognition/OCR/paddle/PaddleOcrService.cs b/BetterGenshinImpact/Core/Recognition/OCR/Paddle/PaddleOcrService.cs similarity index 96% rename from BetterGenshinImpact/Core/Recognition/OCR/paddle/PaddleOcrService.cs rename to BetterGenshinImpact/Core/Recognition/OCR/Paddle/PaddleOcrService.cs index 82264f02..a669c635 100644 --- a/BetterGenshinImpact/Core/Recognition/OCR/paddle/PaddleOcrService.cs +++ b/BetterGenshinImpact/Core/Recognition/OCR/Paddle/PaddleOcrService.cs @@ -3,12 +3,11 @@ using System.Diagnostics; using System.IO; using System.Linq; using BetterGenshinImpact.Core.Config; -using BetterGenshinImpact.Core.Recognition.OCR.engine; -using BetterGenshinImpact.Core.Recognition.OCR.paddle; +using BetterGenshinImpact.Core.Recognition.OCR.Engine; using BetterGenshinImpact.Core.Recognition.ONNX; using OpenCvSharp; -namespace BetterGenshinImpact.Core.Recognition.OCR; +namespace BetterGenshinImpact.Core.Recognition.OCR.Paddle; public class PaddleOcrService : IOcrService { diff --git a/BetterGenshinImpact/Core/Recognition/OCR/paddle/Rec.cs b/BetterGenshinImpact/Core/Recognition/OCR/Paddle/Rec.cs similarity index 97% rename from BetterGenshinImpact/Core/Recognition/OCR/paddle/Rec.cs rename to BetterGenshinImpact/Core/Recognition/OCR/Paddle/Rec.cs index dad1d993..f4730957 100644 --- a/BetterGenshinImpact/Core/Recognition/OCR/paddle/Rec.cs +++ b/BetterGenshinImpact/Core/Recognition/OCR/Paddle/Rec.cs @@ -5,14 +5,14 @@ using System.IO; using System.Linq; using System.Runtime.InteropServices; using System.Text; -using BetterGenshinImpact.Core.Recognition.OCR.engine; -using BetterGenshinImpact.Core.Recognition.OCR.engine.data; +using BetterGenshinImpact.Core.Recognition.OCR.Engine; +using BetterGenshinImpact.Core.Recognition.OCR.Engine.data; using BetterGenshinImpact.Core.Recognition.ONNX; using Microsoft.ML.OnnxRuntime; using Microsoft.ML.OnnxRuntime.Tensors; using OpenCvSharp; -namespace BetterGenshinImpact.Core.Recognition.OCR.paddle; +namespace BetterGenshinImpact.Core.Recognition.OCR.Paddle; public class Rec { diff --git a/BetterGenshinImpact/Core/Recognition/ONNX/SVTR/PickTextInference.cs b/BetterGenshinImpact/Core/Recognition/ONNX/SVTR/PickTextInference.cs index e7b2e9c2..ded28ffc 100644 --- a/BetterGenshinImpact/Core/Recognition/ONNX/SVTR/PickTextInference.cs +++ b/BetterGenshinImpact/Core/Recognition/ONNX/SVTR/PickTextInference.cs @@ -9,7 +9,7 @@ using System.Diagnostics; using System.IO; using System.Text; using System.Text.Json; -using BetterGenshinImpact.Core.Recognition.OCR.engine; +using BetterGenshinImpact.Core.Recognition.OCR.Engine; using Microsoft.Extensions.DependencyInjection; namespace BetterGenshinImpact.Core.Recognition.ONNX.SVTR; diff --git a/Test/BetterGenshinImpact.UnitTest/CoreTests/RecognitionTests/OCRTests/PaddleFixture.cs b/Test/BetterGenshinImpact.UnitTest/CoreTests/RecognitionTests/OCRTests/PaddleFixture.cs index 8a83a859..88624fb0 100644 --- a/Test/BetterGenshinImpact.UnitTest/CoreTests/RecognitionTests/OCRTests/PaddleFixture.cs +++ b/Test/BetterGenshinImpact.UnitTest/CoreTests/RecognitionTests/OCRTests/PaddleFixture.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using BetterGenshinImpact.Core.Recognition.OCR.Paddle; namespace BetterGenshinImpact.UnitTest.CoreTests.RecognitionTests.OCRTests { diff --git a/Test/BetterGenshinImpact.UnitTest/CoreTests/RecognitionTests/OCRTests/PaddleOcrServiceTests.cs b/Test/BetterGenshinImpact.UnitTest/CoreTests/RecognitionTests/OCRTests/PaddleOcrServiceTests.cs index b5826e43..5c1d684a 100644 --- a/Test/BetterGenshinImpact.UnitTest/CoreTests/RecognitionTests/OCRTests/PaddleOcrServiceTests.cs +++ b/Test/BetterGenshinImpact.UnitTest/CoreTests/RecognitionTests/OCRTests/PaddleOcrServiceTests.cs @@ -6,6 +6,7 @@ using System.Text; using System.Threading.Tasks; using BetterGenshinImpact.Core.Recognition.OCR; using System.Drawing; +using BetterGenshinImpact.Core.Recognition.OCR.Paddle; using OpenCvSharp.Extensions; namespace BetterGenshinImpact.UnitTest.CoreTests.RecognitionTests.OCRTests