优化后端结构

HanddleAI/HandleAiUi-new/back/algorithmThread.h

@@ -14,6 +14,7 @@
 #include <threadPoolManager.h>
 #include <omp.h>
 #include <algorithm>
+#include <triggerManager.h>
 using namespace std;
 using namespace HalconCpp;
 enum ngTypeEnum
@@ -711,14 +712,18 @@ public:
 
     bool m_runFlag = true;
     QString threadName;
-
+    ~algoThread()
+    {
+        this->terminate();
+    }
     handleAiModel* modelPtr;
     sqlManager* sql;
     threadManager* tManager;
     sncodeCls* snDatas;
+    triggerManager* _triggerManager;
 
     QMutex detQueueMutex;
-    QQueue<detData*> detQueue;
+    QQueue<std::shared_ptr <detData>> detQueue;
     QMutex currentMutex, nextMutex, globalMutex;
 
     std::string snErrorsnError = std::string("snErrNoSn");
@@ -727,7 +732,7 @@ public:
     int Index = 1;
     int areaIndex = 0;
     void run();
-    bool waitForImg(detData* data,int);
+    bool waitForImg(std::shared_ptr <detData> data,int);
     void getAllFiles(std::string path, std::vector<std::string>& files, std::string format);
     void Init(threadManager* threadManager) {
         tManager = threadManager;
@@ -735,12 +740,12 @@ public:
         sql = threadManager->sql;
         snDatas = &threadManager->snDatas;
     }
-    bool addDetTask(detData*);//添加任务
+    bool addDetTask(std::shared_ptr <detData>);//添加任务
 
     //算法
-    void ALGO_Correction(detData*);
-    void ALGO_Inspection(detData*);
-    void Camera1_Algo(detData*);
+    void ALGO_Correction(std::shared_ptr <detData>);
+    void ALGO_Inspection(std::shared_ptr <detData>);
+    void Camera1_Algo(std::shared_ptr <detData>);
 signals:
     void subThreadStart();
 };