zhunk 3 месяцев назад
Родитель
Сommit
58804322c0

+ 13 - 13
q6_felgo_iot/CMakeLists.txt.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 17.0.1, 2026-07-24T20:37:39. -->
+<!-- Written by QtCreator 17.0.1, 2026-07-31T18:09:30. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -109,26 +109,26 @@
     <value type="bool" key="CMake.Configure.ClearSystemEnvironment">false</value>
     <valuelist type="QVariantList" key="CMake.Configure.UserEnvironmentChanges"/>
     <value type="QString" key="CMake.Initial.Parameters">-DCMAKE_GENERATOR:STRING=Ninja
+-DQT_NO_GLOBAL_APK_TARGET_PART_OF_ALL:BOOL=ON
 -DANDROID_NDK:PATH=F:/Android_Env/android_sdk/ndk/27.2.12479018
--DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
--DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
+-DCMAKE_COLOR_DIAGNOSTICS:BOOL=ON
 -DQT_USE_TARGET_ANDROID_BUILD_DIR:BOOL=ON
--DQT_NO_GLOBAL_APK_TARGET_PART_OF_ALL:BOOL=ON
--DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
--DCMAKE_TOOLCHAIN_FILE:FILEPATH=F:/Android_Env/android_sdk/ndk/27.2.12479018/build/cmake/android.toolchain.cmake
+-DANDROID_SDK_ROOT:PATH=F:/Android_Env/android_sdk
+-DANDROID_PLATFORM:STRING=android-23
+-DANDROID_STL:STRING=c++_shared
 -DANDROID_USE_LEGACY_TOOLCHAIN_FILE:BOOL=OFF
--DCMAKE_BUILD_TYPE:STRING=Release
+-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
+-DQT_HOST_PATH:PATH=%{Qt:QT_HOST_PREFIX}
 -DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
+-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
 -DQT_MAINTENANCE_TOOL:FILEPATH=D:/Qt/Felgo/MaintenanceTool.exe
--DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
--DANDROID_SDK_ROOT:PATH=F:/Android_Env/android_sdk
--DANDROID_PLATFORM:STRING=android-23
 -DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
+-DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
 -DCMAKE_FIND_ROOT_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
+-DCMAKE_BUILD_TYPE:STRING=Release
 -DANDROID_ABI:STRING=arm64-v8a
--DQT_HOST_PATH:PATH=%{Qt:QT_HOST_PREFIX}
--DANDROID_STL:STRING=c++_shared
--DCMAKE_COLOR_DIAGNOSTICS:BOOL=ON</value>
+-DCMAKE_TOOLCHAIN_FILE:FILEPATH=F:/Android_Env/android_sdk/ndk/27.2.12479018/build/cmake/android.toolchain.cmake
+-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}</value>
     <value type="QString" key="CMake.Source.Directory">F:\QT_WorkSpace\qt6_iot_all\q6_felgo_iot</value>
     <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">F:\QT_WorkSpace\qt6_iot_all\q6_felgo_iot\build\Qt_6_8_3_android_arm64_v8a_Clang_arm64_v8a-Release</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">

+ 6 - 1
q6_felgo_iot/docs/Readme.md

@@ -1,4 +1,9 @@
-@header/cameramanager.h:218-232 Y轴是负责对焦,每次移动会触发这个槽函数,第一个位置是X0_Z0,依次是X0_Z1,X0_Z2,X0_Z3,X1_Z0,X1_Z2到X7_Z3一共32个位置,打开相机后初始化位置为X0_Z0,触发 @src/mserial.cpp:352-356 后更新位置,现在需要完成Y轴的每次移动都触发图片保存,保存的规则按照位置创建文件夹,X和Z移动完成后对每个位置的文件夹下的图片进行融合,再进行上传
+## 20260731
+    #define APP_VERSION "1.12.30"
+    1、孢子仪2.0的迭代:
+        图像保存后进行锐化及对比度设置;
+        删除滤网相关UI展示;
+        修复坐标保存需要设置2次才能保存
 ## 20260708
     #define APP_VERSION "1.11.30"
     1、界面ui更新:

+ 79 - 109
q6_felgo_iot/header/cameramanager.h

@@ -70,7 +70,7 @@ class SenderCustom : public QObject {
 
 public:
     // 定义一个信号,无参数
-    signals:
+signals:
     void signalToSend(const cv::Mat& frame);
     void signalQStr(const QString &qst);
 public:
@@ -103,10 +103,10 @@ private slots:
     void onTimerTimeout();
 
 private:
-     QTimer* m_timer = nullptr;
-     QElapsedTimer* m_elapsed_timer = nullptr;
-     int m_interval = 1000;
-     int m_frame_count = 0;
+    QTimer* m_timer = nullptr;
+    QElapsedTimer* m_elapsed_timer = nullptr;
+    int m_interval = 1000;
+    int m_frame_count = 0;
 };
 
 //
@@ -211,8 +211,6 @@ signals:
     void signal_photo_saved();
     void signal_wait_upload(const QString &path);
     void signal_cache_image(const QString &path);
-    void signal_fuse_batch_finished(int fusedCount, int skippedCount);
-    void signal_position_changed(int x, int z);
     void stepCountChanged(const QString step);
 public slots:
 
@@ -227,22 +225,8 @@ public slots:
         emit serial_data(m_json.ImageFunc(m_qulityString.toDouble()));
         emit qulityStringChanged();
         emit stepCountChanged(stepcount);
-        if (m_xz_sequence_done) {
-            LOG("onMovDone: XZ sequence already done, skip saving at {}/{}",
-                x_step, z_step);
-            return;
-        }
-        ensurePositionFolder();
-        saveImageForCurrentPosition();
-        y_step++;
-        LOG("onMovDone: position=X{}_Z{}, y_step={}", x_step, z_step, y_step);
-        if (y_step >= focus_step_max) {
-            y_step = focus_step_max;
-            m_xz_sequence_done = true;
-            startDepthFusionBatch();
-        }
     }
-//    void parseFrame(const cv::Mat& frame);
+    //    void parseFrame(const cv::Mat& frame);
     void upload_handle(void);
     void handle_reult_upload(bool success, const QString &error);
 
@@ -258,16 +242,10 @@ private slots:
     void update_qulstr(QString q_str);
     //
     void saveMatAsJpeg(const QVideoFrame &frame);
-    bool saveFrameAsJpeg(const QVideoFrame &frame, const QString &path, int quality = 90);
     //void sendData(QByteArray m_byte);
     void displayFrame(const QVideoFrame &frame);
     void mov_x_z_run();
     void processFrameAsync(const RawFrame& frame);
-    void ensurePositionFolder();
-    void startDepthFusionBatch();
-    void saveImageForCurrentPosition();
-    void uploadFusedImage(const QString &imagePath);
-    void fusePositionFolder(const QString &folder, int x, int z);
 private:
     Q_DISABLE_COPY( Frames )
 
@@ -314,22 +292,14 @@ private:
     QVector<double> image_qulity;
 
     int image_qulity_num;
-    int pos_step = 0;
+
     int z_step = 0;
     int x_step = 0;
 
     //图片归档路径
     QString picture_path_floader;
