Migrate BDSP dialog detector to use watcher. Require multiple frames before returning true.

Author: Mysticial

SerialPrograms/Source/CommonFramework/Globals.cpp

@@ -26,7 +26,7 @@ namespace PokemonAutomation{
 const bool IS_BETA_VERSION = true;
 const int PROGRAM_VERSION_MAJOR = 0;
 const int PROGRAM_VERSION_MINOR = 54;
-const int PROGRAM_VERSION_PATCH = 18;
+const int PROGRAM_VERSION_PATCH = 19;
 
 const std::string PROGRAM_VERSION_BASE =
     "v" + std::to_string(PROGRAM_VERSION_MAJOR) +

SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_DialogDetector.cpp

@@ -59,17 +59,6 @@ bool ShortDialogDetector::detect(const ImageViewRGB32& screen){
 }
 
 
-ShortDialogWatcher::ShortDialogWatcher(Color color)
-    : ShortDialogDetector(color)
-    , VisualInferenceCallback("ShortDialogWatcher")
-{}
-void ShortDialogWatcher::make_overlays(VideoOverlaySet& items) const{
-    ShortDialogDetector::make_overlays(items);
-}
-bool ShortDialogWatcher::process_frame(const ImageViewRGB32& frame, WallClock){
-    return detect(frame);
-}
-
 
 
 

SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_DialogDetector.h

@@ -33,12 +33,11 @@ class ShortDialogDetector : public StaticScreenDetector{
     ImageFloatBox m_right_white;
     ImageFloatBox m_right;
 };
-class ShortDialogWatcher : public ShortDialogDetector, public VisualInferenceCallback{
+class ShortDialogWatcher : public DetectorToFinder<ShortDialogDetector>{
 public:
-    ShortDialogWatcher(Color color = COLOR_RED);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+    ShortDialogWatcher(Color color = COLOR_RED)
+        : DetectorToFinder("ShortDialogWatcher", std::chrono::milliseconds(250), color)
+    {}
 };