From 4b7fa72da04284d2f3b50ed73dc792b61caa94b3 Mon Sep 17 00:00:00 2001 From: RCi <15089880081@163.com> Date: Tue, 4 Jun 2024 13:17:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98=20=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HandleAiUi-new/algo/ALGO_Inspection.h | 29 ++++------ .../HandleAiUi-new/halconAlgo/Inspection.h | 51 +++++++++--------- 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 16 files changed, 37 insertions(+), 43 deletions(-) diff --git a/HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h b/HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h index b08ddddb..ed07b86f 100644 --- a/HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h +++ b/HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h @@ -159,8 +159,7 @@ void pinHandleAiEvaluate(std::shared_ptr data, } -bool pinHalconEvaluate(std::vector& Result, cv::Mat& src, cv::Mat& out - , int productType, int pinRow, int pinCol) +bool pinHalconEvaluate(std::vector& Result, cv::Mat& src, cv::Mat& out,int productType) { #pragma region halcon变量定义 @@ -221,11 +220,14 @@ bool pinHalconEvaluate(std::vector& Result, cv::Mat& src, cv::Mat& out //} } -cv::Mat pinDetEvaluate(cv::Mat& src, handleAiModelManager* _handleAiModelManager) +std::vector pinDetEvaluate(cv::Mat& src, handleAiModelManager* _handleAiModelManager) { cv::Mat resultImg; std::vector result; _handleAiModelManager->smalDet->Evaluate(src, result); +} +cv::Mat getpinHandleAiEvaluateImg(cv::Mat& src, std::vector& result) +{ cv::Point centerPos(src.rows / 2, src.cols / 2); std::vector targets; cv::Rect targetRect(src.cols / 4, src.rows / 4, src.cols / 2, src.rows / 2); @@ -255,7 +257,6 @@ cv::Mat pinDetEvaluate(cv::Mat& src, handleAiModelManager* _handleAiModelManager return src(resultRect); } - void ALGO_Inspection(std::shared_ptr data, handleAiModelManager* _handleAiModelManager) { if (data->oriImgs.size() < 1) @@ -264,26 +265,18 @@ void ALGO_Inspection(std::shared_ptr data, handleAiModelManager* _hand return; } cv::Mat src = data->oriImgs[0]; - //DET - cv::Mat detResult = pinDetEvaluate(src, _handleAiModelManager); + //使用det获取每个公头的位置 + std::vector pinPos= pinDetEvaluate(src, _handleAiModelManager); + //获取用于handleAi检测的图片 + cv::Mat detResult = getpinHandleAiEvaluateImg(src,pinPos); cv::Mat Paint; cvtColor(detResult, Paint, cv::COLOR_GRAY2BGR); std::vectorhalconResult; - //hv_in_Parameter - //[0]-产品种类; 1A正面 2A反面 3B正面 5C正面 int productType = 3; - //[1]-图像序号第一位; - int pinRow = 1; - //[2]-图像序号第二位; - int pinCol = 0; - //[3]-3d相机精度（mm）; - //[4]-ping针偏移判NG阈值（mm）; - //[5]-切图存图开关 - //HALCON cv::Mat halconMatResult; - bool halconBoolResult=pinHalconEvaluate(halconResult, detResult, halconMatResult, productType, pinRow, pinCol); + bool halconBoolResult=pinHalconEvaluate(halconResult, detResult, halconMatResult, productType); //HANDLEAI switch (productType) @@ -312,6 +305,6 @@ void ALGO_Inspection(std::shared_ptr data, handleAiModelManager* _hand data->resultImgs.push_back(Paint);//AI检测结果 if(halconBoolResult==true) data->resultImgs.push_back(halconMatResult);//AI检测结果 - _sleep(100); + //_sleep(100); } diff --git a/HanddleAI/HandleAiUi-new/halconAlgo/Inspection.h b/HanddleAI/HandleAiUi-new/halconAlgo/Inspection.h index a051f800..d40ee82a 100644 --- a/HanddleAI/HandleAiUi-new/halconAlgo/Inspection.h +++ b/HanddleAI/HandleAiUi-new/halconAlgo/Inspection.h @@ -1549,34 +1549,35 @@ void Pings_Inspection_2_Front (HObject ho_in_Image, HTuple hv_in_ShapePath, HTup try { - //定位 + ////定位 //Pings_ROI_Rec2(ho_in_Image, hv_in_ShapePath, hv_in_Parameter, &hvec_out_ROI_Row, // &hvec_out_ROI_Col, &(*hv_out_Flag)); - //等分 - hv_Num = (HTuple(hvec_out_ROI_Row.Length()).TupleInt())-1; + ////等分 + //hv_Num = (HTuple(hvec_out_ROI_Row.Length()).TupleInt())-1; { - HTuple end_val14 = hv_Num; - HTuple step_val14 = 1; - for (hv_Index2=0; hv_Index2.Continue(end_val14, step_val14); hv_Index2 += step_val14) - { - //GenRegionPolygon(&ho_ROI, hvec_out_ROI_Row[hv_Index2].T(), hvec_out_ROI_Col[hv_Index2].T()); - //FillUp(ho_ROI, &ho_ROI); - //AreaCenter(ho_ROI, &hv_Area, &hv_Row0, &hv_Column0); - //RegionFeatures(ho_ROI, ((((HTuple("row").Append("column")).Append("rect2_phi")).Append("rect2_len1")).Append("rect2_len2")), - // &hv_Value1); - //RegionFeatures(ho_ROI, (HTuple("width").Append("height")), &hv_Value); - ho_ROI = ho_in_Image; - if (0 != (int(HTuple(hv_Value[0])-3=gpAIU@ORwT%H0{w~SF;*~Ka*EZE4v$S5YvIVL1OKc_gxHyFq? aG|@A*)H60VHME?}!Q{mBxoNTw(MKA diff --git a/lib/Hd_3DCameraLMI_module_PointLazer.lib b/lib/Hd_3DCameraLMI_module_PointLazer.lib index 36c75b149f315b6d9f39a25471404d60a91a35ae..b04150d66d0bd6f8780c0ea27f1bb8d8c729edd8 100644 GIT binary patch delta 118 zcmaDN_(X8S0VbAz%oEN}KEiaIMV;Yu)8u~UVkRIpi(P879E$-XXW8l7S1&OzFfdI% w$s|3wh_xQ3OnveMb`Gf0$qsCBoC?-nr@ui}noYjT)&o6ylW|Qx-^}tjrLsf2`#qPxj05HBKZU6uP diff --git a/lib/Hd_DalsaCamera_module.exp b/lib/Hd_DalsaCamera_module.exp index da2ea450a2c84bc30541eb82018b267d2007a727..efae2b9e0625c5eac1fbb210c3bea307dc61f2ea 100644 GIT binary patch delta 128 zcmeBV`^d_f(#FK_9|%Mzaym2pW|-)Ah4(!J1A`F*qacuC@SLpAXs@i!@VSYB!8bFx zD8D#Atwcd1NK?Vb)6bhBm%&z$A-OySsBR*oy0VK^Ojxjyfss*6m~%`>etu4IjBhZI bX=tKnY^i5#Y-(sZ`7@&v)90qi=1i9W&U+?@ delta 152 zcmey!+R4V5(#FK_9|&|Oayl~!Gfwoo!pqLcz+l9{D98W=E|c{c?Ugkc1X>svd^3}a z@{9A+N)$ALG!=Y2{k$1k8Egd^lFL(o>LxO(TRU6D1O)lJ2RYUm#`tQ*oMS@r^K*)0e1m~ZLlYB&Izv5UV~feR8J(B}S|-agT>=1%cq;b* diff --git a/lib/Hd_DalsaCamera_module.lib b/lib/Hd_DalsaCamera_module.lib index cc2d36e5dd6097c8d1dffea4f0e34dc019fb0ad6..9c451b2ec75fbfd47c5b293388f4274cb1b1aa9e 100644 GIT binary patch delta 109 zcmX>ha6({12NTP2)AOe%_b}~YQD^wvG}(taoe4&fp~02Rk5eEha6({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..3de4f63b98d2685208a2831ec96d38f2a0fd0f6c 100644 GIT binary patch delta 128 zcmZo59#y1$q bG&IpOw$w8=HZ`=I{F>2;>2uR$eWptQx1%OM delta 152 zcmaFK+Q`P4(#FK_9|%+@aym2dGfwooz{||Yz@W##D98W=E|awxt(7$x1X>svd^3}a z@{9A+N)$ALG!=Y2{k$1k8Egd^lFL(o>N*+Kt(~o60)qVAgBouQtwvBl)ej804fEtAEWE&%{=U@ETw diff --git a/lib/Hd_FinsTcp_module.lib b/lib/Hd_FinsTcp_module.lib index a50e177e10f90e3993f56c5a13e462416b8c93d4..f679fdae9df129fa1e4d394f63100284f9d61348 100644 GIT binary patch delta 113 zcmbOrFhO8L2@~f(^@6+dj0_AMllj@qCU0h{Wl?AN+%!3kRef?avkeoF+0QDqc{8&x wBa6wYtap=7u}pxe(1*yDvp75wyE2)JZ3j$3nad$LKes?HGX<)hmz|jr0D+b!iU0rr 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..d493372202fb127678b045cafaea808eabe2b26b 100644 GIT binary patch delta 128 zcmeBU`^L(d(#FK_9|)u-aym2pW0>f7jrS7+1A{38qacuC@SJSO=%lR9@VSYB!8bFx zD8D#Atwcd1NK?Vb)6bhBm%&z$A-OySsBRjgy0VK^Ojxjyfss*6m~%`>etu4IjBhZI bX=tKnY^i5#Y-(sZ`3IvD)90qiHcXcQ-6>UXz+lS2D98W=E|U!zos=~g1X>svd^3}a z@{9A+N)$ALG!=Y2{k$1k8Egd^lFL(o>ZUQOTRU6D1O)lJ2RYUm#`tQ*oMS@r^K*)0e1m~ZLlYB&Izv5UV~fcT7@e2|S|+P7T>=1}hASli diff --git a/lib/Hd_MvCamera_module_GENTL.lib b/lib/Hd_MvCamera_module_GENTL.lib index a65c613a9788aa36e3530d6a5ccb1cad49b8c1da..578b535ee41c6c12f7e6ab81feeae0134eac1aaf 100644 GIT binary patch delta 118 zcmew&@I_$53?`PPzk+^Dp2M`CMV;Yu)8u&OY^Kjmo6j&?F>PO(O?j0nHetu4IjBhZI bX=tKnY^i5#Y-(sZ`8%T%)90qi)=ZZG+2>gbz+l3_D98W=E|U!z9hEg01X>svd^3}a z@{9A+N)$ALG!=Y2{k$1k8Egd^lFL(o>ZUTPTRU6D1O)lJ2RYUm#`tQ*oMS@r^K*)0e1m~ZLlYB&Izv5UV~ff68J(B}S|%$qT>=1_gew~W diff --git a/lib/Hd_MvCamera_module_GIGE.lib b/lib/Hd_MvCamera_module_GIGE.lib index b1396b9be8cfc2bad5039077ec72d4077da69fd6..f5ba12df64b2f2e149f3a1b7a1622e6c2dd11692 100644 GIT binary patch delta 108 zcmaDN@I+w4BqkQ4S+m|wp2oC~MV;Yu)8tvK>XYl4otS{k)2vdP?=s6XvY5Ryxjl(> s8ccycM6#SUOQrAa+sTZq@{`lp=D}o@xg3)7a|`q`Q=mrpvx_nU04H}TWB>pF delta 108 zcmaDN@I+w4Bqo*{N6bD?p2oC~MT0@0W%4Xm^~v?jPE0`NX;!JtcbVlGS(crsyEln- s8ccycM6#TfyL!>nx04xJf7jrS7+1A{38qacuC@SJSO=%lR9@VSYB!8bFx zD8D#Atwcd1NK?Vb)6bhBm%&z$A-OySsBRjgy0VK^Ojxjyfss*6m~%`>etu4IjBhZI bX=tKnY^i5#Y-(sZ`3IvD)90qiHcXcQ-6>UXz+lS2D98W=E|U!zos=~g1X>svd^3}a z@{9A+N)$ALG!=Y2{k$1k8Egd^lFL(o>ZUQOTRU6D1O)lJ2RYUm#`tQ*oMS@r^K*)0e1m~ZLlYB&Izv5UV~fcT7@e2|S|+P7T>=1}hASli diff --git a/lib/Hd_ResultsSummary_module.lib b/lib/Hd_ResultsSummary_module.lib index a61fbd40216d4091ba157f7b97afab308e79a4fe..ff33633f3db52aec9c9ccb88fc9c624c2109a9d1 100644 GIT binary patch delta 118 zcmew&@I_$53?`Pswa5QWp2M`CMV;Yu)8u&OY^Kjmo6j&?F>?O9FyY}T1_lPE$qSjJ zCu^~m!<48`KEuiZR5tkxv()4dtZ|%fSC*cB2UTe{xtFa4rcxQ9QhIYNyEr2N6TK|m 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..b95b63b171c0f8ac61a20249a5e95da79fb27b19 100644 GIT binary patch delta 129 zcmey)eV>~%rHzT59#y1$qG&C_Ws58_vHny1jmFXFiK+ER4%uGxGMQ<*v diff --git a/lib/Hd_SocketModule_ModbusTcp.lib b/lib/Hd_SocketModule_ModbusTcp.lib index 5ec47732196dc7452962b23c04a9ae6b8cb23ce6..7d987e797c1925944487933e8b6ed09e14a3773c 100644 GIT binary patch delta 108 zcmew+^-XHSI~GpM+Y9dLGcqu6Oy0<0Hd&Xol|`N5bJHXa^~rZxU6?*MO*Z6^+HA|F w%*Z-jM&-ik$!j^}C%3RyKvn5ORFt#4P6>N7c@4(_u=wNxPHmXh?VS6W0bcJXg#Z8m delta 108 zcmew+^-XHSI~LBiA5)I%Gcqu6Oy0<0Hd&Xol|_R=pk)$=`sBN;E=&R~lMOkfHrui( wGqS!kFaLLX@>&l0$t~;^P*wU673D03ub!ToyoTcdSbTB;r#4LMcFz6G0MnZzxBvhE