-    QString current_position_folder;
-    QStringList position_folders;
-    int last_position_x = -1;
     QVector<cv::Mat> m_frame_buffer;
 
-    int y_step = 0; // 当前Y轴对焦步数
-    bool m_xz_sequence_done = false; // X/Z移动序列是否完成
-    bool m_fusion_started = false; // 是否已开始融合
-    QMutex m_positionMutex; // 位置状态互斥锁
-
     int testJNI();
     int checkPermission(void)
     {
@@ -388,86 +358,86 @@ private:
 
     static cv::Mat QImageToCvMat(QImage inImage, bool inCloneImageData = true)
     {
-      switch (inImage.format())
-      {
-      // 8-bit, 4 channel
-      case QImage::Format_ARGB32:
-      case QImage::Format_ARGB32_Premultiplied:
-      {
-        cv::Mat mat(inImage.height(), inImage.width(),
-                    CV_8UC4,
-                    const_cast<uchar*>(inImage.bits()),
-                    static_cast<size_t>(inImage.bytesPerLine())
-                    );
-
-        return inCloneImageData ? mat.clone() : mat;
-      }
-
-        // 8-bit, 3 channel
-      case QImage::Format_RGB32:
-      {
-        if (!inCloneImageData) {
-          qWarning() << "QImageToCvMat() - Conversion requires cloning so we don't modify the original QImage data";
+        switch (inImage.format())
+        {
+        // 8-bit, 4 channel
+        case QImage::Format_ARGB32:
+        case QImage::Format_ARGB32_Premultiplied:
+        {
+            cv::Mat mat(inImage.height(), inImage.width(),
+                        CV_8UC4,
+                        const_cast<uchar*>(inImage.bits()),
+                        static_cast<size_t>(inImage.bytesPerLine())
+                        );
+
+            return inCloneImageData ? mat.clone() : mat;
         }
 
-        cv::Mat mat(inImage.height(), inImage.width(),
-                    CV_8UC4,
-                    const_cast<uchar*>(inImage.bits()),
-                    static_cast<size_t>(inImage.bytesPerLine())
-                    );
+            // 8-bit, 3 channel
+        case QImage::Format_RGB32:
+        {
+            if (!inCloneImageData) {
+                qWarning() << "QImageToCvMat() - Conversion requires cloning so we don't modify the original QImage data";
+            }
+
+            cv::Mat mat(inImage.height(), inImage.width(),
+                        CV_8UC4,
+                        const_cast<uchar*>(inImage.bits()),
+                        static_cast<size_t>(inImage.bytesPerLine())
+                        );
 
-        cv::Mat matNoAlpha;
+            cv::Mat matNoAlpha;
 
-        cv::cvtColor(mat, matNoAlpha, cv::COLOR_BGRA2BGR); // drop the all-white alpha channel
+            cv::cvtColor(mat, matNoAlpha, cv::COLOR_BGRA2BGR); // drop the all-white alpha channel
 
-        return matNoAlpha;
-      }
+            return matNoAlpha;
+        }
 
-        // 8-bit, 3 channel
-      case QImage::Format_RGB888:
-      {
-        if (!inCloneImageData) {
-          qWarning() << "QImageToCvMat() - Conversion requires cloning so we don't modify the original QImage data";
+            // 8-bit, 3 channel
+        case QImage::Format_RGB888:
+        {
+            if (!inCloneImageData) {
+                qWarning() << "QImageToCvMat() - Conversion requires cloning so we don't modify the original QImage data";
+            }
+
+            QImage swapped = inImage.rgbSwapped();
+
+            cv::Mat mat(swapped.height(), swapped.width(),
+                        CV_8UC3,
+                        const_cast<uchar*>(swapped.bits()),
+                        static_cast<size_t>(swapped.bytesPerLine())
+                        );
+            return inCloneImageData ? mat.clone() : mat;
+        }
+
+            // 8-bit, 1 channel
+        case QImage::Format_Grayscale8:
+        case QImage::Format_Indexed8:
+        {
+            cv::Mat mat(inImage.height(), inImage.width(),
+                        CV_8UC1,
+                        const_cast<uchar*>(inImage.bits()),
+                        static_cast<size_t>(inImage.bytesPerLine())
+                        );
+
+            return inCloneImageData ? mat.clone() : mat;
+        }
+
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
+        case QImage::Format_Grayscale16:
+        {
+            cv::Mat mat(cv::Size(inImage.width(),inImage.height()),CV_16U,const_cast<uchar*>(inImage.bits()),cv::Mat::AUTO_STEP);
+            return inCloneImageData ? mat.clone() : mat;
+        }
+#endif
+
+        default:
+            qWarning() << "QImageToCvMat() - QImage format not handled in switch:" << inImage.format();
+            break;
         }
 
-        QImage swapped = inImage.rgbSwapped();
-
-        cv::Mat mat(swapped.height(), swapped.width(),
-                    CV_8UC3,
-                    const_cast<uchar*>(swapped.bits()),
-                    static_cast<size_t>(swapped.bytesPerLine())
-                    );
-        return inCloneImageData ? mat.clone() : mat;
-      }
-
-        // 8-bit, 1 channel
-      case QImage::Format_Grayscale8:
-      case QImage::Format_Indexed8:
-      {
-        cv::Mat mat(inImage.height(), inImage.width(),
-                    CV_8UC1,
-                    const_cast<uchar*>(inImage.bits()),
-                    static_cast<size_t>(inImage.bytesPerLine())
-                    );
-
-        return inCloneImageData ? mat.clone() : mat;
-      }
-
-
-    #if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
-      case QImage::Format_Grayscale16:
-      {
-        cv::Mat mat(cv::Size(inImage.width(),inImage.height()),CV_16U,const_cast<uchar*>(inImage.bits()),cv::Mat::AUTO_STEP);
-        return inCloneImageData ? mat.clone() : mat;
-      }
-    #endif
-
-      default:
-        qWarning() << "QImageToCvMat() - QImage format not handled in switch:" << inImage.format();
-        break;
-      }
-
-      return cv::Mat();
+        return cv::Mat();
     }
 
     bool IsColor(MvGvspPixelType enType)

+ 1 - 0
q6_felgo_iot/header/m_json.h

@@ -34,6 +34,7 @@ public:
     QByteArray CmdParamconf_temp(int tpl,int tph);
     QByteArray CmdFocus();
     QByteArray WarnPhoto(QString err);
+    QByteArray MakeJsonRPC(const QString &methord,const QString &value);
 signals:
     void motor_initsuccess();
     void motor_movesuccess();

+ 12 - 8
q6_felgo_iot/header/m_opencv.h

@@ -53,15 +53,15 @@ public:
     //    clipLimit: 直方图裁剪阈值,2.0~4.0 适合显微,>5 会过增强
     //    tileGridSize: 局部直方图块大小,8 即 8x8,显微推荐 4~16
     cv::Mat enhanceContrastCLAHE(const cv::Mat& src,
-                                  double clipLimit = 2.0,
-                                  int tileGridSize = 8);
+                                 double clipLimit = 2.0,
+                                 int tileGridSize = 8);
 
     // 2) 自动对比度(百分位拉伸 / Percentile Stretch)
     //    把 [lowPct, highPct] 百分位映射到 [0,255],抗离群点(灰尘/气泡)
     //    lowPct=1, highPct=99 是业界默认,显微相机的灰尘像素不会被拉爆
     cv::Mat enhanceContrastAuto(const cv::Mat& src,
-                                 double lowPct = 1.0,
-                                 double highPct = 99.0);
+                                double lowPct = 1.0,
+                                double highPct = 99.0);
 
     // 3) Gamma 校正(非线性亮度拉伸)
     //    gamma<1: 提亮暗部(暗场显微常用)
@@ -74,7 +74,7 @@ public:
     //    视场中心-边缘的亮度差(显微镜的典型问题)
     //    sigmas: 多尺度高斯标准差(像素),推荐 {15, 80, 250}(显微默认)
     cv::Mat enhanceContrastRetinexMSR(const cv::Mat& src,
-                                       const std::vector<double>& sigmas = {15.0, 80.0, 250.0});
+                                      const std::vector<double>& sigmas = {15.0, 80.0, 250.0});
 
     // 5) 对比度增强统一入口(推荐 QML 用这一个)
     //    pipeline: 0=CLAHE  1=Auto  2=Gamma  3=RetinexMSR  4=CLAHE+Auto
