Fix item printer. Fix premature console type conclusion due to screen transition.

Author: Mysticial

SerialPrograms/Source/CommonTools/InferenceCallbacks/VisualInferenceCallback.cpp

@@ -5,7 +5,6 @@
  */
 
 #include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
 #include "VisualInferenceCallback.h"
 

SerialPrograms/Source/CommonTools/OCR/OCR_NumberReader.cpp

@@ -169,9 +169,17 @@ std::string  read_number_waterfill_no_normalization(
         ImageRGB32 cropped = extract_box_reference(filtered, object).copy();            
         PackedBinaryMatrix tmp(object.packed_matrix());
         filter_by_mask(tmp, cropped, Color(0xffffffff), true);
-        ImageRGB32 padded = pad_image(cropped, cropped.width(), 0xffffffff);
+
+        //  Tesseract doesn't like numbers that are too big. So scale it down.
+//        cout << "height = " << cropped.height() << endl;
+        if (cropped.height() > 60){
+            cropped = cropped.scale_to(cropped.width() * 60 / cropped.height(), 60);
+        }
+
+        ImageRGB32 padded = pad_image(cropped, 1 * cropped.width(), 0xffffffff);
         std::string ocr = OCR::ocr_read(Language::English, padded);
-        // padded.save("zztest-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/CommonTools/VisualDetector.h

@@ -22,6 +22,8 @@ class StaticScreenDetector{
 
     //  This is not const so that detectors can save/cache state.
     virtual bool detect(const ImageViewRGB32& screen) = 0;
+
+    virtual void commit_state(){}
 };
 
 
@@ -85,7 +87,13 @@ class DetectorToFinder : public Detector, public VisualInferenceCallback{
             if (m_start_of_detection == WallClock::min()){
                 m_start_of_detection = timestamp;
             }
-            return timestamp - m_start_of_detection >= m_duration;
+
+            if (timestamp - m_start_of_detection >= m_duration){
+                this->commit_state();
+                return true;
+            }else{
+                return false;
+            }
         case FinderType::CONSISTENT:{
             const bool result = this->detect(frame);
             const bool result_changed = (result && m_last_detected < 0) || (!result && m_last_detected > 0);
@@ -104,7 +112,12 @@ class DetectorToFinder : public Detector, public VisualInferenceCallback{
             if (enough_time){
                 m_consistent_result = m_last_detected > 0;
             }
-            return enough_time;
+            if (enough_time){
+                this->commit_state();
+                return true;
+            }else{
+                return false;
+            }
         }
         default:;
         }

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.cpp

@@ -44,13 +44,25 @@ void HomeMenuDetector::make_overlays(VideoOverlaySet& items) const{
 //  This miraculously works on both Switch 1 and Switch 2.
 //
 bool HomeMenuDetector::detect(const ImageViewRGB32& screen){
-    if (detect_only(screen)){
-        m_console_type.commit_to_cache();
-        return true;
-    }else{
+   return detect_only(screen);
+
+#if 0
+    if (!detect_only(screen)){
         return false;
     }
+    try{
+        m_console_type.commit_to_cache();
+    }catch (UserSetupError&){
+        screen.save("HomeMenuDetector-Failure.png");
+        throw;
+    }
+    return true;
+#endif
 }
+void HomeMenuDetector::commit_state(){
+    m_console_type.commit_to_cache();
+}
+
 bool HomeMenuDetector::detect_only(const ImageViewRGB32& screen){
     ImageStats stats_bottom_row = image_stats(extract_box_reference(screen, m_bottom_row));
 //    cout << stats_bottom_row.average << stats_bottom_row.stddev << endl;

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.h

@@ -24,6 +24,7 @@ class HomeMenuDetector : public StaticScreenDetector{
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
     virtual bool detect(const ImageViewRGB32& screen) override;
+    virtual void commit_state() override;
     bool detect_only(const ImageViewRGB32& screen);
 
 private:

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_StartGameUserSelectDetector.cpp

@@ -31,12 +31,18 @@ void StartGameUserSelectDetector::make_overlays(VideoOverlaySet& items) const{
     m_switch2.make_overlays(items);
 }
 bool StartGameUserSelectDetector::detect(const ImageViewRGB32& screen){
+    return detect_only(screen);
+#if 0
     if (detect_only(screen)){
         m_console.state().set_console_type(m_console, m_console_type);
         return true;
     }else{
         return false;
     }
+#endif
+}
+void StartGameUserSelectDetector::commit_state(){
+    m_console.state().set_console_type(m_console, m_console_type);
 }
 bool StartGameUserSelectDetector::detect_only(const ImageViewRGB32& screen){
     ConsoleType type = m_type_detector.detect_only(screen);

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_StartGameUserSelectDetector.h

@@ -60,6 +60,7 @@ class StartGameUserSelectDetector : public StaticScreenDetector{
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
     virtual bool detect(const ImageViewRGB32& screen) override;
+    virtual void commit_state() override;
     bool detect_only(const ImageViewRGB32& screen);
 
 private:

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.cpp

@@ -29,12 +29,19 @@ void UpdatePopupDetector::make_overlays(VideoOverlaySet& items) const{
     m_switch2.make_overlays(items);
 }
 bool UpdatePopupDetector::detect(const ImageViewRGB32& screen){
+    return detect_only(screen);
+
+#if 0
     if (detect_only(screen)){
         m_type_detector.commit_to_cache();
         return true;
     }else{
         return false;
     }
+#endif
+}
+void UpdatePopupDetector::commit_state(){
+    m_type_detector.commit_to_cache();
 }
 bool UpdatePopupDetector::detect_only(const ImageViewRGB32& screen){
     ConsoleType type = m_type_detector.detect_only(screen);

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.h

@@ -62,6 +62,7 @@ class UpdatePopupDetector : public StaticScreenDetector{
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
     virtual bool detect(const ImageViewRGB32& screen) override;
+    virtual void commit_state() override;
     bool detect_only(const ImageViewRGB32& screen);
 
 private:

SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.cpp

@@ -77,10 +77,7 @@ bool DateReader::detect(const ImageViewRGB32& screen){
         return m_switch2.detect(screen);
     }
 
-    throw UserSetupError(
-        m_console,
-        "Please select a valid Switch console type."
-    );
+    return false;
 }