Fix ArcPhoneDetector.

Author: Mysticial

SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Types.h

@@ -9,8 +9,6 @@
 
 #include <stddef.h>
 #include <stdint.h>
-//#include <map>
-//#include <iostream>
 #include "Common/Cpp/Rectangle.h"
 #include "Kernels/BinaryMatrix/Kernels_BinaryMatrix.h"
 

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -15,6 +15,7 @@
 #include "Common/Cpp/Concurrency/AsyncDispatcher.h"
 #include "Common/Cpp/Concurrency/PeriodicScheduler.h"
 #include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonTools/Async/InferenceRoutines.h"
 #include "CommonTools/OCR/OCR_RawOCR.h"
 #include "PokemonLA/Inference/PokemonLA_MountDetector.h"
 #include "Pokemon/Pokemon_Strings.h"
@@ -302,8 +303,8 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     using namespace Pokemon;
     using namespace PokemonSwSh;
 //    using namespace PokemonBDSP;
-//    using namespace PokemonLA;
-    using namespace PokemonSV;
+    using namespace PokemonLA;
+//    using namespace PokemonSV;
 
     [[maybe_unused]] Logger& logger = env.logger();
     [[maybe_unused]] ConsoleHandle& console = env.consoles[0];
@@ -315,7 +316,25 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 
 //    std::terminate();
 
-#if 1
+
+    ImageRGB32 image("20250404-154507236508.png");
+
+    ArcPhoneDetector phone(logger, overlay, std::chrono::milliseconds(250), true);
+
+    while (true){
+        cout << phone.process_frame(image, current_time()) << endl;
+        scope.wait_for(100ms);
+    }
+
+#if 0
+    wait_until(
+        console, context,
+        10000ms,
+        {phone}
+    );
+#endif
+
+#if 0
     // ImageRGB32 image(IMAGE_PATH);
     auto image = feed.snapshot();
 

SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.cpp

@@ -37,6 +37,10 @@ ArcPhoneTracker::ArcPhoneTracker()
             Color(0xff909090),
             Color(0xffa0a0a0),
             Color(0xffb0b0b0),
+            Color(0xffc0c0c0),
+            Color(0xffd0d0d0),
+            Color(0xffe0e0e0),
+            Color(0xfff0f0f0),
         }
     )
 {}
@@ -45,9 +49,9 @@ void ArcPhoneTracker::process_object(const ImageViewRGB32& image, const Waterfil
 //    cout << "asdf" << endl;
 //    static int c = 0;
 //    cout << "c = " << c << endl;
-//    extract_box_reference(image, object).save("test-" + std::to_string(c++) + ".png");
+//    extract_box_reference(image, object).save("testA-" + std::to_string(c++) + ".png");
 //    image.save("test-" + std::to_string(c++) + "-A.png");
-//    extract_box(image, object).save("test-" + std::to_string(c++) + "-B.png");
+//    extract_box_reference(image, object).save("testB-" + std::to_string(c++) + ".png");
 
     double width = (double)object.width() / image.width();
     if (width < 0.40 || width > 0.50){
@@ -65,6 +69,8 @@ void ArcPhoneTracker::process_object(const ImageViewRGB32& image, const Waterfil
     }
 }
 void ArcPhoneTracker::finish(const ImageViewRGB32& image){
+//    static int count = 0;
+//    image.save("test0-" + std::to_string(count++) + ".png");
     merge_heavily_overlapping();
 }
 
@@ -114,9 +120,12 @@ void ArcPhoneDetector::make_overlays(VideoOverlaySet& items) const{
 }
 bool ArcPhoneDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
     m_watcher.process_frame(frame, timestamp);
+//    cout << "White Objects = " << m_tracker_phone.detections().size() << endl;
     bool detected0 = m_debouncer_phone.push_value(!m_tracker_phone.detections().empty(), timestamp);
     bool detected1 = m_debouncer_button.push_value(!m_tracker_phone.detections().empty(), timestamp);
 
+//    cout << detected0 << ", " << detected1 << endl;
+
 #if 0
     if (detected){
         static size_t c = 0;

SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_WhiteObjectDetector.cpp

@@ -37,6 +37,7 @@ void find_overworld_white_objects(
 //    }
 //    compress_rgb32_to_binary_range(image, filters.data(), filters.size());
 
+//    static int count = 0;
     {
         std::vector<std::pair<uint32_t, uint32_t>> filters;
         for (Color filter : threshold_set){
@@ -47,13 +48,17 @@ void find_overworld_white_objects(
 #if 1
         std::unique_ptr<WaterfillSession> session = make_WaterfillSession();
         for (size_t c = 0; c < filters.size(); c++){
+
+//            cout << "filter[" << c << "] = " << filters[c].first << endl;
 //            cout << matrix[c].width() << " x " << matrix[c].height() << endl;
 //            cout << matrix[c].dump() << endl;
             session->set_source(matrix[c]);
             auto finder = session->make_iterator(50);
             WaterfillObject object;
             while (finder->find_next(object, false)){
 //                cout << object.area << endl;
+//                cout << matrix[c].submatrix(object.min_x, object.min_y, object.width(), object.height()).dump() << endl;
+//                extract_box_reference(image, object).save("test-" + std::to_string(count++) + "-" + std::to_string(c) + ".png");
                 for (const auto& detector : detectors){
                     const std::set<Color>& thresholds = detector.first.thresholds();
                     if (thresholds.find((Color)filters[c].first) != thresholds.end()){