检测逻辑小更改

This commit is contained in:
2024-06-04 00:34:41 +08:00
parent d97ed362fb
commit d8d0749632
2 changed files with 6 additions and 7 deletions
@@ -220,16 +220,17 @@ void pinHandleAiEvaluate(std::shared_ptr <detData> data,
{
auto start = std::chrono::high_resolution_clock::now();
cv::Mat segRes = ~segPtr->Evaluate(src);
data->segOriginImgs.push_back(src);
std::vector<std::vector<cv::Point>> 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 <detData> 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 <detData> 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));
@@ -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()
{