From 14ea7eb6d7a1487ba873cbfcf6a572d2e46017e3 Mon Sep 17 00:00:00 2001
From: RCi <15089880081@163.com>
Date: Mon, 8 Dec 2025 02:24:28 +0800
Subject: [PATCH] =?UTF-8?q?V20251208-2.3.1=20=E8=81=94=E5=90=88=E8=A7=A6?=
 =?UTF-8?q?=E5=8F=91=E5=99=A8=E5=9C=A8=E8=A7=A6=E5=8F=91=E6=97=B6=E4=BC=9A?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E8=A7=A6=E5=8F=91=E6=BA=90=E3=80=82=20?=
 =?UTF-8?q?=E8=B5=A2=E5=90=88=E7=B1=BB=E5=9C=A8=E4=B8=A2=E5=BC=83=E5=9B=BE?=
 =?UTF-8?q?=E5=83=8F=E6=97=B6=E4=BC=9A=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/global.h                    | 2 +-
 include/yhGlobal.h                  | 1 +
 src/core/service/detData.h          | 8 +++-----
 src/core/service/triggerManager.cpp | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/include/global.h b/include/global.h
index 750e9c9..e3eb7e8 100644
--- a/include/global.h
+++ b/include/global.h
@@ -11,7 +11,7 @@
 #include <QDir>
 
 #pragma execution_character_set("utf-8")
-const std::string softwareVersion = "20251206-2.3.0";
+const std::string softwareVersion = "20251208-2.3.1";
 const std::string euiJsonVersion = "1.0.6";
 #define GigaByte 1073741824 
 #define globalDatabasePth "./sqlDatabase/eui_db.db" //全局数据库路径
diff --git a/include/yhGlobal.h b/include/yhGlobal.h
index d13c675..8fa0fc8 100644
--- a/include/yhGlobal.h
+++ b/include/yhGlobal.h
@@ -203,6 +203,7 @@ public:
         auto camera = _serviceManager->_cameraManager->getCamera(cameraName);
         std::shared_ptr <detData> data = _serviceManager->_detDataManager->createDetData();//创建数据包
         camera->captureImage(data);//拍照
+		qDebug() << "uuid" <<data->uuid <<"已取图并丢弃";
         _serviceManager->_detDataManager->deleteDetData(data->uuid);
     }
 private:
diff --git a/src/core/service/detData.h b/src/core/service/detData.h
index 37e37d3..aed7bf5 100644
--- a/src/core/service/detData.h
+++ b/src/core/service/detData.h
@@ -18,6 +18,9 @@ class detDataManager;
 class ServiceManager;
 class detData{
 private:
+    static QString getUuid() {
+        return QUuid::createUuid().toString();
+    }
     QMutex oriImgMutex;//原图锁
     std::vector<cv::Mat> oriImgs;//原图容器
 
@@ -31,11 +34,6 @@ public:
 	long long algoTime = 0;//算法执行时间容器
     //参数
  
-#pragma region 基础函数
-    static QString getUuid() {
-        return QUuid::createUuid().toString();
-    }
-#pragma endregion
 #pragma region 必需参数
     detDataManager* dManager = nullptr;//父类
     int imgAmountMin = 1;//最小取图数量
diff --git a/src/core/service/triggerManager.cpp b/src/core/service/triggerManager.cpp
index 80d715c..b020a06 100644
--- a/src/core/service/triggerManager.cpp
+++ b/src/core/service/triggerManager.cpp
@@ -211,7 +211,7 @@ void triggerManager::checkUnionCallback(readAllStruct& _struct, QByteArray& byte
                 }
             }
         }
-        qDebug() << "Union func:" << QString::fromStdString(cb.funcName) << "->已触发";
+        qDebug() << "Union func:" << QString::fromStdString(cb.funcName) << "->已触发 ("<< triggerSource <<")";
         std::thread([cb, copyByte = byteArray, triggerSource]() mutable {
             try {
                 cb.func(triggerSource, copyByte);