From 3529db03217f51c304cc6f0c3a5a82ebcd2a2927 Mon Sep 17 00:00:00 2001 From: "15089880081@163.com" <15089880081@163.com> Date: Wed, 5 Jun 2024 01:32:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=93=E6=9E=9C=E5=9B=BE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HandleAiUi-new/algo/ALGO_Inspection.h | 2 +- .../HandleAiUi-new/back/threadPoolManager.cpp | 15 +++++++++------ HanddleAI/HandleAiUi-new/globalStruct.h | 2 +- lib/Hd_3DCameraLMI_module_PointLazer.exp | Bin 772 -> 774 bytes lib/Hd_3DCameraLMI_module_PointLazer.lib | Bin 2276 -> 2276 bytes lib/Hd_DalsaCamera_module.exp | Bin 751 -> 753 bytes lib/Hd_DalsaCamera_module.lib | Bin 2120 -> 2120 bytes lib/Hd_FinsTcp_module.exp | Bin 743 -> 745 bytes lib/Hd_FinsTcp_module.lib | Bin 2064 -> 2064 bytes lib/Hd_MvCamera_module_GENTL.exp | Bin 756 -> 758 bytes lib/Hd_MvCamera_module_GENTL.lib | Bin 2164 -> 2164 bytes lib/Hd_MvCamera_module_GIGE.exp | Bin 755 -> 757 bytes lib/Hd_MvCamera_module_GIGE.lib | Bin 2148 -> 2148 bytes lib/Hd_ResultsSummary_module.exp | Bin 756 -> 758 bytes lib/Hd_ResultsSummary_module.lib | Bin 2164 -> 2164 bytes lib/Hd_SocketModule_ModbusTcp.exp | Bin 1501 -> 1503 bytes lib/Hd_SocketModule_ModbusTcp.lib | Bin 3446 -> 3446 bytes 17 files changed, 11 insertions(+), 8 deletions(-) diff --git a/HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h b/HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h index a082648e..a70f5c06 100644 --- a/HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h +++ b/HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h @@ -202,7 +202,7 @@ cv::Mat pinHandleAiEvaluate(std::shared_ptr data, cv::Mat& src, if (src.channels() == 3) src.copyTo(Paint); else - cvtColor(src, Paint, COLOR_GRAY2BGR); + cvtColor(src, Paint, cv::COLOR_GRAY2BGR); //处理 auto start = std::chrono::high_resolution_clock::now(); cv::Mat segRes = ~segPtr->Evaluate(src); diff --git a/HanddleAI/HandleAiUi-new/back/threadPoolManager.cpp b/HanddleAI/HandleAiUi-new/back/threadPoolManager.cpp index 80691c80..520ca65c 100644 --- a/HanddleAI/HandleAiUi-new/back/threadPoolManager.cpp +++ b/HanddleAI/HandleAiUi-new/back/threadPoolManager.cpp @@ -123,18 +123,21 @@ void threadManager::resultHandle(std::shared_ptr data) { //总图像大小 平铺显示 int matWidth = 0, matHeight = 0; - for (auto mat : data->resultImgs) + for (auto& mat : data->resultImgs) { - matHeight = max(mat.cols, matHeight); - matWidth += mat.rows; + matHeight = max(mat.rows, matHeight); + matWidth += mat.cols; } - cv::Mat showMat(matWidth, matHeight, CV_8UC3); + cv::Mat showMat(matHeight, matWidth, CV_8UC3); //平铺图像 int withCnt = 0; - for (auto mat : data->resultImgs) + //cv::Mat ab = showMat(cv::Rect(withCnt, 0, data->resultImgs[0].rows, data->resultImgs[0].cols)).clone(); + for (auto& resultMat : data->resultImgs) { - mat.copyTo(showMat(cv::Rect(withCnt, 0, mat.cols, mat.rows))); + resultMat.copyTo(showMat(cv::Rect(withCnt, 0, resultMat.cols, resultMat.rows))); + withCnt += resultMat.cols; } + std::cout << withCnt; //打包发送 QPixmap pixmap; cvMatToQPixMap(showMat, pixmap); diff --git a/HanddleAI/HandleAiUi-new/globalStruct.h b/HanddleAI/HandleAiUi-new/globalStruct.h index dc1869a7..a7a0ea9a 100644 --- a/HanddleAI/HandleAiUi-new/globalStruct.h +++ b/HanddleAI/HandleAiUi-new/globalStruct.h @@ -17,7 +17,7 @@ #define sColor_Black "22, 22, 22" #define sColor_BlackWithWhite "45, 45, 45" -#define enableHandleAiModel 0 +#define enableHandleAiModel 1 #define disableBackEndCheck 1 //绐楀彛璁剧疆 diff --git a/lib/Hd_3DCameraLMI_module_PointLazer.exp b/lib/Hd_3DCameraLMI_module_PointLazer.exp index d8e955a08830ce97f26c66b802d0659eea1b677e..4d888b40a9c5375f642662f99829c7d90e8cb894 100644 GIT binary patch delta 143 zcmZo+Yh&X~X=7se4+L5hIh`5VCi>pz{l&n*V9UTL2&5QXCR;Lk`KvKxH8L>xW+oTq z7w4yyC};#}D)@N%c{AiP*a|Wvm!~keSj8k~7ANOB=4Xax#^jfl#3Yqw=A^__n3?Dn qrRJn27N;_#R-}T|g%wY}z$ngcp=WGtXlyX~9itOdR^wzNrb_@5^(*55 delta 159 zcmZo;YhmL|X=7se4+I($Ih`3pz{lUP%V9UTL2&5Q1CtEUlWverMZen2Y%}g%J zFV0UZQP2p|RPgci^Jd6quoYxTE>B_bw2Dd2EKbgM%+CzXjL9!8iAgHW%t?ubB+ng&(A52@eKwt4NdfnE%l6zO${w4e_(WC`rI_x Hgy|9hD(5k2 diff --git a/lib/Hd_3DCameraLMI_module_PointLazer.lib b/lib/Hd_3DCameraLMI_module_PointLazer.lib index b04150d66d0bd6f8780c0ea27f1bb8d8c729edd8..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_(X8S0VbAz%oEN}KEiaIMV;Yu)8u~UVkRIpi(P879E$-XXW8l7S1&OzFfdI% w$s|3wh_xQ3OnveMb`Gf0$qsCBoC?-nr@ui}noYjT)&oBpEpA`gRLM#a(N0+-9$!dewWmw(sYK@ic|&{tC+Ch$$J^a*)8>q UjZFha6({12NR3#l2yki_b}~YQDewzob1D#&IF|7*`+q0XO?DU7G=zs{FY@ZOj3RF rT2>CIg2@+IV_DC4{(bR!@_QEf$!nOTC+D&?!c;0lRc@AN*JK0$_5&nj delta 108 zcmX>ha6({12NTP2)AOe%_b}~YQD^wvG}(taoe4U!8q3jtk}rF$S5Yv mIVL1OKc_gxHyFq?G|@A*&@(nRG&Y!gkBpEpA`gRLM#a(N0+T_>Zou1jiCX*xq{MJj`fRZLj0k%5s>Oqg>_ kNPd1!ag1*;kZEY5XKblwY;0<1Ir%c96VvCW$>L0x0B~k0k^lez diff --git a/lib/Hd_FinsTcp_module.lib b/lib/Hd_FinsTcp_module.lib index f679fdae9df129fa1e4d394f63100284f9d61348..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@~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 diff --git a/lib/Hd_MvCamera_module_GENTL.exp b/lib/Hd_MvCamera_module_GENTL.exp index ebd6dce5c4074d58a4d8a8aeb34c9ed2980064e3..baf006bd011aee4aa70aba1d534a1396c11e5b8d 100644 GIT binary patch delta 143 zcmeyu`i+${rHzTZBqpgeGbbgc!puas rC^aWFu{f0>wIUUyF06R+0Y-6l3q50FLt}%<_ZXd+vKl8VF?18v delta 159 zcmeyy`h}GBpEpA`gRLM#a(N1ar&UaHW^r=9V}536W=wu*Nla2{W=={>g_()2 zOKMVSIzwtjDuatvOjxjyfss*6m~%`>etu4IjBhZIX=tKnY^i5#Y-(sZ`2nL7)90qi HDomFE9%M4- diff --git a/lib/Hd_MvCamera_module_GENTL.lib b/lib/Hd_MvCamera_module_GENTL.lib index 578b535ee41c6c12f7e6ab81feeae0134eac1aaf..4010f0a3da11c6819056f7133313cf8a23370e79 100644 GIT binary patch delta 118 zcmew&@I_$53?`O;Zc(o%&tclnqQ;QbI60mZBqpgeGbbgc!puas rC^aWFu{f0>wIUUyF06R+enxS23q50FLt}%BpEpA`gRLM#a(N1ar&UaHW^r=9V}536W=wu*Nla2{W=={>g_()2 rOKMVSIzwtjDuatvOjz*bgN)+rmU_ml@!pp2oC~MU5e=aq=uy^~v?jPE0`NX;!JtcbVlGS)TPV-XJB3aIQ)aT5(x04xJn+a 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 diff --git a/lib/Hd_ResultsSummary_module.exp b/lib/Hd_ResultsSummary_module.exp index 98647907b2b4e1df2047e01da5a2bdbd7906bfd5..d575f63f09fb61afd1b239332f2dfe9e5811ad61 100644 GIT binary patch delta 143 zcmeyu`i+${rHzTZBqpgeGbbgc!puas rC^aWFu{f0>wIUUyF06R+0Y-6l3q50FLt}%<_ZXd+vKl8VF?18v delta 159 zcmeyy`h}GBpEpA`gRLM#a(N1ar&UaHW^r=9V}536W=wu*Nla2{W=={>g_()2 zOKMVSIzwtjDuatvOjxjyfss*6m~%`>etu4IjBhZIX=tKnY^i5#Y-(sZ`2nL7)90qi HDomFE9%M4- diff --git a/lib/Hd_ResultsSummary_module.lib b/lib/Hd_ResultsSummary_module.lib index ff33633f3db52aec9c9ccb88fc9c624c2109a9d1..8baafc1c7adb77e35051dfe8ea37dc3b629b4297 100644 GIT binary patch delta 117 zcmew&@I_$53?^o+dy^*5W;(#4#*o!GIi5M2DXVew8D=X+&JQ+8e@-zlFfdJC$Rs^k xi?tl4M1ArZRt})D$!D0QCVya!<9s*6;o>`}O0&tmY%MUA$_SOxn`7C<83B{oC#(Pf delta 117 zcmew&@I_$53?}BnwZ|vVW;(#4&hWWuay)Z3)90qmXPB)RIsaXl@bDA^0|V3Kg-p_u ywOGqxO4KKxVdVfSn|y{@YVrrxI8L`KOHaRpsx+J2%hm!@sf~%rHzTetu4IjBhZIX=tKnY@ugtY-nsS`7_fqrmV)zx0#uk04dZf2LJ#7 delta 139 zcmcc5eV3avrHzTQM&7B63=C!rjDie6;5pfq$yr&Q;d2uMgKuVX zQGRiLT8V;2kfwrOENW?}*W^2sX_ diff --git a/lib/Hd_SocketModule_ModbusTcp.lib b/lib/Hd_SocketModule_ModbusTcp.lib index 7d987e797c1925944487933e8b6ed09e14a3773c..b3ff8f19c2b7f22a232105edac9723e1a30fca2a 100644 GIT binary patch delta 108 zcmew+^-XHSI~LA!vnzkN7c@4(_u=wNxPHmXh?VS6W0bcJXg#Z8m