add home button + detector

Author: Gin

SerialPrograms/Source/PokemonHome/Inference/PokemonHome_ButtonDetector.cpp

@@ -28,7 +28,11 @@ class ButtonMatcher : public ImageMatch::WaterfillTemplateMatcher{
     ButtonMatcher(ButtonType type, size_t min_width, size_t min_height, double max_rmsd);
 
     static const ButtonMatcher& B(){
-        static ButtonMatcher matcher(ButtonType::ButtonB, 25, 25, 70);
+        static ButtonMatcher matcher(ButtonType::ButtonB, 25, 25, 80);
+        return matcher;
+    }
+    static const ButtonMatcher& Plus(){
+        static ButtonMatcher matcher(ButtonType::ButtonPlus, 25, 25, 80);
         return matcher;
     }
 
@@ -55,7 +59,9 @@ class ButtonMatcher : public ImageMatch::WaterfillTemplateMatcher{
 const char* template_path(ButtonType type){
     switch (type){
     case ButtonType::ButtonB:
-        return "PokemonHome/Buttons/ButtonB.png";
+        return "PokemonHome/Buttons/ButtonB-Template.png";
+    case ButtonType::ButtonPlus:
+        return "PokemonHome/Buttons/ButtonPlus-Template.png";
     default:
         return "";
     }
@@ -65,6 +71,8 @@ const char* button_name(ButtonType type){
     switch (type){
     case ButtonType::ButtonB:
         return "ButtonB";
+    case ButtonType::ButtonPlus:
+        return "ButtonPlus";
     default:
         return "";
     }
@@ -74,6 +82,8 @@ const ButtonMatcher& get_button_matcher(ButtonType type){
     switch (type){
     case ButtonType::ButtonB:
         return ButtonMatcher::B();
+    case ButtonType::ButtonPlus:
+        return ButtonMatcher::Plus();
     default:
         throw std::runtime_error("No corresponding ButtonMatcher for ButtonType");
     }
@@ -146,16 +156,26 @@ bool ButtonDetector::detect(const ImageViewRGB32& screen){
 }
 
 
+BoxViewDetector::BoxViewDetector(VideoOverlay* overlay) : m_button_plus_detector(COLOR_BLACK, ButtonType::ButtonPlus, {0.100, 0.956, 0.107, 0.041}, overlay){}
 
+void BoxViewDetector::make_overlays(VideoOverlaySet& items) const{
+    m_button_plus_detector.make_overlays(items);
+}
 
+bool BoxViewDetector::detect(const ImageViewRGB32& screen){
+    return m_button_plus_detector.detect(screen);
+}
 
 
+SummaryScreenDetector::SummaryScreenDetector(VideoOverlay* overlay) : m_button_B_detector(COLOR_BLACK, ButtonType::ButtonB, {0.100, 0.956, 0.107, 0.041}, overlay){}
 
+void SummaryScreenDetector::make_overlays(VideoOverlaySet& items) const{
+    m_button_B_detector.make_overlays(items);
+}
 
-
-
-
-
+bool SummaryScreenDetector::detect(const ImageViewRGB32& screen){
+    return m_button_B_detector.detect(screen);
+}
 
 
 

SerialPrograms/Source/PokemonHome/Inference/PokemonHome_ButtonDetector.h

@@ -20,6 +20,7 @@ namespace PokemonHome{
 
 enum class ButtonType{
     ButtonB,
+    ButtonPlus,
 };
 
 class ButtonMatcher;
@@ -56,13 +57,53 @@ class ButtonWatcher : public DetectorToFinder<ButtonDetector>{
         ButtonType button_type,
         const ImageFloatBox& box,
         VideoOverlay* overlay = nullptr,
-        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+        Milliseconds hold_duration = Milliseconds(50)
     )
          : DetectorToFinder("ButtonWatcher", hold_duration, color, button_type, box, overlay)
     {}
 };
 
 
+class BoxViewDetector : public StaticScreenDetector{
+public:
+    BoxViewDetector(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:
+    ButtonDetector m_button_plus_detector;
+
+};
+class BoxViewWatcher : public DetectorToFinder<BoxViewDetector>{
+public:
+    BoxViewWatcher(VideoOverlay* overlay = nullptr)
+        : DetectorToFinder("BoxViewWatcher", Milliseconds(100), overlay)
+    {}
+};
+
+
+class SummaryScreenDetector : public StaticScreenDetector{
+public:
+    SummaryScreenDetector(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_B_detector.reset_state(); }
+
+private:
+    ButtonDetector m_button_B_detector;
+
+};
+class SummaryScreenWatcher : public DetectorToFinder<SummaryScreenDetector>{
+public:
+    SummaryScreenWatcher(VideoOverlay* overlay = nullptr)
+        : DetectorToFinder("SummaryScreenWatcher", Milliseconds(100), overlay)
+    {}
+};
 
 
 

SerialPrograms/Source/Tests/PokemonHome_Tests.cpp

@@ -5,7 +5,7 @@
  */
 
 
-#include "Common/Compiler.h"
+#include "PokemonHome/Inference/PokemonHome_ButtonDetector.h"
 #include "PokemonHome_Tests.h"
 #include "TestUtils.h"
 
@@ -16,14 +16,28 @@ using std::endl;
 
 namespace PokemonAutomation{
 
+using namespace NintendoSwitch;
+using namespace NintendoSwitch::PokemonHome;
 
 int test_pokemonHome_BoxView(const ImageViewRGB32& image, const std::vector<std::string>& keywords){
-    // TODO: Implement test
+    SummaryScreenDetector summary_screen_detector;
+    bool result = summary_screen_detector.detect(image);
+    TEST_RESULT_EQUAL(result, false);
+
+    BoxViewDetector box_view_detector;
+    result = box_view_detector.detect(image);
+    TEST_RESULT_EQUAL(result, true);
     return 0;
 }
 
 int test_pokemonHome_SummaryScreen(const ImageViewRGB32& image, const std::vector<std::string>& keywords){
-    // TODO: Implement test
+    SummaryScreenDetector summary_screen_detector;
+    bool result = summary_screen_detector.detect(image);
+    TEST_RESULT_EQUAL(result, true);
+
+    BoxViewDetector box_view_detector;
+    result = box_view_detector.detect(image);
+    TEST_RESULT_EQUAL(result, false);
     return 0;
 }
 

SerialPrograms/Source/Tests/PokemonLZA_Tests.cpp

@@ -4,8 +4,6 @@
 *
 */
 
-#include "PokemonLZA_Tests.h"
-#include "TestUtils.h"
 #include "Common/Cpp/Time.h"
 #include "CommonFramework/Logging/Logger.h"
 #include "PokemonLZA/Inference/PokemonLZA_DialogDetector.h"
@@ -20,6 +18,8 @@
 #include "PokemonLZA/Inference/Map/PokemonLZA_DirectionArrowDetector.h"
 #include "PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "PokemonLZA_Tests.h"
+#include "TestUtils.h"
 #include <iostream>
 #include <fstream>
 #include <map>