V20251208-2.3.1

联合触发器在触发时会打印触发源。
赢合类在丢弃图像时会打印日志。

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" //全局数据库路径

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:

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;//最小取图数量

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);