tracker/pt: replace point extractor with original one by Patrick Ruoff

The new extractor we've been using doesn't take into account brightness
at all. All contours give is the ability to sort points by circularity.

v2:

Change the auto threshold point size range to 2->7 pixels radius.
Issue: #389

v3: sort by radius instead

1 files changed, 5 insertions, 6 deletions

diff --git a/tracker-pt/point_extractor.h b/tracker-pt/point_extractor.h
index 16740b91..478418e6 100644
--- a/tracker-pt/point_extractor.h
+++ b/tracker-pt/point_extractor.h
@@ -37,22 +37,21 @@ private:
     cv::Mat frame_gray;
     cv::Mat frame_bin;
     cv::Mat hist;
+    cv::Mat frame_blobs;
 
-    enum { max_blobs = 16 };
+    static constexpr int max_blobs = 16;
 
     struct blob
     {
         double radius;
-        cv::Vec2d pos;
-        double confid;
-        blob(double radius, const cv::Vec2d& pos, double confid) : radius(radius), pos(pos), confid(confid)
+        vec2 pos;
+        blob(double radius, const cv::Vec2d& pos) : radius(radius), pos(pos)
         {
-            //qDebug() << "radius" << radius << "pos" << pos[0] << pos[1] << "confid" << confid;
+            //qDebug() << "radius" << radius << "pos" << pos[0] << pos[1];
         }
     };
 
     std::vector<blob> blobs;
-    std::vector<std::vector<cv::Point>> contours;
 };
 
 #endif //POINTEXTRACTOR_H