Merge pull request #937 from opentrack/easy-tracker-more-models

Easy tracker more models

1 files changed, 9 insertions, 6 deletions

diff --git a/tracker-easy/point-extractor.h b/tracker-easy/point-extractor.h
index 3c65b193..f275769d 100644
--- a/tracker-easy/point-extractor.h
+++ b/tracker-easy/point-extractor.h
@@ -17,19 +17,18 @@
 
 namespace EasyTracker
 {
-
-    const int KPointCount = 3;
-
     class PointExtractor 
     {
     public:
         PointExtractor();
         // extracts points from frame and draws some processing info into frame, if draw_output is set
         // dt: time since last call in seconds
-        void ExtractPoints(const cv::Mat& aFrame, cv::Mat* aPreview, std::vector<cv::Point>& aPoints);
-        
+        void ExtractPoints(const cv::Mat& aFrame, cv::Mat* aPreview, int aNeededPointCount, std::vector<cv::Point>& aPoints);
+
+        void UpdateSettings();
+
         // Settings
-        Settings s;
+        Settings iSettings;
         // Our frame with a channel size of 8 bits
         cv::Mat iFrameChannelSizeOne;
         // Our frame with a single 8 bits channel
@@ -37,6 +36,10 @@ namespace EasyTracker
         //
         std::vector<std::vector<cv::Point> > iContours;
 
+        // Take a copy of settings to avoid dead lock
+        int iMinPointSize;
+        int iMaxPointSize;
+
     };
 
 }