阶段备份

HanddleAI/HanddleAI/CMakeLists.txt

@@ -0,0 +1,11 @@
+# CMakeList.txt: 遍历文件夹 添加子项目
+
+set(OUR_LIBS "")
+SUBDIRENAMES(OUR_LIBS ${CMAKE_CURRENT_SOURCE_DIR} "" OFF)
+message("OUR_LIBS :" ${OUR_LIBS})
+
+
+# 遍历子库
+foreach(dll ${OUR_LIBS})
+    add_subdirectory(${dll})
+endforeach(dll ${})

HanddleAI/HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h

@@ -117,7 +117,6 @@ void ALGO_Inspection(std::shared_ptr <detData> data, handleAiModelManager* _hand
                 data->handleAiEndTime = std::chrono::high_resolution_clock::now();
                 aiImgResult.push_back(stargazerHandleAiAlgo(data, src(BboxToRect(connector)), _handleAiModelManager));
                 data->halconEndTime = std::chrono::high_resolution_clock::now();
-                tempCompared = true;
                 break;
             case 6://STARGAZER HUGE
                 halconImgResult.push_back(stargazerHalconAlgo(data, src(BboxToRect(connector))));

HanddleAI/HanddleAI/HandleAiUi-new/appCore.hpp

@@ -10,7 +10,7 @@
 #include <qtimer.h>
 
 #define enableHandleAiModel 1
-#define disableBackEndCheck 1
+#define disableBackEndCheck 0
 #define disableeAlgo 0
 #define enableHideConsle 1
 class detGlobalData

HanddleAI/HanddleAI/HandleAiUi-new/back/cameraManager.cpp

@@ -155,6 +155,7 @@ void cameraManager::run()
 {
 	if (initFlag == true)
 		return;
+	status = NotInit;
 	bool initReuslt = true;
 	for (auto i = 0; i < camerasVec.size(); i++)
 	{

HanddleAI/HanddleAI/HandleAiUi-new/back/triggerManager.cpp

@@ -17,26 +17,18 @@ void triggerManager::initialization(detProcess* _detProcessIn)
 
     startPos = _core._appConfig._triggerStruct.startPos;
     triggerFileName = QString::fromStdString(_core._appConfig._triggerStruct.modelName);
-    IpAndPort = QString::fromStdString(_core._appConfig._triggerStruct.initStr);
+    IpAndPort = QString::fromStdString(_core._appConfig._triggerStruct.initStr); 
     readAllCmd = QByteArray::fromStdString(_core._appConfig._triggerStruct.readAllCmd);
     triggerFileName = QString::fromStdString(_core._appConfig._triggerStruct.modelName);
     sleepTime = _core._appConfig._triggerStruct.sleepTime;
     readNum = _core._appConfig._triggerStruct.readNum;
     writeType = _core._appConfig._triggerStruct.writeType;
-    m_lib = new QLibrary(triggerFileName);
-    libLoadedflag = m_lib->load();
-    if (!m_lib->isLoaded())
-    {
-        emit _core._qtFunc.sendErrorToMainwindow(dllNotFound);
-        emit _core._qtFunc.sendInitString("ÕÒ²»µ½" + triggerFileName);
-        return;
-    }
 
-    
 }
 void triggerManager::run()
 {
-    connectHost();
+    if(connectHost() == false)
+        return;
     QThread::msleep(3000);
     while (runFlag)
     {
@@ -48,6 +40,15 @@ bool triggerManager::connectHost()
 {
     if (init == true)
         return true;
+    status = NotInit;
+    m_lib = new QLibrary(triggerFileName);
+    libLoadedflag = m_lib->load();
+    if (!m_lib->isLoaded())
+    {
+        emit _core._qtFunc.sendErrorToMainwindow(dllNotFound);
+        emit _core._qtFunc.sendInitString("ÕÒ²»µ½" + triggerFileName);
+        return false;
+    }
     if (libLoadedflag)
     {
         CreateFunction createFun = (CreateFunction)m_lib->resolve("create");
@@ -84,6 +85,7 @@ bool triggerManager::connectHost()
             return true;
         }
     }
+    return false;
 }
 void triggerManager::reciveCommond()
 {

HanddleAI/HanddleAI/HandleAiUi-new/detProcess.hpp

@@ -28,21 +28,32 @@ public:
         _handleAiModelManager.start();
         _lightSourceManager.start();
         _triggerManager.start();
+        QThread::msleep(1000);
         bool res1 = waitrForInitResult(&_cameraManager);
         bool res2 = waitrForInitResult(&_handleAiModelManager);
         bool res3 = waitrForInitResult(&_triggerManager);
-        std::cout << std::to_string(res1) << "," << std::to_string(res2) << "," << std::to_string(res3) << "," << std::endl;
+        std::cout << "_cameraManager-initReuslt-->" << std::to_string(res1) << "\n"  
+            << "_handleAiModelManager-initReuslt-->" << std::to_string(res2) << "\n"
+            << "_triggerManager-initReuslt-->" << std::to_string(res3) << "\n" << std::endl;
+        if(res1 == true&&res2 == true && res3 == true)
+            emit _core._qtFunc.sendInitFinished(InitOK);
+        else
+            emit _core._qtFunc.sendInitFinished(InitFailure);
 	}
     bool waitrForInitResult(serviceModule* ptr)
     {
         int timecnt = 0;
-        while (timecnt < 100)
+        while (timecnt <= 100)
         {
             if (ptr->status != NotInit)
                 break;
+            QThread::msleep(100);
+            timecnt++;
         }
         if (timecnt > 100)
             return false;
+        if (ptr->status == InitFailure)
+            return false;
         return true;
     }
     simpleSiemensTcp _simpleSiemensTcp;