update item printer material detector to use updated read_number_waterfill() with multiple filters

Author: jw098

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -313,12 +313,31 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 
 //    std::terminate();
 
+#if 1
+    ImageRGB32 image("720p1.png");
+    // auto image = feed.snapshot();
+
+    ItemPrinterMaterialDetector detector(COLOR_RED, Language::English);
+
+    std::vector<ImageFloatBox> boxes = {
+        {0.485,0.176758,0.037,0.05}, {0.485,0.250977,0.037,0.05}, {0.485,0.325196,0.037,0.05}, {0.485,0.399415,0.037,0.05}, {0.485,0.473634,0.037,0.05}, {0.485,0.547853,0.037,0.05}, {0.485,0.622072,0.037,0.05}, {0.485,0.696291,0.037,0.05}, {0.485,0.77051,0.037,0.05}, {0.485,0.844729,0.037,0.05}, 
+        // {0.39,0.176758,0.025,0.05}, {0.39,0.250977,0.025,0.05}, {0.39,0.325196,0.025,0.05}, {0.39,0.399415,0.025,0.05}, {0.39,0.473634,0.025,0.05}, {0.39,0.547853,0.025,0.05}, {0.39,0.622072,0.025,0.05}, {0.39,0.696291,0.025,0.05}, {0.39,0.77051,0.025,0.05}, {0.39,0.844729,0.025,0.05}, 
+    };
+    for (ImageFloatBox box : boxes){
+        detector.read_number(console.logger(), env.inference_dispatcher(), image, box);
+    }
+    
+#endif
+
+#if 0
+
     ImageRGB32 image("20250323-011605651979.png");
 
     DialogBoxDetector detector;
     detector.make_overlays(overlays);
     cout << detector.detect(image) << endl;
 
+#endif
 
 
 #if 0

SerialPrograms/Source/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMaterialDetector.cpp

@@ -18,7 +18,7 @@
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "PokemonSV_ItemPrinterMaterialDetector.h"
 
-//#include <iostream>
+// #include <iostream>
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -69,7 +69,9 @@ std::array<ImageFloatBox, 10> ItemPrinterMaterialDetector::Material_Boxes(ImageF
     for (size_t i = 0; i < 10; i++){
         double y = initial_y + i*y_spacing;
         material_boxes[i] = ImageFloatBox(x, y, width, height);
+        // std::cout << "{" << x << "," << y << "," << width << "," << height << "}, ";
     }
+    // std::cout << std::endl;
     return material_boxes;
 }
 
@@ -98,9 +100,30 @@ int16_t ItemPrinterMaterialDetector::read_number(
 
     int16_t number;
     if (is_dark_text_light_background){
-        number = (int16_t)OCR::read_number_waterfill(logger, cropped, 0xff000000, 0xff808080);
+        const std::vector<std::pair<uint32_t, uint32_t>> filters = {
+            {0xff000000, 0xff909090},
+            {0xff000000, 0xff808080},
+            {0xff000000, 0xff707070},
+            {0xff000000, 0xff606060},
+            {0xff000000, 0xff505050},
+            {0xff000000, 0xff404040},
+            {0xff000000, 0xff303030},
+            {0xff000000, 0xff202020},
+            {0xff000000, 0xff101010},
+        };
+        number = (int16_t)OCR::read_number_waterfill(logger, cropped, filters, 24);
     }else{
-        number = (int16_t)OCR::read_number_waterfill(logger, cropped, 0xff808080, 0xffffffff);
+        const std::vector<std::pair<uint32_t, uint32_t>> filters = {
+            // {0xff808080, 0xffffffff},
+            {0xff909090, 0xffffffff},
+            {0xffa0a0a0, 0xffffffff},
+            {0xffb0b0b0, 0xffffffff},
+            {0xffc0c0c0, 0xffffffff},
+            {0xffd0d0d0, 0xffffffff},
+            {0xffe0e0e0, 0xffffffff},
+            {0xfff0f0f0, 0xffffffff},
+        };        
+        number = (int16_t)OCR::read_number_waterfill(logger, cropped, filters, 24);
     }
 
     if (number < 1 || number > 999){

SerialPrograms/Source/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMaterialDetector.h

@@ -74,8 +74,6 @@ class ItemPrinterMaterialDetector{
         int8_t row_index
     ) const;    
 
-
-private:
     int16_t read_number(
         Logger& logger, AsyncDispatcher& dispatcher,
         const ImageViewRGB32& screen, const ImageFloatBox& box
@@ -85,9 +83,11 @@ class ItemPrinterMaterialDetector{
 private:
     Color m_color;
     Language m_language;
-    std::array<ImageFloatBox, 10> m_box_mat_value;
-    std::array<ImageFloatBox, 10> m_box_mat_quantity;
-    std::array<ImageFloatBox, 10> m_box_mat_name;
+    std::array<ImageFloatBox, 10> m_box_mat_value;    // {0.39,0.176758,0.025,0.05}, {0.39,0.250977,0.025,0.05}, {0.39,0.325196,0.025,0.05}, {0.39,0.399415,0.025,0.05}, {0.39,0.473634,0.025,0.05}, {0.39,0.547853,0.025,0.05}, {0.39,0.622072,0.025,0.05}, {0.39,0.696291,0.025,0.05}, {0.39,0.77051,0.025,0.05}, {0.39,0.844729,0.025,0.05}, 
+    std::array<ImageFloatBox, 10> m_box_mat_quantity; // {0.485,0.176758,0.037,0.05}, {0.485,0.250977,0.037,0.05}, {0.485,0.325196,0.037,0.05}, {0.485,0.399415,0.037,0.05}, {0.485,0.473634,0.037,0.05}, {0.485,0.547853,0.037,0.05}, {0.485,0.622072,0.037,0.05}, {0.485,0.696291,0.037,0.05}, {0.485,0.77051,0.037,0.05}, {0.485,0.844729,0.037,0.05}, 
+    std::array<ImageFloatBox, 10> m_box_mat_name;     // {0.09,0.176758,0.275,0.05}, {0.09,0.250977,0.275,0.05}, {0.09,0.325196,0.275,0.05}, {0.09,0.399415,0.275,0.05}, {0.09,0.473634,0.275,0.05}, {0.09,0.547853,0.275,0.05}, {0.09,0.622072,0.275,0.05}, {0.09,0.696291,0.275,0.05}, {0.09,0.77051,0.275,0.05}, {0.09,0.844729,0.275,0.05}, 
+
+    
 };