diff --git a/src/yolo_console_dll.cpp b/src/yolo_console_dll.cpp index e9c6abe2..5ea5082d 100644 --- a/src/yolo_console_dll.cpp +++ b/src/yolo_console_dll.cpp @@ -25,11 +25,16 @@ void draw_boxes(cv::Mat mat_img, std::vector result_vec, std::vector obj_names, unsigned int wait_msec = 0) { for (auto &i : result_vec) { cv::Scalar color(60, 160, 260); - cv::rectangle(mat_img, cv::Rect(i.x, i.y, i.w, i.h), color, 3); - if(obj_names.size() > i.obj_id) - putText(mat_img, obj_names[i.obj_id], cv::Point2f(i.x, i.y - 10), cv::FONT_HERSHEY_COMPLEX_SMALL, 1, color); - if(i.track_id > 0) - putText(mat_img, std::to_string(i.track_id), cv::Point2f(i.x+5, i.y + 15), cv::FONT_HERSHEY_COMPLEX_SMALL, 1, color); + cv::rectangle(mat_img, cv::Rect(i.x, i.y, i.w, i.h), color, 5); + if (obj_names.size() > i.obj_id) { + std::string obj_name = obj_names[i.obj_id]; + if (i.track_id > 0) obj_name += " - " + std::to_string(i.track_id); + cv::Size const text_size = getTextSize(obj_name, cv::FONT_HERSHEY_COMPLEX_SMALL, 1.2, 2, 0); + size_t const max_width = (text_size.width > i.w + 2) ? text_size.width : (i.w + 2); + if(i.x > 3 && (i.x + max_width) < mat_img.cols && i.y > 30 && i.y < mat_img.rows) + cv::rectangle(mat_img, cv::Point2f(i.x - 3, i.y - 30), cv::Point2f(i.x + max_width, i.y), color, CV_FILLED, 8, 0); + putText(mat_img, obj_name, cv::Point2f(i.x, i.y - 10), cv::FONT_HERSHEY_COMPLEX_SMALL, 1.2, cv::Scalar(0, 0, 0), 2); + } } cv::imshow("window name", mat_img); cv::waitKey(wait_msec); diff --git a/src/yolo_v2_class.hpp b/src/yolo_v2_class.hpp index 4d4960c8..8d506b2a 100644 --- a/src/yolo_v2_class.hpp +++ b/src/yolo_v2_class.hpp @@ -64,7 +64,7 @@ public: cv::Mat det_mat; cv::resize(mat, det_mat, cv::Size(get_net_width(), get_net_height())); auto image_ptr = mat_to_image(det_mat); - auto detection_boxes = detect(*image_ptr, thresh); + auto detection_boxes = detect(*image_ptr, thresh, use_mean); float wk = (float)mat.cols / det_mat.cols, hk = (float)mat.rows / det_mat.rows; for (auto &i : detection_boxes) i.x*=wk, i.w*= wk, i.y*=hk, i.h*=hk; return detection_boxes;