From 9569888f5022e3ff0c06c5cbbaa59630d9c858e0 Mon Sep 17 00:00:00 2001 From: jw098 Date: Thu, 23 Jul 2026 21:40:28 -0700 Subject: [PATCH] Make PaddleOCR the default --- SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp | 2 +- SerialPrograms/Source/ML/Inference/ML_PaddleOCRPipeline.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp b/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp index f566ada754..8761fec389 100644 --- a/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp +++ b/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp @@ -148,7 +148,7 @@ GlobalSettings::GlobalSettings() {OcrLibrary::TESSERACT, "tesseract", "Tesseract"}, }, LockMode::LOCK_WHILE_RUNNING, - OcrLibrary::TESSERACT + OcrLibrary::PADDLE_OCR ) , OCR_WARNING( "WARNING: If you change the OCR library away from the default (PaddleOCR), you must ensure that you have the necessary resource downloaded. " diff --git a/SerialPrograms/Source/ML/Inference/ML_PaddleOCRPipeline.cpp b/SerialPrograms/Source/ML/Inference/ML_PaddleOCRPipeline.cpp index 1a29a8be37..fbe0f98797 100644 --- a/SerialPrograms/Source/ML/Inference/ML_PaddleOCRPipeline.cpp +++ b/SerialPrograms/Source/ML/Inference/ML_PaddleOCRPipeline.cpp @@ -20,7 +20,7 @@ namespace ML{ std::pair PaddleOCRPipeline::get_paths(Language language){ - std::string base = DOWNLOADED_RESOURCE_PATH() + "PaddleOCR/"; + std::string base = RESOURCE_PATH() + "PaddleOCR/"; switch(language){ case Language::None: throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Attempted to call OCR without a language.");