Selection arrow can be right or down.

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -293,16 +293,39 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 #endif
 
 
-#if 0
-    ImageRGB32 image("Screenshots/screenshot-20251012-174842583706.png");
+#if 1
+//    ImageRGB32 image("Screenshots/screenshot-20251012-174842583706.png");
 
-    ImageFloatBox box(0.724479, 0.869141, 0.039517, 0.070312);
+    auto screen = feed.snapshot();
+
+    ImageFloatBox box(0.763359, 0.089320, 0.021810, 0.044660);
 //    ImageFloatBox box(0.712404, 0.589844, 0.043908, 0.085938);
 
     overlays.add(COLOR_RED, box);
 
-    ImageViewRGB32 cropped = extract_box_reference(image, box);
+    ImageViewRGB32 cropped = extract_box_reference(screen, box);
+
+    //  Remove background.
+    {
+        PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(
+            cropped,
+            0xffe0e0e0, 0xffffffff
+        );
+        matrix.invert();
+
+        cout << matrix.dump() << endl;
+
+        auto session = Waterfill::make_WaterfillSession(matrix);
+        auto iter = session->make_iterator(10);
+        WaterfillObject object;
+        iter->find_next(object, true);
+        ImageRGB32 masked = extract_box_reference(cropped, object).copy();
+        filter_by_mask(object.packed_matrix(), masked, Color(0x00000000), false);
+        masked.save("ButtonL.png");
+    }
+
 
