diff --git a/HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h b/HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h index 3ad7276b..097e6aaa 100644 --- a/HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h +++ b/HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h @@ -327,7 +327,14 @@ void ALGO_Inspection(std::shared_ptr data, handleAiModelManager* _hand case 5://STARGAZER halconImgResult.push_back(stargazerHalconAlgo(data, src(BboxToRect(connector)))); data->handleAiEndTime = std::chrono::high_resolution_clock::now(); - aiImgResult.push_back(stargazerHandleAiAlgo(data, _handleAiModelManager)); + 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)))); + 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; diff --git a/HanddleAI/HandleAiUi-new/algo/CISCO_STARGAZER.hpp b/HanddleAI/HandleAiUi-new/algo/CISCO_STARGAZER.hpp index 5b33d34b..e6a06846 100644 --- a/HanddleAI/HandleAiUi-new/algo/CISCO_STARGAZER.hpp +++ b/HanddleAI/HandleAiUi-new/algo/CISCO_STARGAZER.hpp @@ -90,10 +90,10 @@ static cv::Mat stargazerHalconAlgo(std::shared_ptrdata, cv::Mat& src) } //输入det切出的连接器图片 -static cv::Mat stargazerHandleAiAlgo(std::shared_ptrdata, handleAiModelManager* _handleAiModelManager) +static cv::Mat stargazerHandleAiAlgo(std::shared_ptrdata, cv::Mat& src, handleAiModelManager* _handleAiModelManager) { handleAiModelSeg* segPtr = _handleAiModelManager->getSegModel("APEX-Seg"); handleAiModelCls* clsPtr = _handleAiModelManager->getClsModel("APEX-Cls"); - return cv::Mat(); + return src; } #pragma once \ No newline at end of file diff --git a/HanddleAI/HandleAiUi-new/algo/simpleAlgo.h b/HanddleAI/HandleAiUi-new/algo/simpleAlgo.h index 50b77585..c15f9b2e 100644 --- a/HanddleAI/HandleAiUi-new/algo/simpleAlgo.h +++ b/HanddleAI/HandleAiUi-new/algo/simpleAlgo.h @@ -710,6 +710,11 @@ static cv::Mat tiledImages(std::vector& imgs) return cv::imread("./noimg.png",-1); if (imgs.size() == 1) return imgs[0]; + for (auto& img : imgs) + { + if (img.channels() == 1) + cv::cvtColor(img, img, cv::COLOR_GRAY2BGR); + } //总图像大小 平铺显示 int matWidth = 0, matHeight = 0; for (auto& mat : imgs) diff --git a/lib/Hd_3DCameraLMI_module_PointLazer.exp b/lib/Hd_3DCameraLMI_module_PointLazer.exp index 97d8b87b..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 ab118790..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 05dc8bab..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 cd7a0985..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 564b8062..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 1880b09b..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 f9780641..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