From eeb6a21435891f4f1ea8dc41e31434bcd227909f Mon Sep 17 00:00:00 2001 From: Alexander Yee Date: Sun, 23 Aug 2026 00:18:12 -0700 Subject: [PATCH] Show the resource download table. Move Tesseract to external download. --- .../Source/CommonFramework/GlobalSettingsPanel.cpp | 2 -- .../Source/CommonTools/OCR/OCR_RawTesseractOCR.cpp | 6 ++++-- .../PokemonSV/Programs/Farming/PokemonSV_BBQSoloFarmer.cpp | 6 +++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp b/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp index db09f99b34..702b3c6a23 100644 --- a/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp +++ b/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp @@ -252,7 +252,6 @@ GlobalSettings::GlobalSettings() PA_ADD_OPTION(DEVELOPER_TOKEN); - RESOURCE_DOWNLOAD_TABLE.set_visibility(ConfigOptionState::HIDDEN); DOWNLOAD_ERROR.set_visibility(ConfigOptionState::HIDDEN); SAVE_DEBUG_VIDEOS_ON_SWITCH.set_visibility(ConfigOptionState::HIDDEN); ControllerSettings::instance().DEVICE_LOGGING_FLAG.set_visibility(ConfigOptionState::HIDDEN); @@ -278,7 +277,6 @@ void GlobalSettings::load_json(const JsonValue& json){ ConfigOptionState devmode_visibility = developer_mode ? ConfigOptionState::ENABLED : ConfigOptionState::HIDDEN; - RESOURCE_DOWNLOAD_TABLE.set_visibility(devmode_visibility); DOWNLOAD_ERROR.set_visibility(devmode_visibility); SAVE_DEBUG_VIDEOS_ON_SWITCH.set_visibility(devmode_visibility); PerformanceOptions::instance().ONNX_OPTIONS.USE_GPU.set_visibility(devmode_visibility); diff --git a/SerialPrograms/Source/CommonTools/OCR/OCR_RawTesseractOCR.cpp b/SerialPrograms/Source/CommonTools/OCR/OCR_RawTesseractOCR.cpp index a73eb6960d..2c8b341ff4 100644 --- a/SerialPrograms/Source/CommonTools/OCR/OCR_RawTesseractOCR.cpp +++ b/SerialPrograms/Source/CommonTools/OCR/OCR_RawTesseractOCR.cpp @@ -24,7 +24,7 @@ namespace OCR{ bool tesseract_language_available(Language language){ - std::string path = RESOURCE_PATH(); + std::string path = DOWNLOADED_RESOURCE_PATH(); path += "Tesseract/"; path += language_data(language).code; path += ".traineddata"; @@ -41,7 +41,9 @@ class TesseractPool{ TesseractPool(Language language) : m_language_code(language_data(language).code) , m_training_data_path( - QDir::current().relativeFilePath(QString::fromStdString(RESOURCE_PATH() + "Tesseract/")).toStdString() + QDir::current().relativeFilePath( + QString::fromStdString(DOWNLOADED_RESOURCE_PATH() + "Tesseract/") + ).toStdString() ) {} diff --git a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BBQSoloFarmer.cpp b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BBQSoloFarmer.cpp index 1dd9e239a9..b988629210 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BBQSoloFarmer.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BBQSoloFarmer.cpp @@ -36,7 +36,11 @@ BBQSoloFarmer_Descriptor::BBQSoloFarmer_Descriptor() "Farm Blueberry Quests in the Terarium for BP.", ProgramControllerClass::StandardController_RequiresPrecision, FeedbackType::REQUIRED, - AllowCommandsWhenRunning::DISABLE_COMMANDS + AllowCommandsWhenRunning::DISABLE_COMMANDS, + false, + { + "Tesseract", + } ) {} struct BBQSoloFarmer_Descriptor::Stats : public StatsTracker{