Merge pull request #16 from rrr-001/shot/feature

合并恢复矩形选框代码

Author: ceilf6

.github/workflows/build.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build-macos:
-    runs-on: macos-14
+    runs-on: macos-13  # 使用 Intel macOS 以支持 x64 Qt 5.15.2
     steps:
     - uses: actions/checkout@v3
 
@@ -21,27 +21,22 @@ jobs:
 
     - name: Install Dependencies
       run: |
-        # Use Rosetta to install x86_64 versions of dependencies
-        arch -x86_64 /usr/local/bin/brew update
-        arch -x86_64 /usr/local/bin/brew install opencv tesseract
+        # Install dependencies for Intel macOS
+        brew update
+        brew install opencv tesseract
         
     - name: Configure Project (local_config.pri)
       run: |
         # Generate a local config for CI environment
-        # Note: GitHub Actions macos-latest (Intel) uses /usr/local, macos-14 (ARM) uses /opt/homebrew
-        # We add both to be safe, but we must ensure we link against the correct architecture.
-        # The error "ignoring file ... found architecture 'arm64', required architecture 'x86_64'" 
-        # suggests we are building for x86_64 but linking against arm64 libs, or vice versa.
-        # Qt 5.15.2 on macos-latest is likely x86_64.
+        # Note: Intel macOS (macos-13) uses /usr/local for Homebrew
+        # Qt 5.15.2 on Intel macOS is x86_64.
         
         echo "macx: {" > local_config.pri
         echo "    DEFINES += USE_TESSERACT" >> local_config.pri
-        echo "    INCLUDEPATH += /usr/local/include /opt/homebrew/include" >> local_config.pri
-        
-        # Explicitly look for libs in both locations
-        echo "    LIBS += -L/usr/local/lib -L/opt/homebrew/lib -ltesseract -lleptonica" >> local_config.pri
-        echo "    INCLUDEPATH += /usr/local/opt/opencv/include/opencv4 /opt/homebrew/opt/opencv/include/opencv4" >> local_config.pri
-        echo "    LIBS += -L/usr/local/opt/opencv/lib -L/opt/homebrew/opt/opencv/lib -lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_imgcodecs -lopencv_videoio" >> local_config.pri
+        echo "    INCLUDEPATH += /usr/local/include" >> local_config.pri
+        echo "    LIBS += -L/usr/local/lib -ltesseract -lleptonica" >> local_config.pri
+        echo "    INCLUDEPATH += /usr/local/opt/opencv/include/opencv4" >> local_config.pri
+        echo "    LIBS += -L/usr/local/opt/opencv/lib -lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_imgcodecs -lopencv_videoio -lopencv_dnn -lopencv_objdetect" >> local_config.pri
         echo "}" >> local_config.pri
         
     - name: Build