Add time tolerance to Rotom menu detection.

Author: Mysticial

SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.cpp

@@ -197,16 +197,26 @@ RotomPhoneMenuArrowFinder::RotomPhoneMenuArrowFinder(VideoOverlay& overlay)
     }
 }
 
-int RotomPhoneMenuArrowFinder::detect(const ImageViewRGB32& screen){
+void RotomPhoneMenuArrowFinder::make_overlays(VideoOverlaySet& items) const{
+
+}
+bool RotomPhoneMenuArrowFinder::detect(const ImageViewRGB32& screen){
+    return detect_index(screen) >= 0;
+}
+
+int RotomPhoneMenuArrowFinder::detect_index(const ImageViewRGB32& screen){
     const double screen_scale = screen.height() / 1080.0;
     const size_t min_arrow_area = size_t(1400 * screen_scale * screen_scale);
     for (size_t i_row = 0; i_row < 2; i_row++){
         for (size_t j_col = 0; j_col < 5; j_col++){
             ImageFloatBox box(0.047 + j_col*0.183, 0.175 + 0.333*i_row, 0.059, 0.104);
             std::vector<ImagePixelBox> arrows = find_selection_arrows(
-                extract_box_reference(screen, box), min_arrow_area);
+                extract_box_reference(screen, box),
+                min_arrow_area
+            );
             if (arrows.size() > 0){
-                return (int)(i_row * 5 + j_col);
+                m_index = (int)(i_row * 5 + j_col);
+                return m_index;
             }
         }
     }

SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h

@@ -11,6 +11,7 @@
 #include <deque>
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
 #include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -77,18 +78,33 @@ class StoragePokemonMenuArrowFinder : public SelectionArrowFinder{
 };
 
 // The arrow that points to one of the ten apps on Rotom Phone menu
-class RotomPhoneMenuArrowFinder{
+class RotomPhoneMenuArrowFinder : public StaticScreenDetector{
 public:
     RotomPhoneMenuArrowFinder(VideoOverlay& overlay);
 
+    int current_index() const{
+        return m_index;
+    }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
     // Detect which app is selected by the arrow. Return the index of the app
     // The order is: from top to bottom, from left to right.
     // If no arrow found, return -1.
-    int detect(const ImageViewRGB32& screen);
+    int detect_index(const ImageViewRGB32& screen);
 
 private:
     VideoOverlaySet m_overlay_set;
+    int m_index = -1;
 };
+class RotomPhoneMenuArrowWatcher : public DetectorToFinder<RotomPhoneMenuArrowFinder>{
+public:
+    RotomPhoneMenuArrowWatcher(VideoOverlay& overlay)
+         : DetectorToFinder("RotomPhoneMenuArrowWatcher", std::chrono::milliseconds(250), overlay)
+    {}
+};
+
 
 
 }

SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.cpp

@@ -7,7 +7,8 @@
 
 #include "CommonFramework/Exceptions/OperationFailedException.h"
 #include "CommonFramework/Tools/ErrorDumper.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
+//#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
 #include "PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h"
 #include "PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.h"
 #include "PokemonSwSh_MenuNavigation.h"
@@ -24,15 +25,18 @@ void navigate_to_menu_app(
     EventNotificationOption& notification_option
 ){
     context.wait_for_all_requests();
-    RotomPhoneMenuArrowFinder menu_arrow_detector(stream.overlay());
-    auto snapshot = stream.video().snapshot();
-    const int cur_app_index = menu_arrow_detector.detect(snapshot);
+    RotomPhoneMenuArrowWatcher menu_arrow(stream.overlay());
+    wait_until(
+        stream, context,
+        5000ms,
+        {menu_arrow}
+    );
+    const int cur_app_index = menu_arrow.current_index();
     if (cur_app_index < 0){
         OperationFailedException::fire(
             ErrorReport::SEND_ERROR_REPORT,
             "Cannot detect Rotom phone menu.",
-            stream,
-            std::move(snapshot)
+            stream
         );
     }
     stream.log("Detect menu cursor at " + std::to_string(cur_app_index) + ".");