Fix DateReader being broken in German on Switch 2.

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DateChangeDetector.cpp

@@ -8,6 +8,10 @@
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
 #include "NintendoSwitch_DateChangeDetector.h"
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 
@@ -95,7 +99,7 @@ DateChangeDetector_Switch2::DateChangeDetector_Switch2(Color color)
     , m_window_bottom(0.50, 0.80, 0.45, 0.07)
     , m_window_text(0.05, 0.02, 0.10, 0.08)
     , m_jp_year(0.139, 0.436, 0.088, 0.095)
-    , m_us_hour(0.473, 0.61, 0.06, 0.09)
+    , m_us_hour(0.466856, 0.567340, 0.049242, 0.063973)
     , m_jp_month_arrow(0.291705, 0.331675, 0.054986, 0.069652)
 {}
 void DateChangeDetector_Switch2::make_overlays(VideoOverlaySet& items) const{
@@ -150,6 +154,8 @@ DateFormat DateChangeDetector_Switch2::detect_date_format(const ImageViewRGB32&
     ImageViewRGB32 us_hours = extract_box_reference(screen, m_us_hour);
     ImageStats stats_us_hours = image_stats(us_hours);
 
+//    cout << stats_us_hours.stddev.sum() << endl;
+
     if (stats_us_hours.stddev.sum() > 30){
         return DateFormat::US;
     }

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

@@ -39,12 +39,6 @@ DateReader::DateReader(ConsoleHandle& console)
     : m_console(console)
     , m_switch1(COLOR_RED)
     , m_switch2(COLOR_MAGENTA)
-    , m_background_top(0.50, 0.02, 0.45, 0.08)
-    , m_window_top(0.50, 0.36, 0.45, 0.07)
-    , m_window_text(0.05, 0.36, 0.10, 0.07)
-    , m_us_hour(0.473, 0.61, 0.06, 0.09)
-    , m_jp_year(0.136, 0.61, 0.11, 0.09)
-    , m_jp_month_arrow(0.30, 0.50, 0.05, 0.06)
     , m_switch1_US(COLOR_YELLOW)
     , m_switch1_EU(COLOR_CYAN)
     , m_switch1_JP(COLOR_PURPLE)
@@ -53,12 +47,9 @@ DateReader::DateReader(ConsoleHandle& console)
     , m_switch2_JP(COLOR_PURPLE)
 {}
 void DateReader::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_RED, m_background_top);
-    items.add(COLOR_RED, m_window_top);
-    items.add(COLOR_RED, m_window_text);
-    items.add(COLOR_RED, m_us_hour);
-    items.add(COLOR_RED, m_jp_year);
-    items.add(COLOR_RED, m_jp_month_arrow);
+    m_switch1.make_overlays(items);
+    m_switch2.make_overlays(items);
+
     m_switch1_US.make_overlays(items);
     m_switch1_EU.make_overlays(items);
     m_switch1_JP.make_overlays(items);

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

@@ -46,14 +46,6 @@ class DateReader : public StaticScreenDetector{
     DateChangeDetector_Switch1 m_switch1;
     DateChangeDetector_Switch2 m_switch2;
 
-    ImageFloatBox m_background_top;
-    ImageFloatBox m_window_top;
-    ImageFloatBox m_window_text;
-
-    ImageFloatBox m_us_hour;
-    ImageFloatBox m_jp_year;
-    ImageFloatBox m_jp_month_arrow;
-
     DateReader_Switch1_US m_switch1_US;
     DateReader_Switch1_EU m_switch1_EU;
     DateReader_Switch1_JP m_switch1_JP;