Cars counting to examples

Author: Nuzhny007

CMakeLists.txt

@@ -56,7 +56,7 @@ endif(BUILD_EXAMPLES)
 
 option(BUILD_CARS_COUNTING "Should compiled Cars counting example?" OFF)
 if (BUILD_CARS_COUNTING)
-    add_subdirectory(cars_counting)
+    add_definitions(-DBUILD_CARS_COUNTING)
 endif(BUILD_CARS_COUNTING)
 
 option(BUILD_ASYNC_DETECTOR "Should compiled async example with low fps Detector?" OFF)

async_detector/AsyncDetector.cpp

@@ -149,39 +149,28 @@ void AsyncDetector::Process()
 ///
 /// \brief AsyncDetector::DrawTrack
 /// \param frame
-/// \param resizeCoeff
 /// \param track
 /// \param drawTrajectory
 /// \param isStatic
 ///
 void AsyncDetector::DrawTrack(cv::Mat frame,
-                             int resizeCoeff,
                              const TrackingObject& track,
                              bool drawTrajectory)
 {
-    auto ResizeRect = [&](const cv::Rect& r) -> cv::Rect
-    {
-        return cv::Rect(resizeCoeff * r.x, resizeCoeff * r.y, resizeCoeff * r.width, resizeCoeff * r.height);
-    };
-    auto ResizePoint = [&](const cv::Point& pt) -> cv::Point
-    {
-        return cv::Point(resizeCoeff * pt.x, resizeCoeff * pt.y);
-    };
-
     if (track.m_isStatic)
     {
 #if (CV_VERSION_MAJOR >= 4)
-        cv::rectangle(frame, ResizeRect(track.m_rrect.boundingRect()), cv::Scalar(255, 0, 255), 2, cv::LINE_AA);
+        cv::rectangle(frame, track.m_rrect.boundingRect(), cv::Scalar(255, 0, 255), 2, cv::LINE_AA);
 #else
-        cv::rectangle(frame, ResizeRect(track.m_rrect.boundingRect()), cv::Scalar(255, 0, 255), 2, CV_AA);
+        cv::rectangle(frame, track.m_rrect.boundingRect(), cv::Scalar(255, 0, 255), 2, CV_AA);
 #endif
     }
     else
     {
 #if (CV_VERSION_MAJOR >= 4)
-        cv::rectangle(frame, ResizeRect(track.m_rrect.boundingRect()), cv::Scalar(0, 255, 0), 1, cv::LINE_AA);
+        cv::rectangle(frame, track.m_rrect.boundingRect(), cv::Scalar(0, 255, 0), 1, cv::LINE_AA);
 #else
-        cv::rectangle(frame, ResizeRect(track.m_rrect.boundingRect()), cv::Scalar(0, 255, 0), 1, CV_AA);
+        cv::rectangle(frame, track.m_rrect.boundingRect(), cv::Scalar(0, 255, 0), 1, CV_AA);
 #endif
     }
 
@@ -194,16 +183,16 @@ void AsyncDetector::DrawTrack(cv::Mat frame,
             const TrajectoryPoint& pt1 = track.m_trace.at(j);
             const TrajectoryPoint& pt2 = track.m_trace.at(j + 1);
 #if (CV_VERSION_MAJOR >= 4)
-            cv::line(frame, ResizePoint(pt1.m_prediction), ResizePoint(pt2.m_prediction), cl, 1, cv::LINE_AA);
+            cv::line(frame, pt1.m_prediction, pt2.m_prediction, cl, 1, cv::LINE_AA);
 #else
-            cv::line(frame, ResizePoint(pt1.m_prediction), ResizePoint(pt2.m_prediction), cl, 1, CV_AA);
+            cv::line(frame, pt1.m_prediction, pt2.m_prediction, cl, 1, CV_AA);
 #endif
             if (pt2.m_hasRaw)
             {
 #if (CV_VERSION_MAJOR >= 4)
-                cv::circle(frame, ResizePoint(pt2.m_prediction), 4, cl, 4, cv::LINE_AA);
+                cv::circle(frame, pt2.m_prediction, 4, cl, 4, cv::LINE_AA);
 #else
-                cv::circle(frame, ResizePoint(pt2.m_prediction), 4, cl, 4, CV_AA);
+                cv::circle(frame, pt2.m_prediction, 4, cl, 4, CV_AA);
 #endif
             }
         }
@@ -229,7 +218,7 @@ void AsyncDetector::DrawData(frame_ptr frameInfo, int framesCounter, int currTim
     {
         if (track.m_isStatic)
         {
-            DrawTrack(frameInfo->m_frame, 1, track, true);
+            DrawTrack(frameInfo->m_frame, track, true);
         }
         else
         {
@@ -239,7 +228,7 @@ void AsyncDetector::DrawData(frame_ptr frameInfo, int framesCounter, int currTim
             {
 				//std::cout << TypeConverter::Type2Str(track.m_type) << " - " << track.m_rect << std::endl;
 
-                DrawTrack(frameInfo->m_frame, 1, track, true);
+                DrawTrack(frameInfo->m_frame, track, true);
 
 				std::string label = TypeConverter::Type2Str(track.m_type);// +": " + std::to_string(track.m_confidence);
 				int baseLine = 0;

async_detector/AsyncDetector.h

@@ -71,7 +71,7 @@ class AsyncDetector
 
 	void DrawData(frame_ptr frameInfo, int framesCounter, int currTime);
 
-    void DrawTrack(cv::Mat frame, int resizeCoeff, const TrackingObject& track, bool drawTrajectory = true);
+    void DrawTrack(cv::Mat frame, const TrackingObject& track, bool drawTrajectory = true);
 
     static void CaptureThread(std::string fileName, int startFrame, float* fps, FramesQueue* framesQue, bool* stopFlag);
     static void DetectThread(const config_t& config, cv::Mat firstFrame, FramesQueue* framesQue, bool* stopFlag);

cars_counting/CMakeLists.txt

@@ -11,8 +11,14 @@ set(HEADERS
     MouseExample.h
     VideoExample.h
     examples.h
+    FileLogger.h
 )
 
+if (BUILD_CARS_COUNTING)
+    set(SOURCES ${SOURCES} CarsCounting.cpp)
+    set(HEADERS ${HEADERS} CarsCounting.h)
+endif(BUILD_CARS_COUNTING)
+
 # ----------------------------------------------------------------------------
 # добавляем include директории
 # ----------------------------------------------------------------------------