From 260b532aea1a0ebd127b5fc4126ecc9dcfddf44e Mon Sep 17 00:00:00 2001 From: "15089880081@163.com" <15089880081@163.com> Date: Fri, 14 Jun 2024 00:27:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=98=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HandleAiUi-new/algo/ALGO_Inspection.h | 14 ++++++++++---- .../HandleAiUi-new/back/cameraManager.cpp | 1 + .../back/imgSaveThreadManager.h | 3 ++- HanddleAI/HandleAiUi-new/globalStruct.h | 3 +-- lib/Hd_3DCameraLMI_module_PointLazer.exp | Bin 798 -> 774 bytes lib/Hd_3DCameraLMI_module_PointLazer.lib | Bin 2276 -> 2276 bytes lib/Hd_DalsaCamera_module.exp | Bin 777 -> 753 bytes lib/Hd_DalsaCamera_module.lib | Bin 2120 -> 2120 bytes lib/Hd_FinsTcp_module.exp | Bin 769 -> 745 bytes lib/Hd_FinsTcp_module.lib | Bin 2064 -> 2064 bytes lib/Hd_MvCamera_module_GENTL.exp | Bin 782 -> 758 bytes lib/Hd_MvCamera_module_GENTL.lib | Bin 2164 -> 2164 bytes lib/Hd_MvCamera_module_GIGE.exp | Bin 781 -> 757 bytes lib/Hd_MvCamera_module_GIGE.lib | Bin 2148 -> 2148 bytes lib/Hd_ResultsSummary_module.exp | Bin 782 -> 758 bytes lib/Hd_ResultsSummary_module.lib | Bin 2164 -> 2164 bytes lib/Hd_SocketModule_ModbusTcp.exp | Bin 1527 -> 1503 bytes lib/Hd_SocketModule_ModbusTcp.lib | Bin 3446 -> 3446 bytes 18 files changed, 14 insertions(+), 7 deletions(-) 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 6a8fa414ceecaea4ca722a610fdaee43ee4bd905..4d888b40a9c5375f642662f99829c7d90e8cb894 100644 GIT binary patch delta 119 zcmbQo*2cz}(#FK_9|*K2aym1zP4vCb^owD#9%HDK8beki1A}j7a#4P9ep-owMv$h0 zkEfqEL+<3cj4Jv?sX3{M#i^_HMiuv<)ST4B;#7vzic|(?tC)ZwfA=8AI>Q)WPv;>2;5wriBLgF&7-xT9 r-%vlGaF}yUNPd1!ag1*;kZEXQVo+zOXKZXS`2(X9lR(R46Q)Z5yi+W| diff --git a/lib/Hd_3DCameraLMI_module_PointLazer.lib b/lib/Hd_3DCameraLMI_module_PointLazer.lib index 36c75b149f315b6d9f39a25471404d60a91a35ae..b506c2adaff32453f920896da4a99bad9470fc31 100644 GIT binary patch delta 118 zcmaDN_(X8S0VWpXY46@lKEiaIMU5e=adJO%F%yuQ#V)m3j>UkH^Ptn_hnE-_7?>uX wWRjj-#99wirapNBI|o$hWCyl5&b6m&4}62FG@E>vtp}!38LD#gEOswO00)UE^Z)<= delta 118 zcmaDN_(X8S0VbAS@rnN@A7MJqqQM~0GP$3*m6ylW|Qx-^}tjrLsf2`#qPxj05HBKZU6uP diff --git a/lib/Hd_DalsaCamera_module.exp b/lib/Hd_DalsaCamera_module.exp index da2ea450a2c84bc30541eb82018b267d2007a727..aa3d9ca6a80e0b228fa45c86b6ad4c82a79749e8 100644 GIT binary patch delta 120 zcmeBV`^d_f(#FK_9|%Mzaym2pW|-)Ah3P%RWEDm)DK&=iJq~A Wp0Tl^vBBiej805hjg!rpE&%|p@+UI@ delta 144 zcmey!+R4V5(#FK_9|&|Oayl~!Gfwoo!oha6({12NR3#l2yki_b}~YQDewzob1D#&IF|7*`+q0XO?DU5oOG{G5Hha6({12NTODh23{1_b}~Y(O?j0ne4-y&IF|7*`+q0XO?DUVSi@ub@DrwDKJ^} s$!l3TpeiO`WQ}DF@!xsr_2l;~@{`vvNl(sYYlNv(hN|2w&#uV`01D?LO#lD@ diff --git a/lib/Hd_FinsTcp_module.exp b/lib/Hd_FinsTcp_module.exp index 26d6e58176a4f4100cca476b43767d9383296971..578514104377e7b47192dbe7bc547dd9da0eba5a 100644 GIT binary patch delta 120 zcmZo=iJq~A Wp0Tl^vBBimj805hjg$46E&%|VQYP;J delta 144 zcmaFK+Q`P4(#FK_9|%+@aym2dGfwooz{JcrS%J|_N`pb5g@M60Gr1_gI6tjKK_f_0 z!N=3jo1t}b1EY$2P-;$UVsR=%YDFr8vsFw$kiUD7W1V4)ucvd6e{h{qjFEwnQH-;{ suWzUyP&mvvCL}*Ur#Qwp7|1j+3PMg|6s$^2|)lQ%QfvZyg+HBOFWRi7NqY{LX(_OnWD-pnk_ w$nsyM=EdYwEE8ZV^dYk4EOPCyj!oub+X0hM=5k2R&n?i)Oo3|WWoKpt0HB~E>;M1& delta 113 zcmbOrFhO8L2@@y(r?ji`j0_AMllj@qCU0h{Wzk>|Xqg}QqQyqQ^; wk>!eB#hJ;cSSG+!=tE@7S(vllUz^OuwgV=i%;k`rpIe}pnF7_$%g)RQ0BqkOCjbBd diff --git a/lib/Hd_MvCamera_module_GENTL.exp b/lib/Hd_MvCamera_module_GENTL.exp index 6429d839ff9cf356b824c4b9281c91c274e3392b..baf006bd011aee4aa70aba1d534a1396c11e5b8d 100644 GIT binary patch delta 120 zcmeBU`^L(d(#FK_9|)u-aym2pW0>f7jp-A^WHm-#DK&=iJq~A Wp0Tl^vBBgYj805hjgxJdE&%|%2Pa+t delta 144 zcmeyy+Q-J3(#FK_9|(*laym1KF;4Wm#>B-qS&h+GN`pb5g@M60Gr1_gI6tjKK_f_0 z!N=3jo1t}bFQbZkP-;$UVsR=%YDFr8vsFw$kiUD7W1V4)ucvd6e{h{qjFEwnQH-;{ suWzUyP&mvvCL}*Ur#Qwp7|1jPO(O?j0nH)MX5QdiN&c5sTHXVE>=iJq~A Wp0Tl^vBBi;j805hjgzgJE&%|!LMK%K delta 144 zcmey$+RMh7(#FK_9|#O5aym1KGEVfn#>B}uS&h+0N`pb5g@M60Gr1_gI6tjKK_f_0 z!N=3jo1t}b52K2EP-;$UVsR=%YDFr8vsFw$kiUD7W1V4)ucvd6e{h{qjFEwnQH-;{ suWzUyP&mvvCL}*Ur#Qwp7|1jp0M)cCumAu6 diff --git a/lib/Hd_MvCamera_module_GIGE.lib b/lib/Hd_MvCamera_module_GIGE.lib index b1396b9be8cfc2bad5039077ec72d4077da69fd6..110ae8d714ae9a153c870b6ea7d31787466ae1f1 100644 GIT binary patch delta 108 zcmaDN@I+w4Bqo;p>l@!pp2oC~MU5e=aq=uy^~v?jPE0`NX;!JtcbVlGnVnx04xJf7jp-A^WHm-#DK&=iJq~A Wp0Tl^vBBgYj805hjgxJdE&%|%2Pa+t delta 144 zcmeyy+Q-J3(#FK_9|(*laym1KF;4Wm#>B-qS&h+GN`pb5g@M60Gr1_gI6tjKK_f_0 z!N=3jo1t}bFQbZkP-;$UVsR=%YDFr8vsFw$kiUD7W1V4)ucvd6e{h{qjFEwnQH-;{ suWzUyP&mvvCL}*Ur#Qwp7|1j$>dz1c6p2M`CMU5e=adJF!Hd9vP<}=JzjGP~AlKz}xU|?XHypTzH zvKDJOOo{sBGprmyWs}b^OHKa38pru=hQq~oP?ctrd)ZoGDwPo`r8md2i!%ZM19K>= delta 118 zcmew&@I_$53?`PJ|NEa$p2M`CMT0@0WpX@oHj_Zh<}=JzjGU7uUOIM)fq{W(@N^g#37iR$WFG diff --git a/lib/Hd_SocketModule_ModbusTcp.exp b/lib/Hd_SocketModule_ModbusTcp.exp index 49ff857d296ebdebb03f306aa1ab96cffbc73aba..525105f5eacaed499a94ba2026795b88d98dab5a 100644 GIT binary patch delta 120 zcmey)eV>~%rHzThyM53VzcF)}bRigEV$ t^$qm{3WqtzgyiSv6vy}m1DS>@W@FgySN diff --git a/lib/Hd_SocketModule_ModbusTcp.lib b/lib/Hd_SocketModule_ModbusTcp.lib index 5ec47732196dc7452962b23c04a9ae6b8cb23ce6..b3ff8f19c2b7f22a232105edac9723e1a30fca2a 100644 GIT binary patch delta 108 zcmew+^-XHSI~LA!vnzk&l0$t~;^P*wU673D03ub!ToyoTcdSbTB;r#4LMcFz6G0MnZzxBvhE