diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxSpacesReader.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxSpacesReader.cpp new file mode 100644 index 0000000000..cbde90872f --- /dev/null +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxSpacesReader.cpp @@ -0,0 +1,185 @@ +/* Pokemon Home Box Spaces Reader + * + * From: https://github.com/PokemonAutomation/ + * + */ + +#include +#include +#include "Common/Cpp/Strings/StringTools.h" +#include "Common/Cpp/TestRunners/UnitTestDatabase.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" +#include "CommonTools/OCR/OCR_Routines.h" +#include "Tests/ImageUnitTest.h" +#include "PokemonHome_PageViewDetector.h" +#include "PokemonHome_BoxSpacesReader.h" + +namespace PokemonAutomation{ +namespace NintendoSwitch{ +namespace PokemonHome{ +namespace{ + +const ImageFloatBox PAGE_TITLE(0.177, 0.102, 0.158, 0.042); + +} + +void BoxSpacesReader::make_overlays(VideoOverlaySet& items) const{ + PageViewDetector(m_color).make_overlays(items); + items.add(m_color, PAGE_TITLE); +} + +std::optional BoxSpacesReader::read_page_number(const ImageViewRGB32& screen) const{ + if (!PageViewDetector().detect(screen)){ + return std::nullopt; + } + const ImageViewRGB32 title = extract_box_reference(screen, PAGE_TITLE); + if (!title){ + return std::nullopt; + } + + constexpr size_t OCR_HEIGHT = 64; + const ImageRGB32 scaled = title.scale_to(title.width() * OCR_HEIGHT / title.height(), OCR_HEIGHT); + const std::string text = StringTools::strip(OCR::ocr_read(Language::English, scaled)); + + // Read the trailing fraction. The label before it depends on the game language. + const size_t slash = text.rfind('/'); + if (slash == std::string::npos || slash == 0){ + return std::nullopt; + } + const size_t before_number = text.find_last_not_of("0123456789", slash - 1); + const size_t number_start = before_number == std::string::npos ? 0 : before_number + 1; + const char* end = text.data() + text.size(); + size_t page = 0; + const auto [page_end, page_error] = std::from_chars(text.data() + number_start, text.data() + slash, page); + if (page_error != std::errc{} || page_end != text.data() + slash){ + return std::nullopt; + } + + size_t total = 0; + const auto [total_end, total_error] = std::from_chars(text.data() + slash + 1, end, total); + if (total_error != std::errc{} || total_end != end || page == 0 || page > total || total > 10){ + return std::nullopt; + } + return page; +} + +class Test_BoxSpacesReader : public ImageUnitTest{ +public: + Test_BoxSpacesReader(const std::string& image, std::optional expected) + : ImageUnitTest("PokemonHome::BoxSpacesReader - " + image, {image}) + , m_expected(expected) + { + m_memory += PADDLE_OCR_SINGLE_LINE_MEMORY_ESTIMATE; + } + + virtual UnitTestResult run_on_images( + Logger& logger, CancellableScope& scope, + const std::vector& images + ) const override{ + const auto result = BoxSpacesReader().read_page_number(images[0]); + if (result == m_expected){ + return true; + } + return "Expected page " + (m_expected ? std::to_string(*m_expected) : "none") + + ", read " + (result ? std::to_string(*result) : "none"); + } + +private: + std::optional m_expected; +}; + +void add_tests_BoxSpacesReader(UnitTestDatabase& database){ + database.add("PokemonHome/PageView/Page04_Box118_Normal_Grid_R4C3_Frame01.png", 4); + database.add("PokemonHome/PageView/Page04_Box117_Normal_Grid_R4C2_Frame01.png", 4); + database.add("PokemonHome/PageView/Page04_Box105_Normal_Grid_R2C2_Frame01.png", 4); + database.add("PokemonHome/PageView/Page03_Box069_Normal_Grid_R1C2_Frame01.png", 3); + database.add("PokemonHome/PageView/Page03_Box071_Normal_Grid_R1C4_Frame01.png", 3); + database.add("PokemonHome/PageView/Page02_Box041_Normal_Grid_R1C4_Frame01.png", 2); + database.add("PokemonHome/PageView/Page02_Box059_Normal_Grid_R4C4_Frame01.png", 2); + database.add("PokemonHome/PageView/Page02_Box059_Normal_Grid_R4C4_Frame02.png", 2); + database.add("PokemonHome/PageView/Page01_Box029_Normal_Grid_R4C4_Frame01.png", 1); + database.add("PokemonHome/PageView/Page01_Box028_Normal_Grid_R4C3_Frame01.png", 1); + database.add("PokemonHome/PageView/Page01_Normal_Back_Frame01.png", 1); + database.add("PokemonHome/PageView/Page01_Box027_Normal_Grid_R4C2_Frame01.png", 1); + database.add("PokemonHome/PageView/Page10_Box285_Normal_Grid_R2C2_Frame01.png", 10); + database.add("PokemonHome/PageView/Page10_Box285_Normal_Grid_R2C2_Frame02.png", 10); + database.add("PokemonHome/PageView/Page10_Box285_Normal_Grid_R2C2_Frame03.png", 10); + database.add("PokemonHome/PageView/Page10_Box285_Normal_Grid_R2C2_Frame04.png", 10); + database.add("PokemonHome/PageView/Page10_Box285_Relocate_Grid_R2C2_Frame01.png", 10); + database.add("PokemonHome/PageView/Page10_Box287_Relocate_Grid_R2C4_Frame01.png", 10); + database.add("PokemonHome/PageView/Page10_Box281_Relocate_Grid_R1C4_Frame01.png", 10); + database.add("PokemonHome/PageView/Page01_Box011_Relocate_Grid_R1C4_Frame01.png", 1); + database.add("PokemonHome/PageView/Page01_Box011_Relocate_Grid_R1C4_Frame02.png", 1); + database.add("PokemonHome/PageView/Page02_Box047_Relocate_Grid_R2C4_Frame01.png", 2); + database.add("PokemonHome/PageView/Page02_Box059_Relocate_Grid_R4C4_Frame01.png", 2); + database.add("PokemonHome/PageView/Page02_Box059_Relocate_Grid_R4C4_Frame02.png", 2); + database.add("PokemonHome/PageView/Page03_Box086_Relocate_Grid_R4C1_Frame01.png", 3); + database.add("PokemonHome/PageView/Page03_Relocate_Back_Frame01.png", 3); + database.add("PokemonHome/PageView/Page03_Relocate_Back_Frame02.png", 3); + database.add("PokemonHome/PageView/Page03_Relocate_Back_Frame03.png", 3); + database.add("PokemonHome/PageView/Page03_Multi_Back_Frame01.png", 3); + database.add("PokemonHome/PageView/Page04_Box109_Multi_Grid_R3C0_Frame01.png", 4); + database.add("PokemonHome/PageView/Page04_Box097_Multi_Grid_R1C0_Frame01.png", 4); + database.add("PokemonHome/PageView/Page05_Box128_Multi_Grid_R1C1_Frame01.png", 5); + database.add("PokemonHome/PageView/Page05_Box129_Multi_Grid_R1C2_Frame01.png", 5); + database.add("PokemonHome/PageView/Page05_Box129_Multi_Grid_R1C2_Frame02.png", 5); + database.add("PokemonHome/PageView/Page05_Box130_Multi_Grid_R1C3_Frame01.png", 5); + database.add("PokemonHome/PageView/Page05_Box136_Multi_Grid_R2C3_Frame01.png", 5); + database.add("PokemonHome/PageView/Page05_Box136_Multi_Grid_R2C3_Frame02.png", 5); + database.add("PokemonHome/PageView/Page06_Box166_Multi_Grid_R2C3_Frame01.png", 6); + database.add("PokemonHome/PageView/Page06_Box172_Multi_Grid_R3C3_Frame01.png", 6); + database.add("PokemonHome/PageView/Page06_Box178_Multi_Grid_R4C3_Frame01.png", 6); + database.add("PokemonHome/PageView/Page06_Box179_Multi_Grid_R4C4_Frame01.png", 6); + database.add("PokemonHome/PageView/Page07_Box209_Multi_Grid_R4C4_Frame01.png", 7); + database.add("PokemonHome/PageView/Page07_Multi_Back_Frame01.png", 7); + database.add("PokemonHome/PageView/Page07_Box196_Multi_Grid_R2C3_Frame01.png", 7); + database.add("PokemonHome/PageView/Page07_Box195_Multi_Grid_R2C2_Frame01.png", 7); + database.add("PokemonHome/PageView/Page08_Box226_Multi_Grid_R2C3_Frame01.png", 8); + database.add("PokemonHome/PageView/Page09_Box256_Multi_Grid_R2C3_Frame01.png", 9); + database.add("PokemonHome/PageView/Page09_Box262_Multi_Grid_R3C3_Frame01.png", 9); + database.add("PokemonHome/PageView/Page09_Box262_Multi_Grid_R3C3_Frame02.png", 9); + database.add("PokemonHome/PageView/Page09_Box262_Multi_Grid_R3C3_Frame03.png", 9); + database.add("PokemonHome/PageView/Page09_Box262_Normal_Grid_R3C3_Frame01.png", 9); + database.add("PokemonHome/PageView/Page09_Box262_Multi_Grid_R3C3_Frame04.png", 9); + database.add("PokemonHome/PageView/Page09_Box260_Normal_Grid_R3C1_Frame01.png", 9); + database.add("PokemonHome/PageView/Page09_Box254_Normal_Grid_R2C1_Frame01.png", 9); + database.add("PokemonHome/PageView/Page09_Box247_Normal_Grid_R1C0_Frame01.png", 9); + database.add("PokemonHome/PageView/Page08_Box223_Normal_Grid_R2C0_Frame01.png", 8); + database.add("PokemonHome/PageView/Page07_Box193_Normal_Grid_R2C0_Frame01.png", 7); + database.add("PokemonHome/PageView/Page07_Box199_Normal_Grid_R3C0_Frame01.png", 7); + database.add("PokemonHome/PageView/Page08_Box235_Relocate_Grid_R4C0_Frame01.png", 8); + database.add("PokemonHome/PageView/Page08_Box235_Relocate_Grid_R4C0_Frame02.png", 8); + database.add("PokemonHome/PageView/Page08_Box235_Relocate_Grid_R4C0_Frame03.png", 8); + database.add("PokemonHome/PageView/Page08_Box235_Relocate_Grid_R4C0_Frame04.png", 8); + database.add("PokemonHome/PageView/Page08_Box235_Relocate_Grid_R4C0_Frame05.png", 8); + database.add("PokemonHome/PageView/Page08_Box236_Relocate_Grid_R4C1_Frame01.png", 8); + database.add("PokemonHome/PageView/Page08_Box238_Relocate_Grid_R4C3_Frame01.png", 8); + database.add("PokemonHome/PageView/Page08_Relocate_Back_Frame01.png", 8); + database.add("PokemonHome/PageView/Page08_Relocate_Back_Frame02.png", 8); + database.add("PokemonHome/PageView/Page07_Box208_Relocate_Grid_R4C3_Frame01.png", 7); + database.add("PokemonHome/PageView/Page07_Box195_Relocate_Grid_R2C2_Frame01.png", 7); + database.add("PokemonHome/PageView/Page07_Box189_Relocate_Grid_R1C2_Frame01.png", 7); + database.add("PokemonHome/PageView/Page07_Box187_Relocate_Grid_R1C0_Frame01.png", 7); + database.add("PokemonHome/PageView/Page06_Box163_Relocate_Grid_R2C0_Frame01.png", 6); + database.add("PokemonHome/PageView/Page06_Relocate_Back_Frame01.png", 6); + database.add("PokemonHome/PageView/Page06_Box175_Relocate_Grid_R4C0_Frame01.png", 6); + database.add("PokemonHome/PageView/Page06_Box178_Relocate_Grid_R4C3_Frame01.png", 6); + database.add("PokemonHome/PageView/Page05_Box148_Multi_Grid_R4C3_Frame01.png", 5); + database.add("PokemonHome/PageView/Page05_Box142_Multi_Grid_R3C3_Frame01.png", 5); + database.add("PokemonHome/PageView/Page05_Box134_Multi_Grid_R2C1_Frame01.png", 5); + database.add("PokemonHome/PageView/Page05_Box134_Multi_Grid_R2C1_Frame02.png", 5); + database.add("PokemonHome/PageView/Page04_Box119_Multi_Grid_R4C4_Frame01.png", 4); + database.add("PokemonHome/PageView/Page05_Box150_Normal_Grid_R4C5_Frame01.png", 5); + database.add("PokemonHome/PageView/Page05_Box138_Normal_Grid_R2C5_Frame01.png", 5); + database.add("PokemonHome/PageView/Page05_Box132_Normal_Grid_R1C5_Frame01.png", 5); + database.add("PokemonHome/PageView/Page06_Box162_Normal_Grid_R1C5_Frame01.png", 6); + database.add("PokemonHome/PageView/Page07_Box192_Normal_Grid_R1C5_Frame01.png", 7); + database.add("PokemonHome/BoxView/BoxView-1.png", std::nullopt); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_BoxName_01.png", std::nullopt); + database.add("PokemonHome/SummaryScreen/annihilape_Regular.png", std::nullopt); +} + +} +} +} diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxSpacesReader.h b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxSpacesReader.h new file mode 100644 index 0000000000..d431b6e6e0 --- /dev/null +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxSpacesReader.h @@ -0,0 +1,40 @@ +/* Pokemon Home Box Spaces Reader + * + * From: https://github.com/PokemonAutomation/ + * + */ + +#ifndef PokemonAutomation_PokemonHome_BoxSpacesReader_H +#define PokemonAutomation_PokemonHome_BoxSpacesReader_H + +#include +#include +#include "Common/Cpp/Color.h" + +namespace PokemonAutomation{ + class ImageViewRGB32; + class UnitTestDatabase; + class VideoOverlaySet; +namespace NintendoSwitch{ +namespace PokemonHome{ + +class BoxSpacesReader{ +public: + BoxSpacesReader(Color color = COLOR_RED) : m_color(color) {} + + void make_overlays(VideoOverlaySet& items) const; + + // Read the one-based page number from the Box Space title. + // Returns no value when the page number is unavailable. + std::optional read_page_number(const ImageViewRGB32& screen) const; + +private: + Color m_color; +}; + +void add_tests_BoxSpacesReader(UnitTestDatabase& database); + +} +} +} +#endif diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxViewDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxViewDetector.cpp index 7a467a560a..9f4840cf58 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxViewDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxViewDetector.cpp @@ -1,4 +1,4 @@ -/* Button Detector +/* Pokemon Home Box View Detector * * From: https://github.com/PokemonAutomation/ * @@ -13,19 +13,27 @@ #include "Tests/ImageUnitTest.h" #include "Tests/TestUtils.h" #include "VideoGames/PokemonHome/Inference/PokemonHome_ButtonDetector.h" +#include "PokemonHome_StorageView.h" #include "PokemonHome_BoxViewDetector.h" namespace PokemonAutomation{ namespace NintendoSwitch{ namespace PokemonHome{ -BoxViewDetector::BoxViewDetector(VideoOverlay* overlay) : m_button_plus_detector(COLOR_BLACK, ButtonType::ButtonPlus, { 0.100, 0.956, 0.107, 0.041 }, overlay){} +BoxViewDetector::BoxViewDetector(VideoOverlay* overlay) + : m_button_plus_detector(COLOR_BLACK, ButtonType::ButtonPlus, STORAGE_PLUS_BUTTON, overlay) +{} void BoxViewDetector::make_overlays(VideoOverlaySet& items) const{ + items.add(COLOR_RED, STORAGE_HEADER_STRIP); m_button_plus_detector.make_overlays(items); } bool BoxViewDetector::detect(const ImageViewRGB32& screen){ + if (classify_storage_header(screen) != StorageViewHeader::BoxView){ + m_button_plus_detector.reset_state(); + return false; + } return m_button_plus_detector.detect(screen); } @@ -49,7 +57,10 @@ class Test_BoxViewDetector : public ImageUnitTest{ DummyVideoOverlay overlay; BoxViewDetector detector(&overlay); const ImageRGB32& image = images[0]; - return detector.detect(image) == m_expected; + if (detector.detect(image) != m_expected){ + return m_expected ? "Expected Box View." : "Unexpected Box View detection."; + } + return true; }; private: @@ -58,6 +69,151 @@ class Test_BoxViewDetector : public ImageUnitTest{ void add_tests_BoxViewDetector(UnitTestDatabase& database){ database.add("PokemonHome/BoxView/BoxView-1.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Multi_BoxSpaces_01.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Multi_BoxSpaces_02.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Multi_BoxSpaces_03.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Multi_BoxSpaces_04.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Multi_BoxSpaces_05.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Multi_BoxSpaces_06.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Multi_BoxSpaces_07.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Multi_BoxSpaces_08.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Multi_BoxSpaces_09.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Multi_Grid_Row0_Column0_01.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Multi_Grid_Row0_Column0_02.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Multi_Grid_Row2_Column0_01.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Multi_Grid_Row3_Column3_01.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Multi_Grid_Row3_Column3_02.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_BoxName_01.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_BoxName_02.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_BoxSpaces_01.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_BoxSpaces_02.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_BoxSpaces_03.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_BoxSpaces_04.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_BoxSpaces_05.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_BoxSpaces_06.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_BoxSpaces_07.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_BoxSpaces_08.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_BoxSpaces_09.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_BoxSpaces_10.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_BoxSpaces_11.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_Grid_Row0_Column0_01.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_Grid_Row0_Column0_02.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_Grid_Row3_Column0_01.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_Newest30_01.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_Newest30_02.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_Newest30_03.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxName_01.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxName_02.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxName_03.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxName_04.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxName_05.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_01.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_02.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_03.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_04.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_05.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_06.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_07.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_08.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_09.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_10.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_11.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_12.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_13.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_14.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_15.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_16.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_Grid_Row2_Column0_01.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_Grid_Row2_Column0_02.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_Grid_Row2_Column5_01.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_Grid_Row2_Column5_02.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_Newest30_01.png", true); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_Newest30_02.png", true); + database.add("PokemonHome/PageView/Page01_Box011_Relocate_Grid_R1C4_Frame01.png", false); + database.add("PokemonHome/PageView/Page01_Box011_Relocate_Grid_R1C4_Frame02.png", false); + database.add("PokemonHome/PageView/Page01_Box027_Normal_Grid_R4C2_Frame01.png", false); + database.add("PokemonHome/PageView/Page01_Box028_Normal_Grid_R4C3_Frame01.png", false); + database.add("PokemonHome/PageView/Page01_Box029_Normal_Grid_R4C4_Frame01.png", false); + database.add("PokemonHome/PageView/Page01_Normal_Back_Frame01.png", false); + database.add("PokemonHome/PageView/Page02_Box041_Normal_Grid_R1C4_Frame01.png", false); + database.add("PokemonHome/PageView/Page02_Box047_Relocate_Grid_R2C4_Frame01.png", false); + database.add("PokemonHome/PageView/Page02_Box059_Normal_Grid_R4C4_Frame01.png", false); + database.add("PokemonHome/PageView/Page02_Box059_Normal_Grid_R4C4_Frame02.png", false); + database.add("PokemonHome/PageView/Page02_Box059_Relocate_Grid_R4C4_Frame01.png", false); + database.add("PokemonHome/PageView/Page02_Box059_Relocate_Grid_R4C4_Frame02.png", false); + database.add("PokemonHome/PageView/Page03_Box069_Normal_Grid_R1C2_Frame01.png", false); + database.add("PokemonHome/PageView/Page03_Box071_Normal_Grid_R1C4_Frame01.png", false); + database.add("PokemonHome/PageView/Page03_Box086_Relocate_Grid_R4C1_Frame01.png", false); + database.add("PokemonHome/PageView/Page03_Multi_Back_Frame01.png", false); + database.add("PokemonHome/PageView/Page03_Relocate_Back_Frame01.png", false); + database.add("PokemonHome/PageView/Page03_Relocate_Back_Frame02.png", false); + database.add("PokemonHome/PageView/Page03_Relocate_Back_Frame03.png", false); + database.add("PokemonHome/PageView/Page04_Box097_Multi_Grid_R1C0_Frame01.png", false); + database.add("PokemonHome/PageView/Page04_Box105_Normal_Grid_R2C2_Frame01.png", false); + database.add("PokemonHome/PageView/Page04_Box109_Multi_Grid_R3C0_Frame01.png", false); + database.add("PokemonHome/PageView/Page04_Box117_Normal_Grid_R4C2_Frame01.png", false); + database.add("PokemonHome/PageView/Page04_Box118_Normal_Grid_R4C3_Frame01.png", false); + database.add("PokemonHome/PageView/Page04_Box119_Multi_Grid_R4C4_Frame01.png", false); + database.add("PokemonHome/PageView/Page05_Box128_Multi_Grid_R1C1_Frame01.png", false); + database.add("PokemonHome/PageView/Page05_Box129_Multi_Grid_R1C2_Frame01.png", false); + database.add("PokemonHome/PageView/Page05_Box129_Multi_Grid_R1C2_Frame02.png", false); + database.add("PokemonHome/PageView/Page05_Box130_Multi_Grid_R1C3_Frame01.png", false); + database.add("PokemonHome/PageView/Page05_Box132_Normal_Grid_R1C5_Frame01.png", false); + database.add("PokemonHome/PageView/Page05_Box134_Multi_Grid_R2C1_Frame01.png", false); + database.add("PokemonHome/PageView/Page05_Box134_Multi_Grid_R2C1_Frame02.png", false); + database.add("PokemonHome/PageView/Page05_Box136_Multi_Grid_R2C3_Frame01.png", false); + database.add("PokemonHome/PageView/Page05_Box136_Multi_Grid_R2C3_Frame02.png", false); + database.add("PokemonHome/PageView/Page05_Box138_Normal_Grid_R2C5_Frame01.png", false); + database.add("PokemonHome/PageView/Page05_Box142_Multi_Grid_R3C3_Frame01.png", false); + database.add("PokemonHome/PageView/Page05_Box148_Multi_Grid_R4C3_Frame01.png", false); + database.add("PokemonHome/PageView/Page05_Box150_Normal_Grid_R4C5_Frame01.png", false); + database.add("PokemonHome/PageView/Page06_Box162_Normal_Grid_R1C5_Frame01.png", false); + database.add("PokemonHome/PageView/Page06_Box163_Relocate_Grid_R2C0_Frame01.png", false); + database.add("PokemonHome/PageView/Page06_Box166_Multi_Grid_R2C3_Frame01.png", false); + database.add("PokemonHome/PageView/Page06_Box172_Multi_Grid_R3C3_Frame01.png", false); + database.add("PokemonHome/PageView/Page06_Box175_Relocate_Grid_R4C0_Frame01.png", false); + database.add("PokemonHome/PageView/Page06_Box178_Multi_Grid_R4C3_Frame01.png", false); + database.add("PokemonHome/PageView/Page06_Box178_Relocate_Grid_R4C3_Frame01.png", false); + database.add("PokemonHome/PageView/Page06_Box179_Multi_Grid_R4C4_Frame01.png", false); + database.add("PokemonHome/PageView/Page06_Relocate_Back_Frame01.png", false); + database.add("PokemonHome/PageView/Page07_Box187_Relocate_Grid_R1C0_Frame01.png", false); + database.add("PokemonHome/PageView/Page07_Box189_Relocate_Grid_R1C2_Frame01.png", false); + database.add("PokemonHome/PageView/Page07_Box192_Normal_Grid_R1C5_Frame01.png", false); + database.add("PokemonHome/PageView/Page07_Box193_Normal_Grid_R2C0_Frame01.png", false); + database.add("PokemonHome/PageView/Page07_Box195_Multi_Grid_R2C2_Frame01.png", false); + database.add("PokemonHome/PageView/Page07_Box195_Relocate_Grid_R2C2_Frame01.png", false); + database.add("PokemonHome/PageView/Page07_Box196_Multi_Grid_R2C3_Frame01.png", false); + database.add("PokemonHome/PageView/Page07_Box199_Normal_Grid_R3C0_Frame01.png", false); + database.add("PokemonHome/PageView/Page07_Box208_Relocate_Grid_R4C3_Frame01.png", false); + database.add("PokemonHome/PageView/Page07_Box209_Multi_Grid_R4C4_Frame01.png", false); + database.add("PokemonHome/PageView/Page07_Multi_Back_Frame01.png", false); + database.add("PokemonHome/PageView/Page08_Box223_Normal_Grid_R2C0_Frame01.png", false); + database.add("PokemonHome/PageView/Page08_Box226_Multi_Grid_R2C3_Frame01.png", false); + database.add("PokemonHome/PageView/Page08_Box235_Relocate_Grid_R4C0_Frame01.png", false); + database.add("PokemonHome/PageView/Page08_Box235_Relocate_Grid_R4C0_Frame02.png", false); + database.add("PokemonHome/PageView/Page08_Box235_Relocate_Grid_R4C0_Frame03.png", false); + database.add("PokemonHome/PageView/Page08_Box235_Relocate_Grid_R4C0_Frame04.png", false); + database.add("PokemonHome/PageView/Page08_Box235_Relocate_Grid_R4C0_Frame05.png", false); + database.add("PokemonHome/PageView/Page08_Box236_Relocate_Grid_R4C1_Frame01.png", false); + database.add("PokemonHome/PageView/Page08_Box238_Relocate_Grid_R4C3_Frame01.png", false); + database.add("PokemonHome/PageView/Page08_Relocate_Back_Frame01.png", false); + database.add("PokemonHome/PageView/Page08_Relocate_Back_Frame02.png", false); + database.add("PokemonHome/PageView/Page09_Box247_Normal_Grid_R1C0_Frame01.png", false); + database.add("PokemonHome/PageView/Page09_Box254_Normal_Grid_R2C1_Frame01.png", false); + database.add("PokemonHome/PageView/Page09_Box256_Multi_Grid_R2C3_Frame01.png", false); + database.add("PokemonHome/PageView/Page09_Box260_Normal_Grid_R3C1_Frame01.png", false); + database.add("PokemonHome/PageView/Page09_Box262_Multi_Grid_R3C3_Frame01.png", false); + database.add("PokemonHome/PageView/Page09_Box262_Multi_Grid_R3C3_Frame02.png", false); + database.add("PokemonHome/PageView/Page09_Box262_Multi_Grid_R3C3_Frame03.png", false); + database.add("PokemonHome/PageView/Page09_Box262_Multi_Grid_R3C3_Frame04.png", false); + database.add("PokemonHome/PageView/Page09_Box262_Normal_Grid_R3C3_Frame01.png", false); + database.add("PokemonHome/PageView/Page10_Box281_Relocate_Grid_R1C4_Frame01.png", false); + database.add("PokemonHome/PageView/Page10_Box285_Normal_Grid_R2C2_Frame01.png", false); + database.add("PokemonHome/PageView/Page10_Box285_Normal_Grid_R2C2_Frame02.png", false); + database.add("PokemonHome/PageView/Page10_Box285_Normal_Grid_R2C2_Frame03.png", false); + database.add("PokemonHome/PageView/Page10_Box285_Normal_Grid_R2C2_Frame04.png", false); + database.add("PokemonHome/PageView/Page10_Box285_Relocate_Grid_R2C2_Frame01.png", false); + database.add("PokemonHome/PageView/Page10_Box287_Relocate_Grid_R2C4_Frame01.png", false); database.add("PokemonHome/SummaryScreen/annihilape_Regular.png", false); database.add("PokemonHome/SummaryScreen/bidoof_Regular.png", false); database.add("PokemonHome/SummaryScreen/bulbasaur_Regular.png", false); diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_PageViewDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_PageViewDetector.cpp new file mode 100644 index 0000000000..ca092af19b --- /dev/null +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_PageViewDetector.cpp @@ -0,0 +1,208 @@ +/* Pokemon Home Page View Detector + * + * From: https://github.com/PokemonAutomation/ + * + */ + +#include +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" +#include "Tests/ImageUnitTest.h" +#include "PokemonHome_StorageView.h" +#include "PokemonHome_PageViewDetector.h" + +namespace PokemonAutomation{ +namespace NintendoSwitch{ +namespace PokemonHome{ + +PageViewDetector::PageViewDetector(Color color, VideoOverlay* overlay) + : m_color(color) + , m_button_plus_detector(COLOR_BLACK, ButtonType::ButtonPlus, STORAGE_PLUS_BUTTON, overlay) +{} + +void PageViewDetector::make_overlays(VideoOverlaySet& items) const{ + items.add(m_color, STORAGE_HEADER_STRIP); + m_button_plus_detector.make_overlays(items); +} + +bool PageViewDetector::detect(const ImageViewRGB32& screen){ + if (classify_storage_header(screen) != StorageViewHeader::PageView){ + m_button_plus_detector.reset_state(); + return false; + } + return m_button_plus_detector.detect(screen); +} + +class Test_PageViewDetector : public ImageUnitTest{ +public: + Test_PageViewDetector(const std::string& image, bool expected) + : ImageUnitTest("PokemonHome::PageViewDetector - " + image, {image}) + , m_expected(expected) + {} + + virtual UnitTestResult run_on_images( + Logger& logger, CancellableScope& scope, + const std::vector& images + ) const override{ + if (PageViewDetector().detect(images[0]) != m_expected){ + return m_expected ? "Expected Page View." : "Unexpected Page View detection."; + } + return true; + } + +private: + bool m_expected; +}; + +void add_tests_PageViewDetector(UnitTestDatabase& database){ + database.add("PokemonHome/BoxView/BoxView-1.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Multi_BoxSpaces_01.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Multi_BoxSpaces_02.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Multi_BoxSpaces_03.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Multi_BoxSpaces_04.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Multi_BoxSpaces_05.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Multi_BoxSpaces_06.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Multi_BoxSpaces_07.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Multi_BoxSpaces_08.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Multi_BoxSpaces_09.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Multi_Grid_Row0_Column0_01.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Multi_Grid_Row0_Column0_02.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Multi_Grid_Row2_Column0_01.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Multi_Grid_Row3_Column3_01.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Multi_Grid_Row3_Column3_02.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_BoxName_01.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_BoxName_02.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_BoxSpaces_01.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_BoxSpaces_02.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_BoxSpaces_03.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_BoxSpaces_04.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_BoxSpaces_05.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_BoxSpaces_06.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_BoxSpaces_07.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_BoxSpaces_08.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_BoxSpaces_09.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_BoxSpaces_10.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_BoxSpaces_11.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_Grid_Row0_Column0_01.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_Grid_Row0_Column0_02.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_Grid_Row3_Column0_01.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_Newest30_01.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_Newest30_02.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Normal_Newest30_03.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxName_01.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxName_02.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxName_03.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxName_04.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxName_05.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_01.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_02.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_03.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_04.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_05.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_06.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_07.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_08.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_09.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_10.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_11.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_12.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_13.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_14.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_15.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_BoxSpaces_16.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_Grid_Row2_Column0_01.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_Grid_Row2_Column0_02.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_Grid_Row2_Column5_01.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_Grid_Row2_Column5_02.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_Newest30_01.png", false); + database.add("PokemonHome/BoxView/SelectionArrow_Relocate_Newest30_02.png", false); + database.add("PokemonHome/PageView/Page01_Box011_Relocate_Grid_R1C4_Frame01.png", true); + database.add("PokemonHome/PageView/Page01_Box011_Relocate_Grid_R1C4_Frame02.png", true); + database.add("PokemonHome/PageView/Page01_Box027_Normal_Grid_R4C2_Frame01.png", true); + database.add("PokemonHome/PageView/Page01_Box028_Normal_Grid_R4C3_Frame01.png", true); + database.add("PokemonHome/PageView/Page01_Box029_Normal_Grid_R4C4_Frame01.png", true); + database.add("PokemonHome/PageView/Page01_Normal_Back_Frame01.png", true); + database.add("PokemonHome/PageView/Page02_Box041_Normal_Grid_R1C4_Frame01.png", true); + database.add("PokemonHome/PageView/Page02_Box047_Relocate_Grid_R2C4_Frame01.png", true); + database.add("PokemonHome/PageView/Page02_Box059_Normal_Grid_R4C4_Frame01.png", true); + database.add("PokemonHome/PageView/Page02_Box059_Normal_Grid_R4C4_Frame02.png", true); + database.add("PokemonHome/PageView/Page02_Box059_Relocate_Grid_R4C4_Frame01.png", true); + database.add("PokemonHome/PageView/Page02_Box059_Relocate_Grid_R4C4_Frame02.png", true); + database.add("PokemonHome/PageView/Page03_Box069_Normal_Grid_R1C2_Frame01.png", true); + database.add("PokemonHome/PageView/Page03_Box071_Normal_Grid_R1C4_Frame01.png", true); + database.add("PokemonHome/PageView/Page03_Box086_Relocate_Grid_R4C1_Frame01.png", true); + database.add("PokemonHome/PageView/Page03_Multi_Back_Frame01.png", true); + database.add("PokemonHome/PageView/Page03_Relocate_Back_Frame01.png", true); + database.add("PokemonHome/PageView/Page03_Relocate_Back_Frame02.png", true); + database.add("PokemonHome/PageView/Page03_Relocate_Back_Frame03.png", true); + database.add("PokemonHome/PageView/Page04_Box097_Multi_Grid_R1C0_Frame01.png", true); + database.add("PokemonHome/PageView/Page04_Box105_Normal_Grid_R2C2_Frame01.png", true); + database.add("PokemonHome/PageView/Page04_Box109_Multi_Grid_R3C0_Frame01.png", true); + database.add("PokemonHome/PageView/Page04_Box117_Normal_Grid_R4C2_Frame01.png", true); + database.add("PokemonHome/PageView/Page04_Box118_Normal_Grid_R4C3_Frame01.png", true); + database.add("PokemonHome/PageView/Page04_Box119_Multi_Grid_R4C4_Frame01.png", true); + database.add("PokemonHome/PageView/Page05_Box128_Multi_Grid_R1C1_Frame01.png", true); + database.add("PokemonHome/PageView/Page05_Box129_Multi_Grid_R1C2_Frame01.png", true); + database.add("PokemonHome/PageView/Page05_Box129_Multi_Grid_R1C2_Frame02.png", true); + database.add("PokemonHome/PageView/Page05_Box130_Multi_Grid_R1C3_Frame01.png", true); + database.add("PokemonHome/PageView/Page05_Box132_Normal_Grid_R1C5_Frame01.png", true); + database.add("PokemonHome/PageView/Page05_Box134_Multi_Grid_R2C1_Frame01.png", true); + database.add("PokemonHome/PageView/Page05_Box134_Multi_Grid_R2C1_Frame02.png", true); + database.add("PokemonHome/PageView/Page05_Box136_Multi_Grid_R2C3_Frame01.png", true); + database.add("PokemonHome/PageView/Page05_Box136_Multi_Grid_R2C3_Frame02.png", true); + database.add("PokemonHome/PageView/Page05_Box138_Normal_Grid_R2C5_Frame01.png", true); + database.add("PokemonHome/PageView/Page05_Box142_Multi_Grid_R3C3_Frame01.png", true); + database.add("PokemonHome/PageView/Page05_Box148_Multi_Grid_R4C3_Frame01.png", true); + database.add("PokemonHome/PageView/Page05_Box150_Normal_Grid_R4C5_Frame01.png", true); + database.add("PokemonHome/PageView/Page06_Box162_Normal_Grid_R1C5_Frame01.png", true); + database.add("PokemonHome/PageView/Page06_Box163_Relocate_Grid_R2C0_Frame01.png", true); + database.add("PokemonHome/PageView/Page06_Box166_Multi_Grid_R2C3_Frame01.png", true); + database.add("PokemonHome/PageView/Page06_Box172_Multi_Grid_R3C3_Frame01.png", true); + database.add("PokemonHome/PageView/Page06_Box175_Relocate_Grid_R4C0_Frame01.png", true); + database.add("PokemonHome/PageView/Page06_Box178_Multi_Grid_R4C3_Frame01.png", true); + database.add("PokemonHome/PageView/Page06_Box178_Relocate_Grid_R4C3_Frame01.png", true); + database.add("PokemonHome/PageView/Page06_Box179_Multi_Grid_R4C4_Frame01.png", true); + database.add("PokemonHome/PageView/Page06_Relocate_Back_Frame01.png", true); + database.add("PokemonHome/PageView/Page07_Box187_Relocate_Grid_R1C0_Frame01.png", true); + database.add("PokemonHome/PageView/Page07_Box189_Relocate_Grid_R1C2_Frame01.png", true); + database.add("PokemonHome/PageView/Page07_Box192_Normal_Grid_R1C5_Frame01.png", true); + database.add("PokemonHome/PageView/Page07_Box193_Normal_Grid_R2C0_Frame01.png", true); + database.add("PokemonHome/PageView/Page07_Box195_Multi_Grid_R2C2_Frame01.png", true); + database.add("PokemonHome/PageView/Page07_Box195_Relocate_Grid_R2C2_Frame01.png", true); + database.add("PokemonHome/PageView/Page07_Box196_Multi_Grid_R2C3_Frame01.png", true); + database.add("PokemonHome/PageView/Page07_Box199_Normal_Grid_R3C0_Frame01.png", true); + database.add("PokemonHome/PageView/Page07_Box208_Relocate_Grid_R4C3_Frame01.png", true); + database.add("PokemonHome/PageView/Page07_Box209_Multi_Grid_R4C4_Frame01.png", true); + database.add("PokemonHome/PageView/Page07_Multi_Back_Frame01.png", true); + database.add("PokemonHome/PageView/Page08_Box223_Normal_Grid_R2C0_Frame01.png", true); + database.add("PokemonHome/PageView/Page08_Box226_Multi_Grid_R2C3_Frame01.png", true); + database.add("PokemonHome/PageView/Page08_Box235_Relocate_Grid_R4C0_Frame01.png", true); + database.add("PokemonHome/PageView/Page08_Box235_Relocate_Grid_R4C0_Frame02.png", true); + database.add("PokemonHome/PageView/Page08_Box235_Relocate_Grid_R4C0_Frame03.png", true); + database.add("PokemonHome/PageView/Page08_Box235_Relocate_Grid_R4C0_Frame04.png", true); + database.add("PokemonHome/PageView/Page08_Box235_Relocate_Grid_R4C0_Frame05.png", true); + database.add("PokemonHome/PageView/Page08_Box236_Relocate_Grid_R4C1_Frame01.png", true); + database.add("PokemonHome/PageView/Page08_Box238_Relocate_Grid_R4C3_Frame01.png", true); + database.add("PokemonHome/PageView/Page08_Relocate_Back_Frame01.png", true); + database.add("PokemonHome/PageView/Page08_Relocate_Back_Frame02.png", true); + database.add("PokemonHome/PageView/Page09_Box247_Normal_Grid_R1C0_Frame01.png", true); + database.add("PokemonHome/PageView/Page09_Box254_Normal_Grid_R2C1_Frame01.png", true); + database.add("PokemonHome/PageView/Page09_Box256_Multi_Grid_R2C3_Frame01.png", true); + database.add("PokemonHome/PageView/Page09_Box260_Normal_Grid_R3C1_Frame01.png", true); + database.add("PokemonHome/PageView/Page09_Box262_Multi_Grid_R3C3_Frame01.png", true); + database.add("PokemonHome/PageView/Page09_Box262_Multi_Grid_R3C3_Frame02.png", true); + database.add("PokemonHome/PageView/Page09_Box262_Multi_Grid_R3C3_Frame03.png", true); + database.add("PokemonHome/PageView/Page09_Box262_Multi_Grid_R3C3_Frame04.png", true); + database.add("PokemonHome/PageView/Page09_Box262_Normal_Grid_R3C3_Frame01.png", true); + database.add("PokemonHome/PageView/Page10_Box281_Relocate_Grid_R1C4_Frame01.png", true); + database.add("PokemonHome/PageView/Page10_Box285_Normal_Grid_R2C2_Frame01.png", true); + database.add("PokemonHome/PageView/Page10_Box285_Normal_Grid_R2C2_Frame02.png", true); + database.add("PokemonHome/PageView/Page10_Box285_Normal_Grid_R2C2_Frame03.png", true); + database.add("PokemonHome/PageView/Page10_Box285_Normal_Grid_R2C2_Frame04.png", true); + database.add("PokemonHome/PageView/Page10_Box285_Relocate_Grid_R2C2_Frame01.png", true); + database.add("PokemonHome/PageView/Page10_Box287_Relocate_Grid_R2C4_Frame01.png", true); + database.add("PokemonHome/SummaryScreen/annihilape_Regular.png", false); +} + +} +} +} diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_PageViewDetector.h b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_PageViewDetector.h new file mode 100644 index 0000000000..77e899aaa3 --- /dev/null +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_PageViewDetector.h @@ -0,0 +1,36 @@ +/* Pokemon Home Page View Detector + * + * From: https://github.com/PokemonAutomation/ + * + */ + +#ifndef PokemonAutomation_PokemonHome_PageViewDetector_H +#define PokemonAutomation_PokemonHome_PageViewDetector_H + +#include "Common/Cpp/Color.h" +#include "CommonTools/VisualDetector.h" +#include "PokemonHome_ButtonDetector.h" + +namespace PokemonAutomation{ +namespace NintendoSwitch{ +namespace PokemonHome{ + +class PageViewDetector : public StaticScreenDetector{ +public: + explicit PageViewDetector(Color color = COLOR_RED, VideoOverlay* overlay = nullptr); + + virtual void make_overlays(VideoOverlaySet& items) const override; + virtual bool detect(const ImageViewRGB32& screen) override; + virtual void reset_state() override{ m_button_plus_detector.reset_state(); } + +private: + Color m_color; + ButtonDetector m_button_plus_detector; +}; + +void add_tests_PageViewDetector(UnitTestDatabase& database); + +} +} +} +#endif diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.cpp index 6c319c5a98..3cfb903144 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.cpp @@ -14,6 +14,7 @@ #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "Tests/ImageUnitTest.h" +#include "PokemonHome_PageViewDetector.h" #include "PokemonHome_SelectionArrowDetector.h" namespace PokemonAutomation{ @@ -195,6 +196,8 @@ std::string selection_string(const std::optional& selection){ return result + "BoxSpaces"; case BoxSelectionLocation::Newest30: return result + "Newest30"; + case BoxSelectionLocation::Back: + return result + "Back"; } return result; } @@ -238,6 +241,9 @@ std::optional SelectionArrowDetector::detect(const ImageViewRGB32& } ); } + if (best && best->location == BoxSelectionLocation::BoxSpaces && PageViewDetector().detect(screen)){ + best->location = BoxSelectionLocation::Back; + } return best; } @@ -282,6 +288,91 @@ class Test_SelectionArrowDetector : public UnitTest{ }; void add_tests_SelectionArrowDetector(UnitTestDatabase& database){ + database.add("PokemonHome/PageView/Page04_Box118_Normal_Grid_R4C3_Frame01.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 4, 3}); + database.add("PokemonHome/PageView/Page04_Box117_Normal_Grid_R4C2_Frame01.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 4, 2}); + database.add("PokemonHome/PageView/Page04_Box105_Normal_Grid_R2C2_Frame01.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 2, 2}); + database.add("PokemonHome/PageView/Page03_Box069_Normal_Grid_R1C2_Frame01.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 1, 2}); + database.add("PokemonHome/PageView/Page03_Box071_Normal_Grid_R1C4_Frame01.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 1, 4}); + database.add("PokemonHome/PageView/Page02_Box041_Normal_Grid_R1C4_Frame01.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 1, 4}); + database.add("PokemonHome/PageView/Page02_Box059_Normal_Grid_R4C4_Frame01.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 4, 4}); + database.add("PokemonHome/PageView/Page02_Box059_Normal_Grid_R4C4_Frame02.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 4, 4}); + database.add("PokemonHome/PageView/Page01_Box029_Normal_Grid_R4C4_Frame01.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 4, 4}); + database.add("PokemonHome/PageView/Page01_Box028_Normal_Grid_R4C3_Frame01.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 4, 3}); + database.add("PokemonHome/PageView/Page01_Normal_Back_Frame01.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Back}); + database.add("PokemonHome/PageView/Page01_Box027_Normal_Grid_R4C2_Frame01.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 4, 2}); + database.add("PokemonHome/PageView/Page10_Box285_Normal_Grid_R2C2_Frame01.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 2, 2}); + database.add("PokemonHome/PageView/Page10_Box285_Normal_Grid_R2C2_Frame02.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 2, 2}); + database.add("PokemonHome/PageView/Page10_Box285_Normal_Grid_R2C2_Frame03.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 2, 2}); + database.add("PokemonHome/PageView/Page10_Box285_Normal_Grid_R2C2_Frame04.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 2, 2}); + database.add("PokemonHome/PageView/Page10_Box285_Relocate_Grid_R2C2_Frame01.png", BoxSelection{BoxSelectionMode::Relocate, BoxSelectionLocation::Grid, 2, 2}); + database.add("PokemonHome/PageView/Page10_Box287_Relocate_Grid_R2C4_Frame01.png", BoxSelection{BoxSelectionMode::Relocate, BoxSelectionLocation::Grid, 2, 4}); + database.add("PokemonHome/PageView/Page10_Box281_Relocate_Grid_R1C4_Frame01.png", BoxSelection{BoxSelectionMode::Relocate, BoxSelectionLocation::Grid, 1, 4}); + database.add("PokemonHome/PageView/Page01_Box011_Relocate_Grid_R1C4_Frame01.png", BoxSelection{BoxSelectionMode::Relocate, BoxSelectionLocation::Grid, 1, 4}); + database.add("PokemonHome/PageView/Page01_Box011_Relocate_Grid_R1C4_Frame02.png", BoxSelection{BoxSelectionMode::Relocate, BoxSelectionLocation::Grid, 1, 4}); + database.add("PokemonHome/PageView/Page02_Box047_Relocate_Grid_R2C4_Frame01.png", BoxSelection{BoxSelectionMode::Relocate, BoxSelectionLocation::Grid, 2, 4}); + database.add("PokemonHome/PageView/Page02_Box059_Relocate_Grid_R4C4_Frame01.png", BoxSelection{BoxSelectionMode::Relocate, BoxSelectionLocation::Grid, 4, 4}); + database.add("PokemonHome/PageView/Page02_Box059_Relocate_Grid_R4C4_Frame02.png", BoxSelection{BoxSelectionMode::Relocate, BoxSelectionLocation::Grid, 4, 4}); + database.add("PokemonHome/PageView/Page03_Box086_Relocate_Grid_R4C1_Frame01.png", BoxSelection{BoxSelectionMode::Relocate, BoxSelectionLocation::Grid, 4, 1}); + database.add("PokemonHome/PageView/Page03_Relocate_Back_Frame01.png", BoxSelection{BoxSelectionMode::Relocate, BoxSelectionLocation::Back}); + database.add("PokemonHome/PageView/Page03_Relocate_Back_Frame02.png", BoxSelection{BoxSelectionMode::Relocate, BoxSelectionLocation::Back}); + database.add("PokemonHome/PageView/Page03_Relocate_Back_Frame03.png", BoxSelection{BoxSelectionMode::Relocate, BoxSelectionLocation::Back}); + database.add("PokemonHome/PageView/Page03_Multi_Back_Frame01.png", BoxSelection{BoxSelectionMode::Multi, BoxSelectionLocation::Back}); + database.add("PokemonHome/PageView/Page04_Box109_Multi_Grid_R3C0_Frame01.png", BoxSelection{BoxSelectionMode::Multi, BoxSelectionLocation::Grid, 3, 0}); + database.add("PokemonHome/PageView/Page04_Box097_Multi_Grid_R1C0_Frame01.png", BoxSelection{BoxSelectionMode::Multi, BoxSelectionLocation::Grid, 1, 0}); + database.add("PokemonHome/PageView/Page05_Box128_Multi_Grid_R1C1_Frame01.png", BoxSelection{BoxSelectionMode::Multi, BoxSelectionLocation::Grid, 1, 1}); + database.add("PokemonHome/PageView/Page05_Box129_Multi_Grid_R1C2_Frame01.png", BoxSelection{BoxSelectionMode::Multi, BoxSelectionLocation::Grid, 1, 2}); + database.add("PokemonHome/PageView/Page05_Box129_Multi_Grid_R1C2_Frame02.png", BoxSelection{BoxSelectionMode::Multi, BoxSelectionLocation::Grid, 1, 2}); + database.add("PokemonHome/PageView/Page05_Box130_Multi_Grid_R1C3_Frame01.png", BoxSelection{BoxSelectionMode::Multi, BoxSelectionLocation::Grid, 1, 3}); + database.add("PokemonHome/PageView/Page05_Box136_Multi_Grid_R2C3_Frame01.png", BoxSelection{BoxSelectionMode::Multi, BoxSelectionLocation::Grid, 2, 3}); + database.add("PokemonHome/PageView/Page05_Box136_Multi_Grid_R2C3_Frame02.png", BoxSelection{BoxSelectionMode::Multi, BoxSelectionLocation::Grid, 2, 3}); + database.add("PokemonHome/PageView/Page06_Box166_Multi_Grid_R2C3_Frame01.png", BoxSelection{BoxSelectionMode::Multi, BoxSelectionLocation::Grid, 2, 3}); + database.add("PokemonHome/PageView/Page06_Box172_Multi_Grid_R3C3_Frame01.png", BoxSelection{BoxSelectionMode::Multi, BoxSelectionLocation::Grid, 3, 3}); + database.add("PokemonHome/PageView/Page06_Box178_Multi_Grid_R4C3_Frame01.png", BoxSelection{BoxSelectionMode::Multi, BoxSelectionLocation::Grid, 4, 3}); + database.add("PokemonHome/PageView/Page06_Box179_Multi_Grid_R4C4_Frame01.png", BoxSelection{BoxSelectionMode::Multi, BoxSelectionLocation::Grid, 4, 4}); + database.add("PokemonHome/PageView/Page07_Box209_Multi_Grid_R4C4_Frame01.png", BoxSelection{BoxSelectionMode::Multi, BoxSelectionLocation::Grid, 4, 4}); + database.add("PokemonHome/PageView/Page07_Multi_Back_Frame01.png", BoxSelection{BoxSelectionMode::Multi, BoxSelectionLocation::Back}); + database.add("PokemonHome/PageView/Page07_Box196_Multi_Grid_R2C3_Frame01.png", BoxSelection{BoxSelectionMode::Multi, BoxSelectionLocation::Grid, 2, 3}); + database.add("PokemonHome/PageView/Page07_Box195_Multi_Grid_R2C2_Frame01.png", BoxSelection{BoxSelectionMode::Multi, BoxSelectionLocation::Grid, 2, 2}); + database.add("PokemonHome/PageView/Page08_Box226_Multi_Grid_R2C3_Frame01.png", BoxSelection{BoxSelectionMode::Multi, BoxSelectionLocation::Grid, 2, 3}); + database.add("PokemonHome/PageView/Page09_Box256_Multi_Grid_R2C3_Frame01.png", BoxSelection{BoxSelectionMode::Multi, BoxSelectionLocation::Grid, 2, 3}); + database.add("PokemonHome/PageView/Page09_Box262_Multi_Grid_R3C3_Frame01.png", BoxSelection{BoxSelectionMode::Multi, BoxSelectionLocation::Grid, 3, 3}); + database.add("PokemonHome/PageView/Page09_Box262_Multi_Grid_R3C3_Frame02.png", BoxSelection{BoxSelectionMode::Multi, BoxSelectionLocation::Grid, 3, 3}); + database.add("PokemonHome/PageView/Page09_Box262_Multi_Grid_R3C3_Frame03.png", BoxSelection{BoxSelectionMode::Multi, BoxSelectionLocation::Grid, 3, 3}); + database.add("PokemonHome/PageView/Page09_Box262_Normal_Grid_R3C3_Frame01.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 3, 3}); + database.add("PokemonHome/PageView/Page09_Box262_Multi_Grid_R3C3_Frame04.png", BoxSelection{BoxSelectionMode::Multi, BoxSelectionLocation::Grid, 3, 3}); + database.add("PokemonHome/PageView/Page09_Box260_Normal_Grid_R3C1_Frame01.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 3, 1}); + database.add("PokemonHome/PageView/Page09_Box254_Normal_Grid_R2C1_Frame01.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 2, 1}); + database.add("PokemonHome/PageView/Page09_Box247_Normal_Grid_R1C0_Frame01.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 1, 0}); + database.add("PokemonHome/PageView/Page08_Box223_Normal_Grid_R2C0_Frame01.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 2, 0}); + database.add("PokemonHome/PageView/Page07_Box193_Normal_Grid_R2C0_Frame01.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 2, 0}); + database.add("PokemonHome/PageView/Page07_Box199_Normal_Grid_R3C0_Frame01.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 3, 0}); + database.add("PokemonHome/PageView/Page08_Box235_Relocate_Grid_R4C0_Frame01.png", BoxSelection{BoxSelectionMode::Relocate, BoxSelectionLocation::Grid, 4, 0}); + database.add("PokemonHome/PageView/Page08_Box235_Relocate_Grid_R4C0_Frame02.png", BoxSelection{BoxSelectionMode::Relocate, BoxSelectionLocation::Grid, 4, 0}); + database.add("PokemonHome/PageView/Page08_Box235_Relocate_Grid_R4C0_Frame03.png", BoxSelection{BoxSelectionMode::Relocate, BoxSelectionLocation::Grid, 4, 0}); + database.add("PokemonHome/PageView/Page08_Box235_Relocate_Grid_R4C0_Frame04.png", BoxSelection{BoxSelectionMode::Relocate, BoxSelectionLocation::Grid, 4, 0}); + database.add("PokemonHome/PageView/Page08_Box235_Relocate_Grid_R4C0_Frame05.png", BoxSelection{BoxSelectionMode::Relocate, BoxSelectionLocation::Grid, 4, 0}); + database.add("PokemonHome/PageView/Page08_Box236_Relocate_Grid_R4C1_Frame01.png", BoxSelection{BoxSelectionMode::Relocate, BoxSelectionLocation::Grid, 4, 1}); + database.add("PokemonHome/PageView/Page08_Box238_Relocate_Grid_R4C3_Frame01.png", BoxSelection{BoxSelectionMode::Relocate, BoxSelectionLocation::Grid, 4, 3}); + database.add("PokemonHome/PageView/Page08_Relocate_Back_Frame01.png", BoxSelection{BoxSelectionMode::Relocate, BoxSelectionLocation::Back}); + database.add("PokemonHome/PageView/Page08_Relocate_Back_Frame02.png", BoxSelection{BoxSelectionMode::Relocate, BoxSelectionLocation::Back}); + database.add("PokemonHome/PageView/Page07_Box208_Relocate_Grid_R4C3_Frame01.png", BoxSelection{BoxSelectionMode::Relocate, BoxSelectionLocation::Grid, 4, 3}); + database.add("PokemonHome/PageView/Page07_Box195_Relocate_Grid_R2C2_Frame01.png", BoxSelection{BoxSelectionMode::Relocate, BoxSelectionLocation::Grid, 2, 2}); + database.add("PokemonHome/PageView/Page07_Box189_Relocate_Grid_R1C2_Frame01.png", BoxSelection{BoxSelectionMode::Relocate, BoxSelectionLocation::Grid, 1, 2}); + database.add("PokemonHome/PageView/Page07_Box187_Relocate_Grid_R1C0_Frame01.png", BoxSelection{BoxSelectionMode::Relocate, BoxSelectionLocation::Grid, 1, 0}); + database.add("PokemonHome/PageView/Page06_Box163_Relocate_Grid_R2C0_Frame01.png", BoxSelection{BoxSelectionMode::Relocate, BoxSelectionLocation::Grid, 2, 0}); + database.add("PokemonHome/PageView/Page06_Relocate_Back_Frame01.png", BoxSelection{BoxSelectionMode::Relocate, BoxSelectionLocation::Back}); + database.add("PokemonHome/PageView/Page06_Box175_Relocate_Grid_R4C0_Frame01.png", BoxSelection{BoxSelectionMode::Relocate, BoxSelectionLocation::Grid, 4, 0}); + database.add("PokemonHome/PageView/Page06_Box178_Relocate_Grid_R4C3_Frame01.png", BoxSelection{BoxSelectionMode::Relocate, BoxSelectionLocation::Grid, 4, 3}); + database.add("PokemonHome/PageView/Page05_Box148_Multi_Grid_R4C3_Frame01.png", BoxSelection{BoxSelectionMode::Multi, BoxSelectionLocation::Grid, 4, 3}); + database.add("PokemonHome/PageView/Page05_Box142_Multi_Grid_R3C3_Frame01.png", BoxSelection{BoxSelectionMode::Multi, BoxSelectionLocation::Grid, 3, 3}); + database.add("PokemonHome/PageView/Page05_Box134_Multi_Grid_R2C1_Frame01.png", BoxSelection{BoxSelectionMode::Multi, BoxSelectionLocation::Grid, 2, 1}); + database.add("PokemonHome/PageView/Page05_Box134_Multi_Grid_R2C1_Frame02.png", BoxSelection{BoxSelectionMode::Multi, BoxSelectionLocation::Grid, 2, 1}); + database.add("PokemonHome/PageView/Page04_Box119_Multi_Grid_R4C4_Frame01.png", BoxSelection{BoxSelectionMode::Multi, BoxSelectionLocation::Grid, 4, 4}); + database.add("PokemonHome/PageView/Page05_Box150_Normal_Grid_R4C5_Frame01.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 4, 5}); + database.add("PokemonHome/PageView/Page05_Box138_Normal_Grid_R2C5_Frame01.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 2, 5}); + database.add("PokemonHome/PageView/Page05_Box132_Normal_Grid_R1C5_Frame01.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 1, 5}); + database.add("PokemonHome/PageView/Page06_Box162_Normal_Grid_R1C5_Frame01.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 1, 5}); + database.add("PokemonHome/PageView/Page07_Box192_Normal_Grid_R1C5_Frame01.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 1, 5}); database.add("PokemonHome/BoxView/BoxView-1.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 0, 3}); database.add("PokemonHome/BoxView/SelectionArrow_Normal_Grid_Row0_Column0_02.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 0, 0}); database.add("PokemonHome/BoxView/SelectionArrow_Normal_Grid_Row0_Column0_01.png", BoxSelection{BoxSelectionMode::Normal, BoxSelectionLocation::Grid, 0, 0}); diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.h b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.h index 593ba3b01a..ce7ead525b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.h +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.h @@ -28,6 +28,7 @@ enum class BoxSelectionLocation{ BoxName, BoxSpaces, Newest30, + Back, }; struct BoxSelection{ diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Tests.cpp index 0f5ea22ebe..cb0c1c7c04 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Tests.cpp @@ -9,10 +9,12 @@ #include "Inference/PokemonHome_BallReader.h" #include "Inference/PokemonHome_BoxGenderDetector.h" #include "Inference/PokemonHome_BoxNumberReader.h" +#include "Inference/PokemonHome_BoxSpacesReader.h" #include "Inference/PokemonHome_BoxViewDetector.h" #include "Inference/PokemonHome_ButtonDetector.h" #include "Inference/PokemonHome_GigantamaxDetector.h" #include "Inference/PokemonHome_OriginMarkReader.h" +#include "Inference/PokemonHome_PageViewDetector.h" #include "Inference/PokemonHome_SelectionArrowDetector.h" #include "Inference/PokemonHome_ShinyDetector.h" #include "Inference/PokemonHome_SummaryReader.h" @@ -31,11 +33,13 @@ void add_tests(UnitTestDatabase& database){ add_tests_BallReader(database); add_tests_BoxGenderDetector(database); add_tests_BoxNumberReader(database); + add_tests_BoxSpacesReader(database); add_tests_BoxViewDetector(database); add_tests_ButtonDetector(database); add_tests_GigantamaxDetector(database); add_tests_LivingDexTemplate(database); add_tests_OriginMarkReader(database); + add_tests_PageViewDetector(database); add_tests_SelectionArrowDetector(database); add_tests_ShinyDetector(database); add_tests_SummaryReader(database); diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_TestDatabaseGenerator.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_TestDatabaseGenerator.cpp index 33b2cbf051..7a2e26abeb 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_TestDatabaseGenerator.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_TestDatabaseGenerator.cpp @@ -114,6 +114,9 @@ namespace{ case BoxSelectionLocation::Newest30: location = "Newest30"; break; + case BoxSelectionLocation::Back: + location = "Back"; + break; } return "BoxSelection{BoxSelectionMode::" + mode + ", BoxSelectionLocation::" + location + ", " + std::to_string(arrow->row) + ", " + std::to_string(arrow->column) + "}"; diff --git a/SerialPrograms/cmake/SourceFiles.cmake b/SerialPrograms/cmake/SourceFiles.cmake index 03a76d8719..3be8fccc4f 100644 --- a/SerialPrograms/cmake/SourceFiles.cmake +++ b/SerialPrograms/cmake/SourceFiles.cmake @@ -1871,6 +1871,8 @@ file(GLOB LIBRARY_SOURCES Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxGenderDetector.h Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxNumberReader.cpp Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxNumberReader.h + Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxSpacesReader.cpp + Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxSpacesReader.h Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxViewDetector.cpp Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxViewDetector.h Source/VideoGames/PokemonHome/Inference/PokemonHome_ButtonDetector.cpp @@ -1879,6 +1881,8 @@ file(GLOB LIBRARY_SOURCES Source/VideoGames/PokemonHome/Inference/PokemonHome_GigantamaxDetector.h Source/VideoGames/PokemonHome/Inference/PokemonHome_OriginMarkReader.cpp Source/VideoGames/PokemonHome/Inference/PokemonHome_OriginMarkReader.h + Source/VideoGames/PokemonHome/Inference/PokemonHome_PageViewDetector.cpp + Source/VideoGames/PokemonHome/Inference/PokemonHome_PageViewDetector.h Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.cpp Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.h Source/VideoGames/PokemonHome/Inference/PokemonHome_ShinyDetector.cpp