From 6eb847801e6d1d66105a8ec2fe8c449c9e24da4c Mon Sep 17 00:00:00 2001
From: 孙天宇 <suntianyu@aiotlink.com>
Date: 星期二, 12 七月 2022 15:52:27 +0800
Subject: [PATCH] Merge branch '3090' of http://192.168.5.5:10010/r/Algorithm/baseDetector into 3090
---
src/utils/draw_util.cpp | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/utils/draw_util.cpp b/src/utils/draw_util.cpp
index 4268f9f..bf49946 100644
--- a/src/utils/draw_util.cpp
+++ b/src/utils/draw_util.cpp
@@ -70,25 +70,26 @@
cv::imwrite(file_path + name + "_" + to_string(type) + ".jpg", aaaa);
}
-void draw_SDK_result(cv::Mat mat_img, Target& target)
+void draw_SDK_result(cv::Mat mat_img, Target* target)
{
- cv::Rect tmp_rect = cv::Rect(target.rect.left,target.rect.top,target.rect.right-target.rect.left,target.rect.bottom-target.rect.top);
+ cv::Rect tmp_rect = cv::Rect(target->rect.left,target->rect.top,target->rect.right-target->rect.left,target->rect.bottom-target->rect.top);
cv::rectangle(mat_img, tmp_rect , cv::Scalar(50, 200, 50), 2);
// cv::resize(mat_img, mat_img, frameSize);
// cv::imwrite("1111.jpg", mat_img);
cv::imshow(to_string(1), mat_img);
- cv::waitKey(0);
+ cv::waitKey(1);
}
+//cv::VideoWriter writer("./01_baseDetector.avi", cv::VideoWriter::fourcc('M','J','P','G'),24, cv::Size(800,500), true);
cv::VideoWriter writer("/opt/vasystem/valog/01_Scheanve/01_baseDetector.avi", cv::VideoWriter::fourcc('M','J','P','G'),24, cv::Size(800,500), true);
-void draw_SDK_result(const int cam_id, cv::Mat mat_img, TResult& t_result)
+void draw_SDK_result(const int cam_id, cv::Mat mat_img, TResult* t_result)
{
cv::Rect tmp_rect;
- for (int i = 0; i < t_result.count; ++i)
+ for (int i = 0; i < t_result->count; ++i)
{
- auto &result = t_result.targets[i];
+ auto &result = t_result->targets[i];
tmp_rect = cv::Rect(result.rect.left,result.rect.top,result.rect.right-result.rect.left,result.rect.bottom-result.rect.top);
cv::rectangle(mat_img, tmp_rect , cv::Scalar(50, 200, 50), 2);
// cv::putText(mat_img, std::to_string(result.id), Point((result.rect.left+result.rect.right)/2,result.rect.top+150), CV_FONT_HERSHEY_SIMPLEX, 0.8, Scalar(255,255,0), 2);
--
Gitblit v1.8.0