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/PokemonHome_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Tests.cpp index 0f5ea22ebe..d1fe5fc5b8 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Tests.cpp @@ -13,6 +13,7 @@ #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" @@ -36,6 +37,7 @@ void add_tests(UnitTestDatabase& 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/cmake/SourceFiles.cmake b/SerialPrograms/cmake/SourceFiles.cmake index 03a76d8719..96ad8d003a 100644 --- a/SerialPrograms/cmake/SourceFiles.cmake +++ b/SerialPrograms/cmake/SourceFiles.cmake @@ -1879,6 +1879,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