diff --git a/README.md b/README.md index fbdde155..3c954a91 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ # Last changes -* YOLOv8 detextor worked with TensorRT! Export pretrained Pytorch models [here (ultralytics/ultralytics)](https://github.com/ultralytics/ultralytics) to onnx format and run Multitarget-tracker with -e=6 example +* YOLOv8 detector worked with TensorRT! Export pretrained Pytorch models [here (ultralytics/ultralytics)](https://github.com/ultralytics/ultralytics) to onnx format and run Multitarget-tracker with -e=6 example * Some experiments with YOLOv7_mask and results with rotated rectangles: detector works tracker in progress diff --git a/data/map/manual/france_bind.jpg b/data/map/manual/france_bind.jpg new file mode 100644 index 00000000..bbeca503 Binary files /dev/null and b/data/map/manual/france_bind.jpg differ diff --git a/data/map/manual/paint1.png b/data/map/manual/paint1.png new file mode 100644 index 00000000..d7d95172 Binary files /dev/null and b/data/map/manual/paint1.png differ diff --git a/data/map/manual/photo_2023-08-10_09-44-05.jpg b/data/map/manual/photo_2023-08-10_09-44-05.jpg new file mode 100644 index 00000000..1801574b Binary files /dev/null and b/data/map/manual/photo_2023-08-10_09-44-05.jpg differ diff --git a/data/map/manual/text_editor1.png b/data/map/manual/text_editor1.png new file mode 100644 index 00000000..86186616 Binary files /dev/null and b/data/map/manual/text_editor1.png differ diff --git a/example/CarsCounting.h b/example/CarsCounting.h index 777183c1..a9629699 100644 --- a/example/CarsCounting.h +++ b/example/CarsCounting.h @@ -167,16 +167,16 @@ class GeoParams cv::Point_ gp2(m_geoPoints[(i + 1) % m_geoPoints.size()]); cv::Point p2(m_p2mParams.Geo2Pix(gp2)); - cv::line(map, p1, p2, cv::Scalar(255, 255, 255), 1, cv::LINE_AA); + cv::line(map, p1, p2, cv::Scalar(255, 255, 255), 2, cv::LINE_AA); //std::cout << p1 << " - " << p2 << std::endl; std::stringstream label; label << std::fixed << std::setw(5) << std::setprecision(5) << "[" << m_geoPoints[i].x << ", " << m_geoPoints[i].y << "]"; int baseLine = 0; - double fontScale = 0.5; - cv::Size labelSize = cv::getTextSize(label.str(), cv::FONT_HERSHEY_SIMPLEX, fontScale, 1, &baseLine); - cv::putText(map, label.str(), p1, cv::FONT_HERSHEY_SIMPLEX, fontScale, cv::Scalar(255, 255, 255)); + double fontScale = (map.cols < 1000 && map.rows < 1000) ? 0.5 : 1.; + cv::Size labelSize = cv::getTextSize(label.str(), cv::FONT_HERSHEY_TRIPLEX, fontScale, 1, &baseLine); + cv::putText(map, label.str(), p1, cv::FONT_HERSHEY_TRIPLEX, fontScale, cv::Scalar(255, 255, 255)); } #endif @@ -189,7 +189,7 @@ class GeoParams auto center = m_p2mParams.Geo2Pix(geoCenter); //std::cout << "Convert: " << track.m_rrect.center << " -> " << geoCenter << " -> " << center << std::endl; if (center.x > 0 && center.x < map.cols && center.y > 0 && center.y < map.rows) - cv::ellipse(map, center, cv::Size(3, 3), 0, 0, 360, cv::Scalar(255, 0, 255), cv::FILLED, 8); + cv::ellipse(map, center, cv::Size(5, 5), 0, 0, 360, cv::Scalar(255, 0, 255), cv::FILLED, 8); } }