Added objects type

nomiscientist · Dec 16, 2017 · 5eb01cd · 5eb01cd
1 parent da22d84
commit 5eb01cd
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/Detector/DNNDetector.cpp b/Detector/DNNDetector.cpp
@@ -70,8 +70,8 @@ void DNNDetector::Detect(cv::UMat& colorFrame)
     cv::Mat detection = m_net.forward("detection_out"); //compute output
 
     std::vector<double> layersTimings;
-    double freq = cv::getTickFrequency() / 1000;
-    double time = m_net.getPerfProfile(layersTimings) / freq;
+    //double freq = cv::getTickFrequency() / 1000;
+    //double time = m_net.getPerfProfile(layersTimings) / freq;
 
     cv::Mat detectionMat(detection.size[2], detection.size[3], CV_32F, detection.ptr<float>());
 
@@ -98,12 +98,12 @@ void DNNDetector::Detect(cv::UMat& colorFrame)
 
             cv::Rect object((int)xLeftBottom, (int)yLeftBottom, (int)(xRightTop - xLeftBottom), (int)(yRightTop - yLeftBottom));
 
-            m_regions.push_back(object);
+            m_regions.push_back(CRegion(object, classNames[objectClass], confidence));
 
             //cv::rectangle(frame, object, Scalar(0, 255, 0));
-            std::string label = classNames[objectClass] + ": " + std::to_string(confidence);
-            int baseLine = 0;
-            cv::Size labelSize = cv::getTextSize(label, cv::FONT_HERSHEY_SIMPLEX, 0.5, 1, &baseLine);
+            //std::string label = classNames[objectClass] + ": " + std::to_string(confidence);
+            //int baseLine = 0;
+            //cv::Size labelSize = cv::getTextSize(label, cv::FONT_HERSHEY_SIMPLEX, 0.5, 1, &baseLine);
             //cv::rectangle(frame, cv::Rect(cv::Point(xLeftBottom, yLeftBottom - labelSize.height), cv::Size(labelSize.width, labelSize.height + baseLine)), cv::Scalar(255, 255, 255), CV_FILLED);
             //cv::putText(frame, label, Point(xLeftBottom, yLeftBottom), cv::FONT_HERSHEY_SIMPLEX, 0.5, cv::Scalar(0,0,0));
         }

diff --git a/VideoExample.h b/VideoExample.h
@@ -612,6 +612,13 @@ class DNNDetectorExample : public VideoExample
                     )
             {
                 DrawTrack(frame, 1, *track);
+
+                std::string label = track->m_lastRegion.m_type + ": " + std::to_string(track->m_lastRegion.m_confidence);
+                int baseLine = 0;
+                cv::Size labelSize = cv::getTextSize(label, cv::FONT_HERSHEY_SIMPLEX, 0.5, 1, &baseLine);
+                auto rect(track->GetLastRect());
+                cv::rectangle(frame, cv::Rect(cv::Point(rect.x, rect.y - labelSize.height), cv::Size(labelSize.width, labelSize.height + baseLine)), cv::Scalar(255, 255, 255), CV_FILLED);
+                cv::putText(frame, label, cv::Point(rect.x, rect.y), cv::FONT_HERSHEY_SIMPLEX, 0.5, cv::Scalar(0, 0, 0));
             }
         }
 

diff --git a/defines.h b/defines.h
@@ -18,6 +18,7 @@ class CRegion
 {
 public:
     CRegion()
+        : m_type(""), m_confidence(-1)
     {
     }
 
@@ -27,8 +28,17 @@ class CRegion
 
     }
 
+    CRegion(const cv::Rect& rect, const std::string& type, float confidence)
+        : m_rect(rect), m_type(type), m_confidence(confidence)
+    {
+
+    }
+
     cv::Rect m_rect;
     std::vector<cv::Point2f> m_points;
+
+    std::string m_type;
+    float m_confidence;
 };
 
 typedef std::vector<CRegion> regions_t;