update item printer material detector color filters for OCR

Author: jw098

SerialPrograms/Source/CommonTools/OCR/OCR_NumberReader.cpp

@@ -48,6 +48,7 @@ std::string run_number_normalization(const std::string& input){
         {'S', '5'},
         {'s', '5'},
         {'/', '7'},
+        {'g', '9'},
 
         //  Japanese OCR likes to do this.
         {U'🄋', '0'},
@@ -115,8 +116,8 @@ int read_number_waterfill(
     ImageRGB32 filtered = to_blackwhite_rgb32_range(image, rgb32_min, rgb32_max, text_inside_range);
 
 //    static int c = 0;
+//    filtered.save("zztest-" + std::to_string(c++) + ".png");
 //    int i = 0;
-//    filtered.save("test-" + std::to_string(c++) + ".png");
 
     PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(filtered, 0xff000000, 0xff7f7f7f);
 
@@ -142,7 +143,7 @@ int read_number_waterfill(
         filter_by_mask(tmp, cropped, Color(0xffffffff), true);
         ImageRGB32 padded = pad_image(cropped, cropped.width(), 0xffffffff);
         std::string ocr = OCR::ocr_read(Language::English, padded);
-        // padded.save("test-cropped" + std::to_string(c) + "-" + std::to_string(i++) + ".png");
+        // padded.save("zztest-cropped" + std::to_string(c) + "-" + std::to_string(i++) + ".png");
         // std::cout << ocr[0] << std::endl;
         if (!ocr.empty()){
             ocr_text += ocr[0];

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -219,6 +219,7 @@ TestProgram::TestProgram()
         LockMode::LOCK_WHILE_RUNNING,
         false
     )
+    , IMAGE_PATH(false, "Path to image for testing", LockMode::UNLOCK_WHILE_RUNNING, "default.png", "default.png")
     , STATIC_TEXT("Test text...")
     , SELECT("String Select", test_database(), LockMode::LOCK_WHILE_RUNNING, 0)
 //    , PLAYER_LIST("Test Table", LockMode::UNLOCK_WHILE_RUNNING, "Notes")
@@ -258,6 +259,7 @@ TestProgram::TestProgram()
     PA_ADD_OPTION(BUTTON0);
     PA_ADD_OPTION(BUTTON1);
     PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(IMAGE_PATH);
     PA_ADD_OPTION(STATIC_TEXT);
     PA_ADD_OPTION(SELECT);
 //    PA_ADD_OPTION(PLAYER_LIST);
@@ -314,14 +316,14 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 //    std::terminate();
 
 #if 1
-    ImageRGB32 image("720p1.png");
-    // auto image = feed.snapshot();
+    // ImageRGB32 image(IMAGE_PATH);
+    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}, 
+        // {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);

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.h

@@ -68,6 +68,8 @@ class TestProgram : public MultiSwitchProgramInstance, public ButtonListener{
 
     OCR::LanguageOCROption LANGUAGE;
 
+    StringOption IMAGE_PATH;
+
     StaticTextOption STATIC_TEXT;
 
     StringSelectOption SELECT;

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

@@ -101,24 +101,30 @@ int16_t ItemPrinterMaterialDetector::read_number(
     int16_t number;
     if (is_dark_text_light_background){
         const std::vector<std::pair<uint32_t, uint32_t>> filters = {
+            // {0xff000000, 0xffb0b0b0},
+            {0xff000000, 0xffa0a0a0},
+            {0xff000000, 0xff959595},
             {0xff000000, 0xff909090},
+            {0xff000000, 0xff858585},
             {0xff000000, 0xff808080},
-            {0xff000000, 0xff707070},
-            {0xff000000, 0xff606060},
-            {0xff000000, 0xff505050},
-            {0xff000000, 0xff404040},
-            {0xff000000, 0xff303030},
-            {0xff000000, 0xff202020},
-            {0xff000000, 0xff101010},
+            // {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{
         const std::vector<std::pair<uint32_t, uint32_t>> filters = {
-            // {0xff808080, 0xffffffff},
+            {0xff808080, 0xffffffff},
+            {0xff858585, 0xffffffff},
             {0xff909090, 0xffffffff},
+            {0xff959595, 0xffffffff},
             {0xffa0a0a0, 0xffffffff},
-            {0xffb0b0b0, 0xffffffff},
-            {0xffc0c0c0, 0xffffffff},
+            // {0xffb0b0b0, 0xffffffff},
+            // {0xffc0c0c0, 0xffffffff},
             // {0xffd0d0d0, 0xffffffff},
             // {0xffe0e0e0, 0xffffffff},
             // {0xfff0f0f0, 0xffffffff},