@@ -90,12 +90,14 @@ public:
     //    sigma: 高斯半径,匹配物镜 PSF:20x 物镜 ~1.0,40x ~0.5
     //    noiseFloor: 噪声门限(拉普拉斯幅度),低于此的像素不锐化
     cv::Mat sharpenMicroscope(const cv::Mat& src,
-                               double amount = 1.0,
-                               double sigma = 1.0,
-                               double noiseFloor = 5.0);
+                              double amount = 1.0,
+                              double sigma = 1.0,
+                              double noiseFloor = 5.0);
 
     // ==================== DWT多聚焦融合算法 ====================
     QString fuseImages(const QStringList& imagePaths);
+    // 带进度回调的融合版本(回调在主线程执行)
+    QString fuseImages(const QStringList& imagePaths, std::function<void(const QString&, int)> progressCallback);
     // 主融合函数:融合多张不同焦点的图像(从QML调用,异步)
     // imagePaths: 输入图像文件路径列表
     Q_INVOKABLE void fuseImagesAsync(const QStringList& imagePaths);
@@ -150,6 +152,8 @@ public:
     cv::Mat unsharpMask(const cv::Mat& src, double amount = 1.0, double sigma = 1.5);
 
 signals:
+    // 融合进度信号
+    void fusionProgress(const QString& message, int percent);
     // 融合完成信号
     void fuseFinished(const QString& resultPath);
     // 对比度增强完成信号(异步任务用)

+ 1 - 1
q6_felgo_iot/header/main.h

@@ -37,7 +37,7 @@
 #include <opencv2/features2d/features2d.hpp>
 #include <opencv2/xfeatures2d/nonfree.hpp>
 
-#define APP_VERSION "1.11.30"
+#define APP_VERSION "1.12.30"
 
 using namespace std;
 

+ 0 - 1
q6_felgo_iot/header/mqtthandler.h

@@ -161,7 +161,6 @@ private:
     int m_uploadBatchSize = 1; // 可配置
     QHash<quint16, std::function<void(bool)>> m_pendingAcks; // 消息ID -> 回调
     QTimer *image_reupload;
-    Serial_AT serial_4g;
 };
 
 class CurlHandler : public QThread

+ 5 - 0
q6_felgo_iot/header/mserial.h

@@ -116,6 +116,11 @@ public:
     Q_INVOKABLE QString get_app_version(){
         return APP_VERSION;
     }
+
+    Q_INVOKABLE void makeJsonRpc(const QString &method,const QString &value)
+    {
+        sendData(m_json.MakeJsonRPC(method,value));
+    }
 signals:
     void dataReceived(const QByteArray &data);
     void dataUpload(const QByteArray &data);

+ 110 - 6
q6_felgo_iot/qml/Main.qml

@@ -1,4 +1,5 @@
 import QtQuick
+import QtQuick.Layouts
 import Felgo
 import QtQuick.Controls
 import "pages"
