mirror/darknet
1
0
Fork 0
mirror of https://github.com/pjreddie/darknet.git synced 2023-08-10 21:13:14 +03:00
Code Issues Projects Releases Wiki Activity

Small fixes

Browse Source
This commit is contained in:
AlexeyAB
2017-08-07 19:13:58 +03:00
parent 0a8391e816
commit 4579b589ba
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/yolo_console_dll.cpp
View File

@ -25,11 +25,16 @@
void draw_boxes(cv::Mat mat_img, std::vector<bbox_t> result_vec, std::vector<std::string> obj_names, unsigned int wait_msec = 0) { void draw_boxes(cv::Mat mat_img, std::vector<bbox_t> result_vec, std::vector<std::string> obj_names, unsigned int wait_msec = 0) {
for (auto &i : result_vec) { for (auto &i : result_vec) {
cv::Scalar color(60, 160, 260); cv::Scalar color(60, 160, 260);
cv::rectangle(mat_img, cv::Rect(i.x, i.y, i.w, i.h), color, 3); cv::rectangle(mat_img, cv::Rect(i.x, i.y, i.w, i.h), color, 5);
if(obj_names.size() > i.obj_id) 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); std::string obj_name = obj_names[i.obj_id];
if(i.track_id > 0) if (i.track_id > 0) obj_name += " - " + std::to_string(i.track_id);
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::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::imshow("window name", mat_img);
cv::waitKey(wait_msec); cv::waitKey(wait_msec);

2
src/yolo_v2_class.hpp
View File

@ -64,7 +64,7 @@ public:
cv::Mat det_mat; cv::Mat det_mat;
cv::resize(mat, det_mat, cv::Size(get_net_width(), get_net_height())); cv::resize(mat, det_mat, cv::Size(get_net_width(), get_net_height()));
auto image_ptr = mat_to_image(det_mat); 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; 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; for (auto &i : detection_boxes) i.x*=wk, i.w*= wk, i.y*=hk, i.h*=hk;
return detection_boxes; return detection_boxes;