Merge branch 'main' of https://github.com/PokemonAutomation/Arduino-Source

Author: ZacharyPL

SerialPrograms/CMakeLists.txt

@@ -294,18 +294,18 @@ if (WIN32)
         MAP_IMPORTED_CONFIG_MINSIZEREL      RELEASE
     )
 
-    target_link_libraries(
-        SerialProgramsLib PRIVATE
-        tesseractPA.lib
-        OpenCV_lib
-        ONNX_lib
-        ONNX_Providers_lib
-        dpp_lib
-        discord_lib
-        xinput
-        dinput8
-        dxguid
-    )
+    target_link_libraries(
+        SerialProgramsLib PRIVATE
+        tesseractPA.lib
+        OpenCV_lib
+        ONNX_lib
+        ONNX_Providers_lib
+        dpp_lib
+        discord_lib
+        xinput
+        dinput8
+        dxguid
+    )
 
     target_compile_definitions(
         SerialProgramsLib PUBLIC
@@ -708,4 +708,4 @@ if (QT_MAJOR GREATER_EQUAL 6)
 endif()
 
 # Add command-line executable (GUI-free) from subdirectory
-include(Source/CommandLine/CommandLineExecutable.cmake)
+include(Source/CommandLine/CommandLineExecutable.cmake)

SerialPrograms/Source/CommonTools/Images/ImageTools.cpp

@@ -8,6 +8,7 @@
 #include "CommonFramework/ImageTypes/ImageRGB32.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
 #include "CommonFramework/ImageTools/FloatPixel.h"
+#include "CommonTools/Images/SolidColorTest.h"
 #include "ImageTools.h"
 
 namespace PokemonAutomation{
@@ -47,6 +48,50 @@ ImageRGB32 image_diff_greyscale(const ImageViewRGB32& x, const ImageViewRGB32& y
 
 
 
+ImagePixelBox find_contents_pixel_box(const ImageViewRGB32& image){
+    const double MAX_SUM = 10;
+    const double MAX_STDDEV = 10;
+
+    size_t top = 0;
+    for (; top < image.height(); top++){
+        ImageViewRGB32 line = image.sub_image(0, top, image.width(), 1);
+        if (!is_black(line, MAX_SUM, MAX_STDDEV)){
+            break;
+        }
+    }
+
+    size_t bot = image.height();
+    for (; bot > top; bot--){
+        ImageViewRGB32 line = image.sub_image(0, bot - 1, image.width(), 1);
+        if (!is_black(line, MAX_SUM, MAX_STDDEV)){
+            break;
+        }
+    }
+
+    size_t left = 0;
+    for (; left < image.width(); left++){
+        ImageViewRGB32 line = image.sub_image(left, 0, 1, image.height());
+        if (!is_black(line, MAX_SUM, MAX_STDDEV)){
+            break;
+        }
+    }
+
+    size_t right = image.width();
+    for (; right > left; right--){
+        ImageViewRGB32 line = image.sub_image(right - 1, 0, 1, image.height());
+        if (!is_black(line, MAX_SUM, MAX_STDDEV)){
+            break;
+        }
+    }
+
+    return ImagePixelBox(left, top, right, bot);
+}
+ImageFloatBox find_contents_float_box(const ImageViewRGB32& image){
+    return pixelbox_to_floatbox(
+        image.width(), image.height(),
+        find_contents_pixel_box(image)
+    );
+}
 
 
 

SerialPrograms/Source/CommonTools/Images/ImageTools.h

@@ -12,12 +12,18 @@ namespace PokemonAutomation{
 
 class ImageViewRGB32;
 class ImageRGB32;
+struct ImagePixelBox;
+struct ImageFloatBox;
 
 
 //  Deprecated
 ImageRGB32 image_diff_greyscale(const ImageViewRGB32& x, const ImageViewRGB32& y);
 
 
+ImagePixelBox find_contents_pixel_box(const ImageViewRGB32& image);
+ImageFloatBox find_contents_float_box(const ImageViewRGB32& image);
+
+