From d8d074963243443ba8cd59a702c800bbda44bd46 Mon Sep 17 00:00:00 2001 From: "15089880081@163.com" <15089880081@163.com> Date: Tue, 4 Jun 2024 00:34:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E9=80=BB=E8=BE=91=E5=B0=8F?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h | 11 +++++------ HanddleAI/HandleAiUi-new/back/backEndManager.cpp | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h b/HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h index dde5793a..0ef7b10a 100644 --- a/HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h +++ b/HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h @@ -220,16 +220,17 @@ void pinHandleAiEvaluate(std::shared_ptr data, { auto start = std::chrono::high_resolution_clock::now(); cv::Mat segRes = ~segPtr->Evaluate(src); - data->segOriginImgs.push_back(src); + std::vector> contours; cv::findContours(segRes, contours, cv::RETR_EXTERNAL,cv::CHAIN_APPROX_NONE); int cnt = 0; - + if(contours.size())//Èç¹ûÓÐȱÏÝ + data->segOriginImgs.push_back(src); for (auto contour : contours) { cv::Rect originRect = cv::boundingRect(contour); - if (originRect.width < 10 || originRect.height < 10) + if (originRect.width < 30 || originRect.height < 30) continue; cv::Rect rect = originRect; int maxHeightOrWidth = max(rect.width, rect.height); @@ -248,7 +249,7 @@ void pinHandleAiEvaluate(std::shared_ptr data, cv::resize(clsImg, clsImg, cv::Size(128, 128)); int clsRes = clsPtr->Evaluate(clsImg); - cv::Scalar color; + cv::Scalar color = cv::Scalar(0, 0, 255, 30); switch (clsRes) { case 1: @@ -257,8 +258,6 @@ void pinHandleAiEvaluate(std::shared_ptr data, case 2: color = cv::Scalar(255, 0, 0, 30); break; - default: - color = cv::Scalar(255, 255, 255, 30); } cv::rectangle(Paint, originRect, color, 2); data->clsOriginImgs.push_back(std::make_pair(clsImg, clsRes)); diff --git a/HanddleAI/HandleAiUi-new/back/backEndManager.cpp b/HanddleAI/HandleAiUi-new/back/backEndManager.cpp index b5f2cec1..f9005a76 100644 --- a/HanddleAI/HandleAiUi-new/back/backEndManager.cpp +++ b/HanddleAI/HandleAiUi-new/back/backEndManager.cpp @@ -15,7 +15,7 @@ backEndManager::backEndManager() _imgSaveThreadManager = new imgSaveThreadManager(this); _triggerManager = new triggerManager(); _cameraManager = new cameraManager(); - _threadManager = new threadManager(); + _threadManager = new threadManager(); } void backEndManager::run() {