From 9ef9f515ea98faad5015dc068097da3fad24606f Mon Sep 17 00:00:00 2001 From: RCi <15089880081@163.com> Date: Mon, 12 Aug 2024 01:37:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dstargazer=E7=AE=97=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HandleAiUi-new/algo/ALGO_Inspection.h | 9 ++++++++- .../HandleAiUi-new/algo/CISCO_STARGAZER.hpp | 4 ++-- HanddleAI/HandleAiUi-new/algo/simpleAlgo.h | 5 +++++ 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 17 files changed, 15 insertions(+), 3 deletions(-) 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 97d8b87b5a54ed11f0f0bf06624e98e39c3ad3b0..4d888b40a9c5375f642662f99829c7d90e8cb894 100644 GIT binary patch delta 179 zcmbQo*2cz}(#FK_9|*K2aym1zP4vCb`-_2r!Ipth5J)k&Otxh7s#jykYGh#W%}g%J zFV0UZQP2p|RPgci^Jd6puoYxTE>B@_v5HB~EKbgM%+CzXjL9!8iAgHW%t?ubB+ng&(A52@eKwt4NdfnE%c0y4UG+Ak}~sRJo1Z6 WfONOYyS{N97Gn0$* zi}TY;6f}Y~6?{DXyct>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 ab118790922bdf283ca963bb9e26af2406b92951..aa3d9ca6a80e0b228fa45c86b6ad4c82a79749e8 100644 GIT binary patch delta 140 zcmeBV`^d_f(#FK_9|%Mzaym2pW|-)Ah4(!J1A`F*qacuCaG9*nXs@iskk!b*;G3CT zlwX{mR-&L0q^aQJ>F3Rm%U~59#y1$qG&IpOw$L*+HZ(Sv{F%{-DXVd^InyNolHe(y delta 164 zcmey!+R4V5(#FK_9|&|Oayl~!Gfwoo!pqLcz+l9{D98W=&Xe^S?Ugkc1X>svd^3}a z@{9A+N)$ALG!=Y2{k$1k8Egd^lFL(o>LxNuy9cG_q$U=pGNe|dGB{hs1O)lJ2RYUm z#`tQ*oMS@r^K*)0e1m~ZLlYB&Izv5UV~feR8J(B} KS|-agT>=2X%`W%= diff --git a/lib/Hd_DalsaCamera_module.lib b/lib/Hd_DalsaCamera_module.lib index cc2d36e5dd6097c8d1dffea4f0e34dc019fb0ad6..c271a24edcc0cf6762f83aa447cf44b73e509d54 100644 GIT binary patch delta 109 zcmX>ha6({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 05dc8bab1af3b651c13ef7421da5f9dc9813f651..578514104377e7b47192dbe7bc547dd9da0eba5a 100644 GIT binary patch delta 140 zcmZoF3Rm%U~svd^3}a z@{9A+N)$ALG!=Y2{k$1k8Egd^lFL(o>N**v-GfqdQWJ|)8B!}!8Jw+R0)qVAgBouQtwvBl)ej804f KEtAEWE&%|e6)vy< diff --git a/lib/Hd_FinsTcp_module.lib b/lib/Hd_FinsTcp_module.lib index a50e177e10f90e3993f56c5a13e462416b8c93d4..e7784b3ea75952388bfd4c57a0b8fb3be8e54022 100644 GIT binary patch delta 113 zcmbOrFhO8L2@@xiS>+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 cd7a09856f41e935ba31f1206b025b5c61669f5f..baf006bd011aee4aa70aba1d534a1396c11e5b8d 100644 GIT binary patch delta 180 zcmeBU`^L(d(#FK_9|)u-aym2pW0>f7jrS7+1A{38qacuCaG7k#=v1%9kk!b*;G3CT zlwX{mR-&L0q^aQJ>F3Rm%U~>UXz+lS2D98W=&XWxpo$56h1X>svd^3}a z@{9A+N)$ALG!=Y2{k$1k8Egd^lFL&VoULM#GmDe+9rH6oGh^~gOJb5rGjmd6D$GoD zgHm%+6N^(BQY%tH>H>oN-GdzK3}bvforC;?>x^QI42+Cooc(=$L;ZllVa_oj`T04; gF}}e-rlE<60b8A+p0TmTPO(O?j0nHF3Rm%U~>C!kY delta 187 zcmey$+RMh7(#FK_9|#O5aym1KGEVfn#>>gbz+l3_D98W=&XWxp9qTn11X>svd^3}a z@{9A+N)$ALG!=Y2{k$1k8Egd^lFL&VoULM#GmDe+9rH6oGh^~gOJb5rGjmd6D$GoD zgHm%+6N^(BQY%tH>H>oN-GdzK3}bvforC;?>x^QI42+Cooc(=$L;ZllVa_oj`T04; gF}}e-rlE<60b8A+p0TmTl@!pp2oC~MU5e=aq=uy^~v?jPE0`NX;!JtcbVlGnVnx04xJf7jrS7+1A{38qacuCaG7k#=v1%9kk!b*;G3CT zlwX{mR-&L0q^aQJ>F3Rm%U~>UXz+lS2D98W=&XWxpo$56h1X>svd^3}a z@{9A+N)$ALG!=Y2{k$1k8Egd^lFL&VoULM#GmDe+9rH6oGh^~gOJb5rGjmd6D$GoD zgHm%+6N^(BQY%tH>H>oN-GdzK3}bvforC;?>x^QI42+Cooc(=$L;ZllVa_oj`T04; gF}}e-rlE<60b8A+p0TmT$>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 f97806414b3a4e971708daad71c818bffbb5409f..525105f5eacaed499a94ba2026795b88d98dab5a 100644 GIT binary patch delta 141 zcmey)eV>~%rHzTetu4IjBhZIX=tKnY@ugtY-nsSnV0z)Q&!{VugpwL04}yFRsaA1 delta 165 zcmcc5{hgaLrHzT59#y1$qG&C_Ws58_vHny1jmFXFi LK+ER4%uGxGp>;B> 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