+#if 0
     PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(
         cropped,
         0xffc0c0c0, 0xffffffff
@@ -311,15 +334,16 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     cout << matrix.dump() << endl;
 
     ImageRGB32 tmp = cropped.copy();
-    filter_by_mask(matrix, tmp, Color(0x00000000), true);
+//    filter_by_mask(matrix, tmp, Color(0x00000000), true);
+
+    {
+    }
 
-#if 1
     auto session = Waterfill::make_WaterfillSession(matrix);
     auto iter = session->make_iterator(10);
     WaterfillObject object;
     while (iter->find_next(object, false)){
-
-
+        break;
     }
     cout << "area = " << object.area << endl;
 
@@ -335,7 +359,7 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 
 //    reset_game_to_gamemenu(console, context);
 
-#if 1
+#if 0
     while (true){
         go_home(console, context);
         PokemonLZA::reset_game_from_home(env, console, context, true);

SerialPrograms/Source/PanelLists.cpp

@@ -41,10 +41,10 @@ ProgramSelect::ProgramSelect(QWidget& parent, PanelHolder& holder)
     QVBoxLayout* layout = new QVBoxLayout(this);
     layout->setAlignment(Qt::AlignTop);
     m_dropdown = new NoWheelComboBox(this);
+    m_dropdown->setMaxVisibleItems(20);
     layout->addWidget(m_dropdown);
 
 
-
     add(std::make_unique<NintendoSwitch::PanelListFactory>());
     add(std::make_unique<NintendoSwitch::PokemonHome::PanelListFactory>());
     add(std::make_unique<NintendoSwitch::PokemonLGPE::PanelListFactory>());

SerialPrograms/Source/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.cpp

@@ -4,6 +4,7 @@
  *
  */
 
+#include "Common/Cpp/Exceptions.h"
 #include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
 #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
 #include "CommonTools/Images/WaterfillUtilities.h"
@@ -19,9 +20,9 @@ class SelectionArrowMatcher : public ImageMatch::WaterfillTemplateMatcher{
 public:
     // The white background for the template file is of color range [r=240, g=255, b=230] to [255, 255, 255]
     // the black arrow color is about [r=36,g=38,b=51]
-    SelectionArrowMatcher()
+    SelectionArrowMatcher(const char* path)
         : WaterfillTemplateMatcher(
-            "PokemonLZA/SelectionArrow-full.png",
+            path,
             Color(0xff80c000), Color(0xffffff7f), 100
         )
     {
@@ -31,8 +32,22 @@ class SelectionArrowMatcher : public ImageMatch::WaterfillTemplateMatcher{
         m_area_ratio_upper = 1.1;
     }
 
-    static const ImageMatch::WaterfillTemplateMatcher& instance() {
-        static SelectionArrowMatcher matcher;
+    static const SelectionArrowMatcher& matcher(SelectionArrowType type){
+        switch (type){
+        case SelectionArrowType::RIGHT:
+            return RIGHT_ARROW();
+        case SelectionArrowType::DOWN:
+            return DOWN_ARROW();
+        default:
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid enum.");
+        }
+    }
+    static const SelectionArrowMatcher& RIGHT_ARROW(){
+        static SelectionArrowMatcher matcher("PokemonLZA/SelectionArrowRight.png");
+        return matcher;
+    }
+    static const SelectionArrowMatcher& DOWN_ARROW(){
+        static SelectionArrowMatcher matcher("PokemonLZA/SelectionArrowDown.png");
         return matcher;
     }
 };
@@ -42,10 +57,12 @@ class SelectionArrowMatcher : public ImageMatch::WaterfillTemplateMatcher{
 SelectionArrowDetector::SelectionArrowDetector(
     Color color,
     VideoOverlay* overlay,
+    SelectionArrowType type,
     const ImageFloatBox& box
 )
     : m_color(color)
     , m_overlay(overlay)
+    , m_type(type)
     , m_arrow_box(box)
 {}
 void SelectionArrowDetector::make_overlays(VideoOverlaySet& items) const{
@@ -66,7 +83,7 @@ bool SelectionArrowDetector::detect(const ImageViewRGB32& screen){
 
     bool found = match_template_by_waterfill(
         extract_box_reference(screen, m_arrow_box),
-        SelectionArrowMatcher::instance(),
+        SelectionArrowMatcher::matcher(m_type),
         FILTERS,
         {min_area, SIZE_MAX},
         rmsd_threshold,

SerialPrograms/Source/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h

@@ -17,12 +17,19 @@ namespace NintendoSwitch{
 namespace PokemonLZA{
 
 
+enum class SelectionArrowType{
+    RIGHT,
+    DOWN,
+};
+
+
 
 class SelectionArrowDetector : public StaticScreenDetector{
 public:
     SelectionArrowDetector(
         Color color,
         VideoOverlay* overlay,
+        SelectionArrowType type,
         const ImageFloatBox& box
     );
 
@@ -36,6 +43,7 @@ class SelectionArrowDetector : public StaticScreenDetector{
 
     const Color m_color;
     VideoOverlay* m_overlay;
+    const SelectionArrowType m_type;
     const ImageFloatBox m_arrow_box;
 
     ImageFloatBox m_last_detected;
@@ -46,10 +54,11 @@ class SelectionArrowWatcher : public DetectorToFinder<SelectionArrowDetector>{
     SelectionArrowWatcher(
         Color color,
         VideoOverlay* overlay,
+        SelectionArrowType type,
         const ImageFloatBox& box,
         std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
     )
-         : DetectorToFinder("SelectionArrowWatcher", hold_duration, color, overlay, box)
+         : DetectorToFinder("SelectionArrowWatcher", hold_duration, color, overlay, type, box)
     {}
 };
 

SerialPrograms/Source/PokemonLZA/Programs/TestPrograms/PokemonLZA_OverworldWatcher.cpp

@@ -42,7 +42,8 @@ void OverworldWatcher::program(SingleSwitchProgramEnvironment& env, ProControlle
     FlatWhiteDialogWatcher dialog_white(COLOR_RED, &overlay);
     BlueDialogWatcher dialog_blue(COLOR_RED, &overlay);
     TealDialogWatcher dialog_teal(COLOR_RED, &overlay);
-    SelectionArrowWatcher selection_arrow(COLOR_RED, &overlay, {0, 0, 1, 1});
+    SelectionArrowWatcher selection_arrow_right(COLOR_RED, &overlay, SelectionArrowType::RIGHT, {0, 0, 1, 1});
+    SelectionArrowWatcher selection_arrow_down(COLOR_RED, &overlay, SelectionArrowType::DOWN, {0, 0, 1, 1});
 
     CancellableHolder<CancellableScope> scope(*context.scope());
     InferenceSession session(
@@ -51,7 +52,8 @@ void OverworldWatcher::program(SingleSwitchProgramEnvironment& env, ProControlle
             dialog_white,
             dialog_blue,
             dialog_teal,
-            selection_arrow,
+            selection_arrow_right,
+            selection_arrow_down,
         }
     );
     context.wait_until_cancel();