Improve Y-COMM symbol detector.

Author: Mysticial

SerialPrograms/Source/CommonTools/Images/WaterfillUtilities.cpp

@@ -18,6 +18,8 @@
 #include "WaterfillUtilities.h"
 
 #include <iostream>
+//using std::cout;
+//using std::endl;
 
 
 namespace PokemonAutomation{
@@ -96,6 +98,7 @@ bool match_template_by_waterfill(
         std::cout << ")" << std::endl;
     }
     std::vector<PokemonAutomation::PackedBinaryMatrix> matrices = compress_rgb32_to_binary_range(image, filters);
+//    cout << matrices.size() << endl;
 
     bool detected = false;
     bool stop_match = false;
@@ -116,10 +119,12 @@ bool match_template_by_waterfill(
         std::unique_ptr<Kernels::Waterfill::WaterfillSession> session = Kernels::Waterfill::make_WaterfillSession();
         Kernels::Waterfill::WaterfillObject object;
         const size_t min_area = area_thresholds.first;
+//        cout << "min_area = " << min_area << endl;
         session->set_source(matrix);
         auto finder = session->make_iterator(min_area);
         const bool keep_object_matrix = false;
         while (finder->find_next(object, keep_object_matrix)){
+//            cout << "object.area = " << object.area << endl;
             if (PreloadSettings::debug().IMAGE_TEMPLATE_MATCHING){
                 std::cout << "------------" << std::endl;
                 std::cout << "Object area: " << object.area << std::endl;

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -258,6 +258,12 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 
 
 
+    auto screenshot = feed.snapshot();
+
+    YCommIconDetector detector(true);
+    cout << detector.process_frame(screenshot, current_time()) << endl;
+
+
 #if 0
     bool switch2 = true;
     ImageFloatBox key1_box; 

SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.cpp

@@ -97,11 +97,12 @@ void YCommIconDetector::make_overlays(VideoOverlaySet& items) const{
 bool YCommIconDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
 
     const std::vector<std::pair<uint32_t, uint32_t>> filters = {
-        {combine_rgb(0, 0, 150), combine_rgb(100, 100, 255)}
+        {combine_rgb(0, 0, 150), combine_rgb(100, 100, 255)},
+        {combine_rgb(0, 0, 150), combine_rgb(127, 127, 255)},
+        {combine_rgb(0, 0, 150), combine_rgb(191, 191, 255)},
     };
 
-    const double screen_rel_size = (frame.height() / 1080.0);
-    const size_t min_size = size_t(screen_rel_size * screen_rel_size * 350.0);
+    const size_t min_size = (size_t)(350. * frame.total_pixels() / (1920 * 1080.));
 
     const bool detected = match_template_by_waterfill(
         extract_box_reference(frame, YCOMM_ICON_BOX),