From b0c1edeae4f18da63f0066bdbd9d0ea0351b2c67 Mon Sep 17 00:00:00 2001 From: Dalton-V Date: Mon, 9 Nov 2026 20:54:37 -0600 Subject: [PATCH] More selection arrow tests --- .../PokemonHome_SelectionArrowDetector.cpp | 91 +++++++++++++++++++ .../PokemonHome_SelectionArrowDetector.h | 1 + .../PokemonHome_TestDatabaseGenerator.cpp | 3 + 3 files changed, 95 insertions(+) diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.cpp index c7aad61df6..eadffe8784 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.cpp @@ -13,6 +13,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{ @@ -119,6 +120,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; } @@ -157,6 +160,9 @@ std::optional SelectionArrowDetector::detect(const ImageViewRGB32& } ); } + if (best && best->location == BoxSelectionLocation::BoxSpaces && PageViewDetector().detect(screen)){ + best->location = BoxSelectionLocation::Back; + } return best; } @@ -201,6 +207,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/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) + "}";