Merge branch 'main' into v0.59

Author: Mysticial

.clang-format

@@ -26,6 +26,7 @@ namespace PokemonAutomation{
 const std::set<std::string> SANITIZER_FILTER = {
 //    "MultiSwitchProgramSession",
 //    "MultiSwitchProgramWidget2",
+//    "VideoSource",
 };
 
 SpinLock sanitizer_lock;

Common/Cpp/LifetimeSanitizer.cpp

@@ -119,6 +119,12 @@ class IntegerEnumDropdownOption : private IntegerEnumDropdownDatabase, public In
         , IntegerEnumDropdownCell(database, lock_while_running, default_value)
         , m_label(std::move(label))
     {}
+    // you can construct IntegerEnumDropdownDatabase using initializer list:
+    // {
+    //      {0, "<slug_0>", "Display Name 0"},
+    //      {1, "<slug 1>", "Display Name 1"},
+    //      {2, "<slug 2>", "Display Name 2"},
+    // }
     IntegerEnumDropdownOption(
         std::string label,
         IntegerEnumDropdownDatabase&& database,

Common/Cpp/Options/EnumDropdownOption.h

@@ -22,15 +22,19 @@ void queue_on_main_thread(std::function<void()> lambda){
 
 
 void run_on_main_thread_and_wait(std::function<void()> lambda){
-    if (QCoreApplication::instance()->thread() == QThread::currentThread()){
+    run_on_object_thread_and_wait(QCoreApplication::instance(), std::move(lambda));
+}
+
+void run_on_object_thread_and_wait(QObject* object, std::function<void()> lambda){
+    if (object->thread() == QThread::currentThread()){
         lambda();
         return;
     }
 
     std::mutex lock;
     std::condition_variable cv;
     bool done = false;
-    QMetaObject::invokeMethod(QCoreApplication::instance(), [&]{
+    QMetaObject::invokeMethod(object, [&]{
         lambda();
         std::lock_guard<std::mutex> lg(lock);
         done = true;
@@ -42,4 +46,5 @@ void run_on_main_thread_and_wait(std::function<void()> lambda){
 
 
 
+
 }

Common/Qt/Redispatch.cpp

@@ -9,6 +9,8 @@
 
 #include <functional>
 
+class QObject;
+
 namespace PokemonAutomation{
 
 
@@ -18,6 +20,7 @@ void queue_on_main_thread(std::function<void()> lambda);
 
 
 void run_on_main_thread_and_wait(std::function<void()> lambda);
+void run_on_object_thread_and_wait(QObject* object, std::function<void()> lambda);
 
 
 

Common/Qt/Redispatch.h

@@ -352,12 +352,6 @@ else() # macOS and Linux
             target_link_directories(SerialProgramsLib PUBLIC ${ONNXRUNTIME_LIBRARY_DIRS})
             target_link_libraries(SerialProgramsLib PUBLIC ${ONNXRUNTIME_LINK_LIBRARIES})
         endif()
-        # Find OpenCV
-        if(CMAKE_SYSTEM_PROCESSOR MATCHES "(arm64)|(ARM64)")
-            find_package(OpenCV REQUIRED HINTS "/opt/homebrew/opt/opencv/lib/cmake/opencv4/")
-        else()
-            find_package(OpenCV REQUIRED HINTS "/usr/local/opt/opencv/lib/cmake/opencv4/")
-        endif()
     else() # Linux
         # ONNX RUNTIME LINUX CONFIG
         # NOTE: users can specify their own ONNX_ROOT_PATH (this is the base folder for ONNX) on the command line when evoking cmake.
@@ -435,26 +429,26 @@ else() # macOS and Linux
         else()
             message(FATAL_ERROR "Could not find ONNX Runtime headers or library.")
         endif()
-        # Find OpenCV
-        find_package(OpenCV REQUIRED HINTS "/usr/local/opt/opencv/lib/cmake/opencv4/")
     endif() # end Linux
 
-    include_directories(${OpenCV_INCLUDE_DIRS})
-    link_directories(${OpenCV_LIBRARY_DIRS})
-    target_link_libraries(SerialProgramsLib PRIVATE ${OpenCV_LIBS})
+    # Find OpenCV
+    pkg_search_module(OpenCV REQUIRED opencv4 opencv)
+    target_include_directories(SerialProgramsLib SYSTEM PRIVATE ${OpenCV_INCLUDE_DIRS}) # "SYSTEM" to suppress warnings
+    target_link_directories(SerialProgramsLib PUBLIC ${OpenCV_LIBRARY_DIRS})
+    target_link_libraries(SerialProgramsLib PUBLIC ${OpenCV_LINK_LIBRARIES})
 
     #we hope to use our own Tesseract build in future so we can rid that dependency
     #but right now to run on Linux and Mac we need to use external Tesseract library
-    if (UNIX_LINK_TESSERACT)
+    pkg_search_module(TESSERACT tesseract)
+    pkg_search_module(LEPTONICA lept)
+    if (TESSERACT_FOUND AND LEPTONICA_FOUND)
         target_compile_definitions(SerialProgramsLib PRIVATE PA_TESSERACT UNIX_LINK_TESSERACT)
-        pkg_search_module(TESSERACT REQUIRED tesseract)
-        pkg_search_module(LEPTONICA REQUIRED lept)
-        include_directories(${TESSERACT_INCLUDE_DIRS})
-        include_directories(${LEPTONICA_INCLUDE_DIRS})
-        link_directories(${TESSERACT_LIBRARY_DIRS})
-        link_directories(${LEPTONICA_LIBRARY_DIRS})
-        target_link_libraries(SerialProgramsLib PRIVATE ${TESSERACT_LINK_LIBRARIES})
-        target_link_libraries(SerialProgramsLib PRIVATE ${LEPTONICA_LINK_LIBRARIES})
+        target_include_directories(SerialProgramsLib SYSTEM PRIVATE ${TESSERACT_INCLUDE_DIRS})
+        target_include_directories(SerialProgramsLib SYSTEM PRIVATE ${LEPTONICA_INCLUDE_DIRS})
+        target_link_directories(SerialProgramsLib PUBLIC ${TESSERACT_LIBRARY_DIRS})
+        target_link_directories(SerialProgramsLib PUBLIC ${LEPTONICA_LIBRARY_DIRS})
+        target_link_libraries(SerialProgramsLib PUBLIC ${TESSERACT_LINK_LIBRARIES})
+        target_link_libraries(SerialProgramsLib PUBLIC ${LEPTONICA_LINK_LIBRARIES})
     endif()
 
     pkg_search_module(DPP dpp=10.0.22)
@@ -468,10 +462,6 @@ else() # macOS and Linux
     endif()
 
     if (APPLE)
-        # Add -Wno-c11-extensions to avoid clang gives
-        # /usr/local/Cellar/opencv/4.5.5_3/include/opencv4/opencv2/core/mat.inl.hpp:2116:9: error: '_Atomic' is a C11 extension
-        # when compiling OpenCV
-        # target_compile_options(SerialProgramsLib PRIVATE -Wall -Wextra -Wpedantic -Werror -Wno-c11-extensions)
         target_compile_options(SerialProgramsLib PRIVATE -Wall -Wextra -Wpedantic -Werror -Wshorten-64-to-32)
         # on macOS, need this framework to query OS API to control display sleep and system sleep behavior
         target_link_libraries(SerialProgramsLib PRIVATE "-framework IOKit -framework CoreFoundation")

SerialPrograms/CMakeLists.txt

@@ -32,9 +32,15 @@
 
 raw_image = image.copy()
 
+
+# ==================================================================
+# LZA main menu detector
+add_infer_box_to_image(raw_image, 0.87, 0.940, 0.077, 0.044, image)  # detect button B
+
+
 # ==================================================================
 # LZA fossil selection green arrow when reviving fossils
-add_infer_box_to_image(raw_image, 0.630, 0.444, 0.226, 0.319, image)
+# add_infer_box_to_image(raw_image, 0.630, 0.444, 0.226, 0.319, image)
 
 
 # ==================================================================

SerialPrograms/Scripts/check_detector_regions.py

@@ -26,7 +26,7 @@ namespace PokemonAutomation{
 const bool IS_BETA_VERSION = false;
 const int PROGRAM_VERSION_MAJOR = 0;
 const int PROGRAM_VERSION_MINOR = 59;
-const int PROGRAM_VERSION_PATCH = 5;
+const int PROGRAM_VERSION_PATCH = 6;
 
 const std::string PROGRAM_VERSION_BASE =
     "v" + std::to_string(PROGRAM_VERSION_MAJOR) +

SerialPrograms/Source/CommonFramework/Globals.cpp

@@ -19,6 +19,7 @@
 //#include "Common/Cpp/Exceptions.h"
 //#include "Common/Cpp/Time.h"
 //#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Qt/Redispatch.h"
 #include "VideoFrameQt.h"
 #include "MediaServicesQt6.h"
 #include "CameraWidgetQt6.5.h"
@@ -82,9 +83,11 @@ CameraVideoSource::~CameraVideoSource(){
         m_logger.log("Stopping Camera...");
     }catch (...){}
 
-//    m_camera->stop();
-    m_capture_session.reset();
-    m_camera.reset();
+    run_on_main_thread_and_wait([&]{
+//        m_camera->stop();
+        m_capture_session.reset();
+        m_camera.reset();
+    });
 }
 CameraVideoSource::CameraVideoSource(
     Logger& logger,
@@ -103,6 +106,13 @@ CameraVideoSource::CameraVideoSource(
     }
     m_logger.log("Starting Camera: Backend = CameraQt65QMediaCaptureSession");
 
+    run_on_main_thread_and_wait([&]{
+        init(info, desired_resolution);
+    });
+}
+void CameraVideoSource::init(const CameraInfo& info, Resolution desired_resolution){
+    m_metaobject.reset(new QObject());
+
     auto cameras = QMediaDevices::videoInputs();
     const QCameraDevice* device = nullptr;
     for (const auto& camera : cameras){
@@ -164,7 +174,6 @@ CameraVideoSource::CameraVideoSource(
 
     m_camera->start();
 #endif
-
 }
 
 
@@ -177,7 +186,7 @@ void CameraVideoSource::set_video_output(QGraphicsVideoItem& item){
     }
     m_capture_session->setVideoOutput(&item);
 
-    connect(
+    m_metaobject->connect(
         item.videoSink(), &QVideoSink::videoFrameChanged,
         &m_camera->camera(), [&](const QVideoFrame& frame){
             //  This runs on the QCamera's thread. So it is off the critical path.

SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.cpp

@@ -92,7 +92,7 @@ class StaticQGraphicsView : public QGraphicsView{
 
 
 
-class CameraVideoSource : public QObject, public VideoSource{
+class CameraVideoSource : public VideoSource{
 public:
     virtual ~CameraVideoSource();
     CameraVideoSource(
@@ -118,12 +118,15 @@ class CameraVideoSource : public QObject, public VideoSource{
     virtual QWidget* make_display_QtWidget(QWidget* parent) override;
 
 private:
+    void init(const CameraInfo& info, Resolution desired_resolution);
     void set_video_output(QGraphicsVideoItem& item);
 
 
 private:
     friend class CameraVideoDisplay;
 
+    std::unique_ptr<QObject> m_metaobject;
+
     Logger& m_logger;
     Resolution m_resolution;