@@ -31,12 +32,12 @@ App {
     property string txDataLog: ""
     property string rxDataLog: ""
 
+
     // 初始为纯黑色,强制设置为不透明,防止花屏
     color: "#000000"
 
     property string boardversionText: ""
     property string appversionText: ""
-
     property bool tempProtectionState: false  // 温度保护状态,true表示处于保护状态
 
     property int logoutcnt
@@ -196,7 +197,7 @@ App {
         NavigationStack {
           initialPage: ProfilePage {
               id: page_sys
-              onThemChange: function(mode) {
+              onThemChange: {
                 console.log("配置主题模式:",mode)
                 app.theme_md = mode
                 if (mode !== "auto") {
@@ -257,6 +258,113 @@ App {
         }
     }
 
+    // ========== 全局融合进度弹窗 ==========
+    property bool isGlobalFusing: false
+    property string globalFusionMessage: ""
+    property int globalFusionPercent: 0
+
+    Connections {
+        target: opencvFunc
+        function onFusionProgress(message, percent) {
+            console.log("[Main] 融合进度:", message, percent + "%")
+            if (percent >= 100) {
+                // 完成后延迟关闭弹窗,让用户看到完成状态
+                globalFusionMessage = message
+                globalFusionPercent = percent
+                Qt.callLater(function() {
+                    isGlobalFusing = false
+                })
+            } else {
+                isGlobalFusing = true
+                globalFusionMessage = message
+                globalFusionPercent = percent
+            }
+        }
+        function onFuseFinished(resultPath) {
+            isGlobalFusing = false
+            console.log("[Main] 融合结束:", resultPath)
+        }
+    }
+
+    Popup {
+        id: globalFusionPopup
+        anchors.centerIn: parent
+        width: Math.min(parent.width * 0.8, 360)
+        modal: true
+        focus: true
+        closePolicy: Popup.NoAutoClose
+        visible: isGlobalFusing
+        padding: 20
+        z: 99999
+
+        background: Rectangle {
+            color: "white"
+            radius: 8
+            border.color: "#28a779"
+            border.width: 2
+        }
+
+        contentItem: ColumnLayout {
+            spacing: 16
+
+            Text {
+                Layout.fillWidth: true
+                text: "图像融合中"
+                font.pixelSize: 18
+                font.bold: true
+                color: "#28a779"
+                horizontalAlignment: Text.AlignHCenter
+            }
+
+            BusyIndicator {
+                Layout.alignment: Qt.AlignHCenter
+                running: globalFusionPopup.visible
+                width: 48
+                height: 48
+            }
+
+            Text {
+                Layout.fillWidth: true
+                text: globalFusionMessage
+                font.pixelSize: 14
+                color: "#333"
+                horizontalAlignment: Text.AlignHCenter
+                wrapMode: Text.WordWrap
+            }
+
+            ProgressBar {
+                id: globalFusionProgressBar
+                Layout.fillWidth: true
+                from: 0
+                to: 100
+                value: globalFusionPercent
+
+                background: Rectangle {
+                    implicitHeight: 8
+                    color: "#eee"
+                    radius: 4
+                }
+                contentItem: Item {
+                    implicitHeight: 8
+                    Rectangle {
+                        width: globalFusionProgressBar.visualPosition * parent.width
+                        height: parent.height
+                        radius: 4
+                        color: "#28a779"
+                    }
+                }
+            }
+
+            Text {
+                Layout.fillWidth: true
+                text: globalFusionPercent.toFixed(0) + "%"
+                font.pixelSize: 12
+                color: "#666"
+                horizontalAlignment: Text.AlignHCenter
+            }
+        }
+    }
+
     Component.onCompleted: {
         console.log("App Component.onCompleted, starting phased loading...")
     }
@@ -278,9 +386,6 @@ App {
         opacity: dataModel.userLoggedIn ? 0 : 1
         Behavior on opacity { NumberAnimation { duration: 250 } } // page fade in/out
     }
-
-
-
     Rectangle {
         id: rxFloatingWindow
         visible: floatPanel
@@ -359,5 +464,4 @@ App {
             drag.axis: Drag.XAndYAxis
         }
     }
-
 }

+ 86 - 72
q6_felgo_iot/qml/pages/HomePage.qml

@@ -203,20 +203,7 @@ AppPage {
               }
               if(tapeUsage < 100) tapeAlertShown = false
           }
-          if(jsonData.ext.filter_used){
-              filterUsage = Number(jsonData.ext.filter_used)
-              if(filterUsage >= 100 && !filterAlertShown){
-                  filterAlertShown = true
-                  nativeUtils.displayMessageBox("滤网更换提醒", "滤网使用量已达到100%,请及时更换滤网!", 1)
-              }
-              if(filterUsage < 100) filterAlertShown = false
-          }
-          if(jsonData.ext.freq_filter){
-              freq_filter = jsonData.ext.freq_filter
-          }
-          if(jsonData.ext.worked_day){
-              worked_day = jsonData.ext.worked_day
-          }
+
       }
       
       function onDisconnect_485(){
@@ -267,6 +254,55 @@ AppPage {
       return `${years}-${formatNum(mon)}-${formatNum(dates)} ${formatNum(hours)}:${formatNum(mins)}:${formatNum(secs)}`
   }
 
+  // 胶带重置输入对话框
+   AppModal {
+       id: tapeResetModal
+       fullscreen: false
+       modalHeight: dp(200)
+       visible: false
+
+       Column {
+           anchors.fill: parent
+           padding: dp(20)
+           spacing: dp(15)
+
+           AppText {
+               anchors.horizontalCenter: parent.horizontalCenter
+               text: "请输入胶带使用量:"
+               fontSize: 16
+               font.bold: true
+           }
+
+           TextField {
+               id: tapeInput
+               anchors.horizontalCenter: parent.horizontalCenter
+               width: dp(200)
+               height: dp(40)
+               text: "50000"
+               inputMethodHints: Qt.ImhDigitsOnly
+           }
+
+           Row {
+               anchors.horizontalCenter: parent.horizontalCenter
+               spacing: dp(30)
+
+               AppButton {
+                   text: "确定"
+                   onClicked: {
+                       tapeResetModal.close()
+                       serial.makeJsonRpc("tape_reset", tapeInput.text)
+                   }
+               }
+               AppButton {
+                   text: "取消"
+                   onClicked: {
+                       tapeResetModal.close()
+                   }
+               }
+           }
+       }
+   }
+
   Grid {
       anchors.fill: parent
       anchors.leftMargin: 5
@@ -486,64 +522,42 @@ AppPage {
                     }
 
                     // 胶带使用量
-                    Column {
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        spacing: 3
-                        width: dp(120)
-                        AppText {
-                            anchors.horizontalCenter: parent.horizontalCenter
-                            text: "胶带: " + tapeUsage.toFixed(2) + "%"
-                            color: tapeUsage >= 100 ? "#ff4444" : "#666666"
-                            fontSize: 12
-                        }
-                        Rectangle {
-                            anchors.horizontalCenter: parent.horizontalCenter
-                            width: dp(100)
-                            height: dp(6)
-                            color: "#e8e8e8"
-                            radius: dp(3)
-                            Rectangle {
-                                width: parent.width * Math.min(tapeUsage, 100) / 100
-                                height: parent.height
-                                color: tapeUsage >= 100 ? "#ff4444" : "#28a779"
-                                radius: dp(3)
-                            }
-                        }
-                    }
-
-                    // 滤网使用量
-                    Column {
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        spacing: 3
-                        width: dp(120)
-                        AppText {
-                            anchors.horizontalCenter: parent.horizontalCenter
-                            text: "滤网: " + filterUsage.toFixed(2) + "%"
-                            color: filterUsage >= 100 ? "#ff4444" : "#666666"
-                            fontSize: 12
-                        }
-                        Rectangle {
-                            anchors.horizontalCenter: parent.horizontalCenter
-                            width: dp(100)
-                            height: dp(6)
-                            color: "#e8e8e8"
-                            radius: dp(3)
-                            Rectangle {
-                                width: parent.width * Math.min(filterUsage, 100) / 100
-                                height: parent.height
-                                color: filterUsage >= 100 ? "#ff4444" : "#28a779"
-                                radius: dp(3)
-                            }
-                        }
-                    }
-
-                    // 自清洁周期
-                    AppText {
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        text: "自清洁周期: " + Number(worked_day).toString() + "/" + Number(freq_filter).toString()
-                        color: app.fontColor
-                        fontSize: 11
-                    }
+                   Column {
+                       anchors.horizontalCenter: parent.horizontalCenter
+                       spacing: 3
+                       width: dp(120)
+                       AppText {
+                           id: tapeText
+                           anchors.horizontalCenter: parent.horizontalCenter
+                           text: "胶带使用量(" + Number(tape_used).toString() + "/" + Number(tape_max).toString() + "):" + tapeUsage.toFixed(2)+"%"
+                           color: tapeUsage >= 100 ? "red" : "gray"
+                           fontSize: 12
+                           // 长按弹出重置确认对话框
+                           Timer {
+                               id: tapeLongPressTimer
+                               interval: 1000
+                               onTriggered: {
+                                   tapeInput.text = "0"
+                                   tapeResetModal.open()
+                               }
+                           }
+                           MouseArea {
+                               anchors.fill: parent
+                               onPressed:  tapeLongPressTimer.start()
+                               onReleased: tapeLongPressTimer.stop()
+                               onCanceled:  tapeLongPressTimer.stop()
+                           }
+                       }
+                       ProgressBar {
+                           id: tapeProgressBar
+                           anchors.horizontalCenter: parent.horizontalCenter
+                           width: dp(100)
+                           height: dp(8)
+                           from: 0
+                           to: 100
+                           value: Math.min(tapeUsage, 100)
+                       }
+                   }
                 }
             }
 

+ 10 - 12
q6_felgo_iot/qml/pages/PhotostitcherPage.qml

@@ -30,23 +30,14 @@ AppPage {
             if (selectedImages.length >= 2) {
                 isFusing = true
                 console.log("开始融合", selectedImages.length, "张图片")
+                app.isGlobalFusing = true
+                app.globalFusionMessage = "开始融合..."
+                app.globalFusionPercent = 0
                 opencvFunc.fuseImagesAsync(selectedImages)
             }
         }
     }
 
-    // 融合加载动画
-    BusyIndicator {
-        id: fuseBusyIndicator
-        anchors.bottom: parent.bottom
-        anchors.right: parent.right
-        anchors.margins: 20
-        visible: isFusing
-        width: 60
-        height: 60
-        z: 100
-    }
-
     // 取消选择按钮
     AppButton {
         id: cancelButton
@@ -68,6 +59,7 @@ AppPage {
         target: opencvFunc
         function onFuseFinished(resultPath) {
             isFusing = false
+            app.isGlobalFusing = false
             if (resultPath) {
                 console.log("融合完成:", resultPath)
                 // 显示融合结果
@@ -78,6 +70,12 @@ AppPage {
                 console.error("融合失败")
             }
         }
+
+        // 融合进度信号
+        function onFusionProgress(message, percent) {
+            console.log("融合进度:", message, percent + "%")
+            // 全局弹窗由 Main.qml 监听
+        }
     }
 
     function clearSelection() {

+ 20 - 40
q6_felgo_iot/qml/pages/TestPage.qml

@@ -27,6 +27,8 @@ AppPage {
     property int stepDistance: 20  // 步进脉冲数量
     property string fExposureTime: "0"
     property bool motorUnlocked: false
+    property real coordX: 0
+    property real coordY: 0
 
     function autotake(sw){
         if(sw)
@@ -186,10 +188,10 @@ AppPage {
             try {
                 var jsonData = JSON.parse(data)
                 if(jsonData.ext && !textInput_x.focus && jsonData.ext.x_init_dis !== undefined) {
-                    textInput_x.text = jsonData.ext.x_init_dis.toString()
+                    coordX = parseInt(jsonData.ext.x_init_dis) || 0
                 }
                 if(jsonData.ext && !textInput_y.focus && jsonData.ext.y_init_dis !== undefined) {
-                    textInput_y.text = jsonData.ext.y_init_dis.toString()
+                    coordY = parseInt(jsonData.ext.y_init_dis) || 0
                 }
             } catch(e) {
                 console.log("解析坐标数据失败:", e)
@@ -488,30 +490,6 @@ AppPage {
                     }
 
                 }
-                // 滤网更换测试按钮(始终可见)
-                Row {
-                    spacing: dp(120)
-
-                    AppText {
-                        text: "滤网更换"
-                        color: app.fontColor
-                        fontSize: 15
-                        anchors.verticalCenter: selfclean_switch.verticalCenter
-                    }
-
-                    AppSwitch {
-                        id: selfclean_switch
-                        onToggled: {
-                            if(selfclean_switch.checked==true){
-                                apptext_res.text = "自清洁测试中..."
-                                serial.sendCmd("selfclean",true,"","");
-                            }else{
-                                serial.sendCmd("selfclean",false,"","");
-                                apptext_res.text = "自清洁已停止"
-                            }
-                        }
-                    }
-                }
                 // 分割线
                 Rectangle {
                     visible: !motorUnlocked
@@ -560,7 +538,7 @@ AppPage {
                                 inputMethodHints: Qt.ImhDigitsOnly
                                 anchors.verticalCenter: parent.verticalCenter
                                 onAccepted: {
-                                    if(text === "123456"){
+                                    if(text === "666888"){
                                         motorUnlocked = true
                                         text = ""
                                     }else{
@@ -578,7 +556,7 @@ AppPage {
                                 minimumWidth: dp(55)
                                 anchors.verticalCenter: parent.verticalCenter
                                 onClicked: {
-                                    if(motorPasswordInput.text === "123456"){
+                                    if(motorPasswordInput.text === "666888"){
                                         motorUnlocked = true
                                         motorPasswordInput.text = ""
                                     }else{
@@ -849,19 +827,20 @@ AppPage {
                                 width: parent.width - dp(80)
                                 height: dp(40)
                                 placeholderText: "0"
-                                text: "0"
+                                text: coordX.toString()
                                 font.family: "Arial"
                                 font.pixelSize: 15
-                                validator: DoubleValidator { decimals: 2 }
+                                validator: IntValidator { }
                                 EnterKey.type: Qt.EnterKeyDone
-                                inputMethodHints: Qt.ImhFormattedNumbersOnly
-                                property real numericValue_x: Number(text) || 0
+                                inputMethodHints: Qt.ImhDigitsOnly
                                 Keys.onReturnPressed: {
-                                    serial.setHt_xy_dis(numericValue_x, textInput_y.numericValue_y)
+                                    coordX = parseInt(text) || 0
+                                    serial.setHt_xy_dis(coordX, coordY)
                                     Qt.inputMethod.hide()
                                 }
                                 onAccepted: {
-                                    serial.setHt_xy_dis(numericValue_x, textInput_y.numericValue_y)
+                                    coordX = parseInt(text) || 0
+                                    serial.setHt_xy_dis(coordX, coordY)
                                 }
                             }
                         }
@@ -882,19 +861,20 @@ AppPage {
                                 width: parent.width - dp(80)
                                 height: dp(40)
                                 placeholderText: "0"
-                                text: "0"
+                                text: coordY.toString()
                                 font.family: "Arial"
                                 font.pixelSize: 15
-                                validator: DoubleValidator { decimals: 2 }
+                                validator: IntValidator { }
                                 EnterKey.type: Qt.EnterKeyDone
-                                inputMethodHints: Qt.ImhFormattedNumbersOnly
-                                property real numericValue_y: Number(text) || 0
+                                inputMethodHints: Qt.ImhDigitsOnly
                                 Keys.onReturnPressed: {
-                                    serial.setHt_xy_dis(textInput_x.numericValue_x, numericValue_y)
+                                    coordY = parseInt(text) || 0
+                                    serial.setHt_xy_dis(coordX, coordY)
                                     Qt.inputMethod.hide()
                                 }
                                 onAccepted: {
-                                    serial.setHt_xy_dis(textInput_x.numericValue_x, numericValue_y)
+                                    coordY = parseInt(text) || 0
+                                    serial.setHt_xy_dis(coordX, coordY)
                                 }
                             }
                         }

Разница между файлами не показана из-за своего большого размера
+ 309 - 588
q6_felgo_iot/src/cameramanager.cpp


+ 21 - 0
q6_felgo_iot/src/m_json.cpp

@@ -354,6 +354,27 @@ JsonFunc::CmdFocus(){
     return transmitDataTemp;
 }
 
+QByteArray
+JsonFunc::MakeJsonRPC(const QString &methord,const QString &value)
+{
+    QByteArray transmitDataTemp;
+    // 定义 { } 对象
+    QJsonObject slideObj;
+    QJsonObject paramsObjext;
+    slideObj.insert("jsonrpc","2.0");
+    slideObj.insert("method",methord);  //Y轴初始化
+    if(methord.contains("tape_reset")){
+        paramsObjext.insert("tape_max",value.toInt());
+        slideObj.insert("params",paramsObjext);
+    }
+    slideObj.insert("id",1);
+    QJsonDocument document=QJsonDocument(slideObj);
+    transmitDataTemp = document.toJson();
+    transmitDataTemp = transmitDataTemp.trimmed();  //去除字符串两端的空格和换行符
+    return transmitDataTemp;
+    //serial_main->sendData(transmitDataTemp);
+};
+
 void
 JsonFunc::setmqttState_d()
 {

+ 69 - 57
q6_felgo_iot/src/m_opencv.cpp

@@ -16,6 +16,7 @@
 #include <thread>
 #include <atomic>
 #include <mutex>
+#include <functional>
 
 // 非 free 模块,Felgo Android 已默认 opencv_contrib 之外的子模块编译
 #include <opencv2/photo.hpp>            // CLAHE
@@ -32,7 +33,7 @@ struct ScopedTimer {
     ~ScopedTimer() {
         qint64 ms = QDateTime::currentMSecsSinceEpoch() - startMs;
         LOG("[{}] elapsed = {} ms", label.toStdString(), (long long)ms);
-        qDebug().noquote() << "[Timing]" << label << "=" << ms << "ms";
+        DEBUG("[Timing] {} = {}ms", label.toStdString(), (long long)ms);
     }
 };
 
@@ -81,7 +82,7 @@ static size_t estimateFusionMemoryMBWork(int rows, int cols, int channels, int n
         16.0;                  // Laplacian pyramid
     const double fusedBytes = 12.0 * workRows * workCols;
     return (size_t)(((origBytes + workBytes * workRows * workCols) * nImages + fusedBytes)
-                    / (1024.0 * 1024.0));
+                     / (1024.0 * 1024.0));
 }
 
 // 限制 OpenCV 内部线程数,避免与 std::async 叠加炸线程
@@ -90,7 +91,7 @@ static void capOpenCVThreads() {
     if (hw <= 0) hw = 2;
     int cap = std::min(hw, 2); // 显微场景硬限 2 线程,避免 OOM
     cv::setNumThreads(cap);
-    qDebug() << "[Fusion] OpenCV threads capped to" << cap;
+    DEBUG("[Fusion] OpenCV threads capped to {}", cap);
 }
 
 // ============== 内部融合算法实现 ==============
@@ -181,7 +182,7 @@ static void buildGaussianPyramid(const cv::Mat& src, std::vector<cv::Mat>& pyr,
 
 // 3) 构建拉普拉斯金字塔(图像金字塔用),对各层做拉普拉斯差分
 static void buildLaplacianPyramid(const std::vector<cv::Mat>& gauss,
-                                    std::vector<cv::Mat>& lap, int levels) {
+                                  std::vector<cv::Mat>& lap, int levels) {
     lap.assign(levels, cv::Mat());
     // 与 gauss 同深度(保留通道数:3 通道图 → 3 通道 Laplacian)
     const int depth = (gauss.empty() ? CV_32F : gauss[0].depth());
@@ -198,7 +199,7 @@ static void buildLaplacianPyramid(const std::vector<cv::Mat>& gauss,
 
 // 4) 拉普拉斯金字塔重构:从顶层向下叠加重构
 static void reconstructFromLaplacianPyramid(const std::vector<cv::Mat>& lap,
-                                              cv::Mat& out, int levels) {
+                                            cv::Mat& out, int levels) {
     cv::Mat cur = lap[levels - 1].clone();
     for (int i = levels - 2; i >= 0; --i) {
         cv::Mat up;
@@ -223,7 +224,7 @@ static cv::Mat pyramidBlendFusion(const std::vector<cv::Mat>& images, int reques
         while (std::min(h, w) >= 16) { ++autoMaxLevels; h /= 2; w /= 2; }
     }
     int levels = std::max(2, std::min(requestedLevels, autoMaxLevels));
-    qDebug() << "[Pyramid] Using" << levels << "levels (max" << autoMaxLevels << ")";
+    DEBUG("[Pyramid] Using {} levels (max {})", levels, autoMaxLevels);
 
     capOpenCVThreads();
 
@@ -421,8 +422,7 @@ static cv::Mat weightedLaplacianFusion(const std::vector<cv::Mat>& images,
     const int cols = images[0].cols;
     const int ch = images[0].channels();
 
-    qDebug() << "[FlatFusion] N=" << N << "size=" << cols << "x" << rows
-             << "wp=" << weightPow << "sigma=" << smoothSigma;
+    DEBUG("[FlatFusion] N={} size={}x{} wp={} sigma={}", N, cols, rows, weightPow, smoothSigma);
 
     capOpenCVThreads();
 
@@ -519,6 +519,16 @@ static cv::Mat weightedLaplacianFusion(const std::vector<cv::Mat>& images,
 
 // 内部同步融合方法
 QString OpencvFunc::fuseImages(const QStringList& imagePaths) {
+    return fuseImages(imagePaths, nullptr);
+}
+
+QString OpencvFunc::fuseImages(const QStringList& imagePaths, std::function<void(const QString&, int)> progressCallback) {
+    auto report = [&progressCallback](const QString &msg, int percent) {
+        if (progressCallback) {
+            progressCallback(msg, percent);
+        }
+    };
+
     QElapsedTimer totalTimer; totalTimer.start();
     QElapsedTimer stageTimer;
     try {
@@ -541,6 +551,7 @@ QString OpencvFunc::fuseImages(const QStringList& imagePaths) {
             qWarning() << "First image invalid:" << firstPath;
             return QString();
         }
+        report(QString("加载图片 1/%1...").arg(N), 5);
         cv::Mat first = cv::imread(firstPath.toStdString(), cv::IMREAD_COLOR);
         if (first.empty()) {
             qWarning() << "Failed to load first image:" << firstPath;
@@ -556,8 +567,7 @@ QString OpencvFunc::fuseImages(const QStringList& imagePaths) {
         const size_t estMB = estimateFusionMemoryMB(rows, cols, channels, N);
         LOG("[fuseImages] estimated peak memory (orig-res) = {} MB for {}x{}x{}x{}",
             (long long)estMB, N, rows, cols, channels);
-        qDebug().noquote() << "[Fusion] estimated memory (orig-res) ~" << estMB << "MB for"
-                           << N << "x" << rows << "x" << cols;
+        DEBUG("[Fusion] estimated memory (orig-res) ~ {} MB for {}x{}x{}x{}", (long long)estMB, N, rows, cols, channels);
 
         // 工作分辨率(与 fuseAdvanced 内部 WORK_MAX_EDGE 保持一致)
         int workRows = rows, workCols = cols;
@@ -573,8 +583,7 @@ QString OpencvFunc::fuseImages(const QStringList& imagePaths) {
             estimateFusionMemoryMBWork(rows, cols, channels, N, workRows, workCols);
         LOG("[fuseImages] estimated peak memory (work-res {}x{}) = {} MB",
             workCols, workRows, (long long)estMBWork);
-        qDebug().noquote() << QString("[Fusion] estimated memory (work %1x%2) ~ %3 MB")
-                                  .arg(workCols).arg(workRows).arg(estMBWork);
+        DEBUG("[Fusion] estimated memory (work {}x{}) ~ {} MB", workCols, workRows, (long long)estMBWork);
 
         // 硬上限:使用工作分辨率估算,且区分平台(Android 更严,Linux/嵌入式宽松)
         // - Android: 512MB
@@ -595,6 +604,8 @@ QString OpencvFunc::fuseImages(const QStringList& imagePaths) {
         }
 
         // ---- 阶段 2:加载剩余图(受控并行:最多 4 worker)----
+        report(QString("加载剩余图片..."), 15);
+
         std::vector<cv::Mat> loaded;
         loaded.reserve(N);
         loaded.push_back(std::move(first));
@@ -640,10 +651,12 @@ QString OpencvFunc::fuseImages(const QStringList& imagePaths) {
         }
         qint64 loadMs = stageTimer.elapsed();
         LOG("[fuseImages] loaded {} images in {} ms", (int)loaded.size(), (long long)loadMs);
-        qDebug().noquote() << "[Fusion]" << "Loaded" << loaded.size() << "images in" << loadMs << "ms";
+        report(QString("加载完成,共%1张图片").arg(loaded.size()), 25);
+        DEBUG("[Fusion] Loaded {} images in {} ms", (int)loaded.size(), (long long)loadMs);
 
         // ---- 阶段 3:尺寸归一化 ----
         stageTimer.restart();
+        report("归一化图片尺寸...", 30);
         for (size_t i = 1; i < loaded.size(); ++i) {
             if (loaded[i].rows != rows || loaded[i].cols != cols || loaded[i].channels() != channels) {
                 cv::Size gotSize = loaded[i].size();
@@ -672,16 +685,16 @@ QString OpencvFunc::fuseImages(const QStringList& imagePaths) {
         qint64 totalPixels = (qint64)loaded.size() * rows * cols;
         LOG("[fuseImages] images={}, size={}x{}, channels={}, totalPixels={} ({:.2f} MP)",
             (int)loaded.size(), rows, cols, channels, totalPixels, totalPixels / 1e6);
-        qDebug().noquote() << QString("[Fusion] images=%1, size=%2x%3, channels=%4, MP=%5")
-                                  .arg(loaded.size()).arg(rows).arg(cols).arg(channels)
-                                  .arg(totalPixels / 1e6, 0, 'f', 2);
+        DEBUG("[Fusion] images={}, size={}x{}, channels={}, MP={:.2f}", (int)loaded.size(), rows, cols, channels, totalPixels / 1e6);
 
         // ---- 阶段 4:高级融合流水线(CLAHE + ECC + 3级HaarDWT + 双边后处理)----
         stageTimer.restart();
+        report("正在进行图像融合...", 35);
         // 使用输入图片所在目录保存融合结果
         QFileInfo firstFile(firstPath);
         QString outDir = firstFile.absolutePath();
         cv::Mat fused = fuseAdvanced(loaded, outDir);
+        report("融合完成", 45);
         qint64 fuseMs = stageTimer.elapsed();
         if (fused.empty()) {
             qWarning() << "Fusion failed!";
@@ -690,28 +703,28 @@ QString OpencvFunc::fuseImages(const QStringList& imagePaths) {
 
         // ---- 阶段 5:保存 ----
         stageTimer.restart();
+        report("保存融合结果...", 48);
         QDir().mkpath(outDir);
         QString timestamp = QDateTime::currentDateTime().toString("yyyyMMdd_hhmmss");
-        QString fileName = QString("fused_%1.png").arg(timestamp);
+        QString fileName = QString("fused_%1.jpg").arg(timestamp);
         QString fullPath = outDir + "/" + fileName;
 
         // 用 PNG 无损保存——JPEG 在 quality=92 仍会引入 8x8 DCT 块伪影,
         // 在显微多焦点融合结果(高频细节 + 局部对比拉伸)上会显现为网格阴影。
         // PNG 无损,融合结果所见即所得;文件大小对显微图可接受。
-        std::vector<int> params = {cv::IMWRITE_PNG_COMPRESSION, 3};
+        std::vector<int> params = {cv::IMWRITE_JPEG_QUALITY, 95};
         if (!cv::imwrite(fullPath.toStdString(), fused, params)) {
             qWarning() << "Failed to save fused image:" << fullPath;
             return QString();
         }
+        report("保存完成", 50);
         qint64 saveMs = stageTimer.elapsed();
 
         qint64 totalMs = totalTimer.elapsed();
         LOG("[fuseImages] total = {} ms (load={} norm={} fuse={} save={})",
             (long long)totalMs, (long long)loadMs, (long long)normMs,
             (long long)fuseMs, (long long)saveMs);
-        qDebug().noquote() << QString("[Fusion] TOTAL=%1ms (load=%2 norm=%3 fuse=%4 save=%5) -> %6")
-                                  .arg(totalMs).arg(loadMs).arg(normMs).arg(fuseMs).arg(saveMs)
-                                  .arg(fullPath);
+        DEBUG("[Fusion] TOTAL={}ms (load={} norm={} fuse={} save={}) -> {}", (long long)totalMs, (long long)loadMs, (long long)normMs, (long long)fuseMs, (long long)saveMs, fullPath.toStdString());
         return fullPath;
     } catch (const cv::Exception& e) {
         qCritical() << "OpenCV exception in fuseImages:" << e.what();
@@ -757,7 +770,7 @@ QString OpencvFunc::brenner(cv::Mat &image)
     QString str;
     if (image.size==0)
     {
-        qDebug() <<"空图片!";
+        DEBUG("空图片!");
         return "";
     }
     cv::Mat gray_img;
@@ -766,7 +779,7 @@ QString OpencvFunc::brenner(cv::Mat &image)
     }else if(image.channels() == 3){
         cv::cvtColor(image, gray_img, COLOR_BGR2GRAY);
     }else{
-        qDebug() <<"不支持的通道数!";
+        WARN("不支持的通道数!");
     }
     // 修复点1: parallel_for_ 内累加到 result(double&) 是数据竞争,UB。
     //          改用每行局部 double + reduce,OpenCV 的 parallel_for_ 不支持
@@ -844,7 +857,7 @@ QString OpencvFunc::calculateSharpness(const QImage& image){
 QString OpencvFunc::Laplacian(cv::Mat &image){
     if (image.size==0)
     {
-        qDebug() <<"空图片!";
+        DEBUG("空图片!");
         return "";
     }
     cv::Mat grayImage;
@@ -910,7 +923,7 @@ int OpencvFunc::CustomSharpening(const QString &path)
     //          在显微自动拍照 → 锐化 → 上传 的流程中,一旦代码异常,
     //          原始 RAW 数据就丢了。改为写新文件 _sharp.png,原文件保留。
     const QString outPath = QFileInfo(path).absolutePath() + "/"
-                          + QFileInfo(path).completeBaseName() + "_sharp.png";
+                            + QFileInfo(path).completeBaseName() + "_sharp.png";
 
     // 转换为浮点型以便进行精确计算
     Mat srcFloat;
@@ -962,7 +975,7 @@ Mat OpencvFunc::qim2mat(QImage &qim)
                   CV_8UC4,(void*)qim.constBits(),qim.bytesPerLine());
         break;
     default:
-        qDebug() <<"QImage to mat failed!";
+        DEBUG("QImage to mat failed!");
         break;
     }
     return mat;
@@ -1551,7 +1564,7 @@ cv::Mat OpencvFunc::fuseAdvanced(const std::vector<cv::Mat>& images,
         canon.push_back(ci);
     }
     const int N = (int)canon.size();
-    qDebug() << "[HalconFusion] N=" << N << "size=" << cols << "x" << rows;
+    DEBUG("[HalconFusion] N={} size={}x{}", N, cols, rows);
 
     // ---------- 2) 多尺度 AGD 清晰度图 ----------
     //
@@ -1771,8 +1784,7 @@ cv::Mat OpencvFunc::fuseAdvanced(const std::vector<cv::Mat>& images,
     }
 #endif
     //锐化
-    qDebug() << "[HalconFusion] done, output" << cols << "x" << rows
-             << "sigma=" << sigmaFuse;
+    DEBUG("[HalconFusion] done, output {}x{} sigma={}", cols, rows, sigmaFuse);
     cv::Mat fused_sharp = unsharpMask(fused, 2.0, 3.0);
     //对比度增强
     cv::Mat fused_contrast = enhanceContrast(fused_sharp,0);
@@ -1821,7 +1833,7 @@ cv::Mat OpencvFunc::unsharpMask(const cv::Mat& src, double amount, double sigma)
     cv::Mat result;
     resultF32.convertTo(result, CV_8U);
 
-    qDebug() << "[unsharpMask] done, amount=" << amount << "sigma=" << sigma;
+    DEBUG("[unsharpMask] done, amount={} sigma={}", amount, sigma);
     return result;
 }
 
@@ -1886,8 +1898,8 @@ OpencvFunc::MicroscopeFocusMetrics OpencvFunc::evaluateFocusScore(const cv::Mat&
         }
         double cur = brennerSum.load(std::memory_order_relaxed);
         while (!brennerSum.compare_exchange_weak(cur, cur + local,
-                                                  std::memory_order_relaxed,
-                                                  std::memory_order_relaxed)) {}
+                                                 std::memory_order_relaxed,
+                                                 std::memory_order_relaxed)) {}
     });
     out.brenner = brennerSum.load() / std::max(1, rows * cols);
 
@@ -1934,8 +1946,8 @@ static cv::Mat toLabLchannel(const cv::Mat& src, cv::Mat& labOut) {
 //   clipLimit     = 2.0~4.0;>5 会过增强(噪声也放大)
 //   tileGridSize  = 8(即 8x8 tiles,约 160x120 像素每块,匹配 20x 物镜视场)
 cv::Mat OpencvFunc::enhanceContrastCLAHE(const cv::Mat& src,
-                                          double clipLimit,
-                                          int tileGridSize) {
+                                         double clipLimit,
+                                         int tileGridSize) {
     if (src.empty()) return cv::Mat();
     static cv::Ptr<cv::CLAHE> cachePtr;
     static double cachedClip = 0;
@@ -1977,8 +1989,8 @@ cv::Mat OpencvFunc::enhanceContrastCLAHE(const cv::Mat& src,
 //   显微相机最容易踩的坑: 极少数高亮点(如气泡反光)把 highPct 顶到 255,
 //                       一拉伸其它全压暗。改用百分位能彻底规避。
 cv::Mat OpencvFunc::enhanceContrastAuto(const cv::Mat& src,
-                                         double lowPct,
-                                         double highPct) {
+                                        double lowPct,
+                                        double highPct) {
     if (src.empty()) return cv::Mat();
     cv::Mat gray;
     if (src.channels() == 1) {
@@ -2111,7 +2123,7 @@ cv::Mat OpencvFunc::enhanceContrastGamma(const cv::Mat& src, double gamma, bool
 //   显微推荐 sigmas = {15, 80, 250}
 //   复杂度: O(N · Σ_i ksize² · HW)  → 显微 5MP 比 CLAHE 慢 5~10x,但比 Laplacian 融合快
 cv::Mat OpencvFunc::enhanceContrastRetinexMSR(const cv::Mat& src,
-                                               const std::vector<double>& sigmas) {
+                                              const std::vector<double>& sigmas) {
     if (src.empty()) return cv::Mat();
     cv::Mat work;
     if (src.channels() == 4) cv::cvtColor(src, work, cv::COLOR_BGRA2BGR);
@@ -2194,23 +2206,23 @@ cv::Mat OpencvFunc::enhanceContrast(const cv::Mat& src, int pipeline) {
     if (src.empty()) return cv::Mat();
     cv::Mat cur = src;
     switch (pipeline) {
-        case 0: return enhanceContrastCLAHE(cur);
-        case 1: return enhanceContrastAuto(cur);
-        case 2: return enhanceContrastGamma(cur, 1.0, true);
-        case 3: return enhanceContrastRetinexMSR(cur);
-        case 4: {
-            cv::Mat a = enhanceContrastCLAHE(cur);
-            return enhanceContrastAuto(a);
-        }
-        case 5: {
-            cv::Mat a = enhanceContrastAuto(cur);
-            return enhanceContrastRetinexMSR(a);
-        }
-        case 6: {
-            cv::Mat g = enhanceContrastGamma(cur, 1.0, true);
-            return enhanceContrastCLAHE(g);
-        }
-        default: return src.clone();
+    case 0: return enhanceContrastCLAHE(cur);
+    case 1: return enhanceContrastAuto(cur);
+    case 2: return enhanceContrastGamma(cur, 1.0, true);
+    case 3: return enhanceContrastRetinexMSR(cur);
+    case 4: {
+        cv::Mat a = enhanceContrastCLAHE(cur);
+        return enhanceContrastAuto(a);
+    }
+    case 5: {
+        cv::Mat a = enhanceContrastAuto(cur);
+        return enhanceContrastRetinexMSR(a);
+    }
+    case 6: {
+        cv::Mat g = enhanceContrastGamma(cur, 1.0, true);
+        return enhanceContrastCLAHE(g);
+    }
+    default: return src.clone();
     }
 }
 
@@ -2267,9 +2279,9 @@ void OpencvFunc::enhanceContrastPathAsync(const QString& imagePath, int pipeline
 //      显微相机在平坦区有 Poisson 噪声,普通 unsharp mask 会放大,
 //      sharpenMicroscope 不会。
 cv::Mat OpencvFunc::sharpenMicroscope(const cv::Mat& src,
-                                       double amount,
-                                       double sigma,
-                                       double noiseFloor) {
+                                      double amount,
+                                      double sigma,
+                                      double noiseFloor) {
     TIMER_SCOPE("sharpenMicroscope");
     if (src.empty()) return cv::Mat();
     if (amount < 0) amount = 0;