diff --git a/HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h b/HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h index b22da7d8..5782fa86 100644 --- a/HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h +++ b/HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h @@ -127,26 +127,34 @@ void handleAiEvaluate(std::shared_ptr data, handleAiModelManager* _han for (auto box : connectorPos) { cv::Mat handleAiMat; - switch (data->productType) + bool processed = false; + switch (box.classes) { case 0://AFront handleAiMat = pinHandleAiEvaluate(data, src(BboxToRect(box)), _handleAiModelManager->largeSeg, _handleAiModelManager->largeCls); + aiImgResult.push_back(handleAiMat);//AI检测结果 break; case 1://ABack handleAiMat = pinHandleAiEvaluate(data, src(BboxToRect(box)), _handleAiModelManager->largeSeg, _handleAiModelManager->largeCls); + aiImgResult.push_back(handleAiMat);//AI检测结果 break; case 2://B handleAiMat = pinHandleAiEvaluate(data, src(BboxToRect(box)), _handleAiModelManager->midSeg, _handleAiModelManager->midCls); + aiImgResult.push_back(handleAiMat);//AI检测结果 break; case 3://C handleAiMat = pinHandleAiEvaluate(data, src(BboxToRect(box)), _handleAiModelManager->smallSeg, _handleAiModelManager->smallCls); + aiImgResult.push_back(handleAiMat);//AI检测结果 + break; + default: + data->segOriginImgs.push_back(src(BboxToRect(box)));//AI检测结果 + aiImgResult.push_back(src(BboxToRect(box)));//AI检测结果 break; } - aiImgResult.push_back(handleAiMat);//AI检测结果 } } cv::Mat pinHandleAiEvaluate(std::shared_ptr data, cv::Mat& src, @@ -237,9 +245,7 @@ void ALGO_Inspection(std::shared_ptr data, handleAiModelManager* _hand std::vector pinPos = getpinHandleAiEvaluateRect(data,src, detResult); //HANDLEAI std::vectoraiImgResult; -#if enableHandleAiAlgo handleAiEvaluate(data, _handleAiModelManager, pinPos, aiImgResult); -#endif data->handleAiEndTime = std::chrono::high_resolution_clock::now(); //HALCON std::vectorhalconImgResult; diff --git a/HanddleAI/HandleAiUi-new/back/cameraManager.cpp b/HanddleAI/HandleAiUi-new/back/cameraManager.cpp index cfa7eb4f..6b5a770c 100644 --- a/HanddleAI/HandleAiUi-new/back/cameraManager.cpp +++ b/HanddleAI/HandleAiUi-new/back/cameraManager.cpp @@ -101,6 +101,7 @@ cameraManager::~cameraManager() } void cameraManager::initialization(backEndManager* input) { + return; _backEndManager = input; #pragma region 加载相机dll for (auto val = 0; val < input->_jsonConfiguration->camera.cameraList.size(); val++) diff --git a/HanddleAI/HandleAiUi-new/back/imgSaveThreadManager.h b/HanddleAI/HandleAiUi-new/back/imgSaveThreadManager.h index d6a7f5df..875ddd2b 100644 --- a/HanddleAI/HandleAiUi-new/back/imgSaveThreadManager.h +++ b/HanddleAI/HandleAiUi-new/back/imgSaveThreadManager.h @@ -100,6 +100,7 @@ public: for (int i = 0; i < data->resultImgs.size(); i++) resultFileNames.push_back(fileName + getCurrentDateTime() + "_Count" + std::to_string(i) + ".jpg"); //保存seg原图和cls原图 + break; case segImg: for (int i = 0; i < data->segOriginImgs.size(); i++) resultFileNames.push_back(fileName + "SEG_Count_" + getCurrentDateTime() + "_" + std::to_string(i) + ".bmp"); @@ -133,7 +134,7 @@ public: saveThread.addData(fileSavePath + resFileNames[index], data->resultImgs[index]); //seg - std::vectorsegFileNames = genFileNmaes(data, clsImg); + std::vectorsegFileNames = genFileNmaes(data, segImg); for (int index = 0; index < segFileNames.size(); index++) saveThread.addData(segAndClsPath + segFileNames[index], data->segOriginImgs[index]); diff --git a/HanddleAI/HandleAiUi-new/globalStruct.h b/HanddleAI/HandleAiUi-new/globalStruct.h index 877bd9e0..cea78365 100644 --- a/HanddleAI/HandleAiUi-new/globalStruct.h +++ b/HanddleAI/HandleAiUi-new/globalStruct.h @@ -20,8 +20,7 @@ #define enableHandleAiModel 1 #define disableBackEndCheck 1 #define disableeAlgo 0 -#define enableHalconAlgo 1 -#define enableHandleAiAlgo 0 +#define enableHalconAlgo 0 //绐楀彛璁剧疆 #define windowMoveFreshRate 100//绐楀彛绉诲姩姣忕鐨勫埛鏂扮巼 diff --git a/lib/Hd_3DCameraLMI_module_PointLazer.exp b/lib/Hd_3DCameraLMI_module_PointLazer.exp index 6a8fa414..4d888b40 100644 Binary files a/lib/Hd_3DCameraLMI_module_PointLazer.exp and b/lib/Hd_3DCameraLMI_module_PointLazer.exp differ diff --git a/lib/Hd_3DCameraLMI_module_PointLazer.lib b/lib/Hd_3DCameraLMI_module_PointLazer.lib index 36c75b14..b506c2ad 100644 Binary files a/lib/Hd_3DCameraLMI_module_PointLazer.lib and b/lib/Hd_3DCameraLMI_module_PointLazer.lib differ diff --git a/lib/Hd_DalsaCamera_module.exp b/lib/Hd_DalsaCamera_module.exp index da2ea450..aa3d9ca6 100644 Binary files a/lib/Hd_DalsaCamera_module.exp and b/lib/Hd_DalsaCamera_module.exp differ diff --git a/lib/Hd_DalsaCamera_module.lib b/lib/Hd_DalsaCamera_module.lib index cc2d36e5..c271a24e 100644 Binary files a/lib/Hd_DalsaCamera_module.lib and b/lib/Hd_DalsaCamera_module.lib differ diff --git a/lib/Hd_FinsTcp_module.exp b/lib/Hd_FinsTcp_module.exp index 26d6e581..57851410 100644 Binary files a/lib/Hd_FinsTcp_module.exp and b/lib/Hd_FinsTcp_module.exp differ diff --git a/lib/Hd_FinsTcp_module.lib b/lib/Hd_FinsTcp_module.lib index a50e177e..e7784b3e 100644 Binary files a/lib/Hd_FinsTcp_module.lib and b/lib/Hd_FinsTcp_module.lib differ diff --git a/lib/Hd_MvCamera_module_GENTL.exp b/lib/Hd_MvCamera_module_GENTL.exp index 6429d839..baf006bd 100644 Binary files a/lib/Hd_MvCamera_module_GENTL.exp and b/lib/Hd_MvCamera_module_GENTL.exp differ diff --git a/lib/Hd_MvCamera_module_GENTL.lib b/lib/Hd_MvCamera_module_GENTL.lib index a65c613a..4010f0a3 100644 Binary files a/lib/Hd_MvCamera_module_GENTL.lib and b/lib/Hd_MvCamera_module_GENTL.lib differ diff --git a/lib/Hd_MvCamera_module_GIGE.exp b/lib/Hd_MvCamera_module_GIGE.exp index 08f548f7..3f62ab5a 100644 Binary files a/lib/Hd_MvCamera_module_GIGE.exp and b/lib/Hd_MvCamera_module_GIGE.exp differ diff --git a/lib/Hd_MvCamera_module_GIGE.lib b/lib/Hd_MvCamera_module_GIGE.lib index b1396b9b..110ae8d7 100644 Binary files a/lib/Hd_MvCamera_module_GIGE.lib and b/lib/Hd_MvCamera_module_GIGE.lib differ diff --git a/lib/Hd_ResultsSummary_module.exp b/lib/Hd_ResultsSummary_module.exp index e310258b..d575f63f 100644 Binary files a/lib/Hd_ResultsSummary_module.exp and b/lib/Hd_ResultsSummary_module.exp differ diff --git a/lib/Hd_ResultsSummary_module.lib b/lib/Hd_ResultsSummary_module.lib index a61fbd40..8baafc1c 100644 Binary files a/lib/Hd_ResultsSummary_module.lib and b/lib/Hd_ResultsSummary_module.lib differ diff --git a/lib/Hd_SocketModule_ModbusTcp.exp b/lib/Hd_SocketModule_ModbusTcp.exp index 49ff857d..525105f5 100644 Binary files a/lib/Hd_SocketModule_ModbusTcp.exp and b/lib/Hd_SocketModule_ModbusTcp.exp differ diff --git a/lib/Hd_SocketModule_ModbusTcp.lib b/lib/Hd_SocketModule_ModbusTcp.lib index 5ec47732..b3ff8f19 100644 Binary files a/lib/Hd_SocketModule_ModbusTcp.lib and b/lib/Hd_SocketModule_ModbusTcp.lib differ