X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=include%2FTracker.h;h=aaa3d1b4583676eac00f075266d4044b9ca867a2;hb=db369d962b595544373b417ae9a76e7268eb12fb;hp=490201abcb3ef88f20d0ae3237e63f2a6f7850aa;hpb=79009fa0674d90e03b7a7bd958f7ee1e20d9b194;p=trackerpp.git

diff --git a/include/Tracker.h b/include/Tracker.h
index 490201a..aaa3d1b 100644
--- a/include/Tracker.h
+++ b/include/Tracker.h
@@ -6,9 +6,13 @@
 #include <vector>
 #include "Metrics.h"
 #include "SharedPtr.h"
+#include "MultiTracker.h"
+#include "Detector.h"
 
 namespace suanzi {
 
+    TK_DECLARE_PTR(Tracker);
+    TK_DECLARE_PTR(Patch);
     typedef enum 
     {
         Fire = -1,
@@ -17,36 +21,25 @@ namespace suanzi {
         Delete
     } TrackerStatus;
 
-    TK_DECLARE_PTR(Tracker);
-//    TK_DECLARE_PTR(KalmanFilter);
     class Tracker
     {
     public:
-        Tracker(int id);
+        Tracker(const cv::Mat& image, int id = 0);
         virtual ~Tracker();
         void updateState(const cv::Mat& image);
-        void addPatch(Patch* p);
+        void addPatch(PatchPtr p);
         TrackerStatus status;
+        std::vector<PatchPtr> patches;
+        Detection detection;
 
     private:
         TrackerStatus preStatus;
         int id;
         int age;
         int last_active;
-        std::vector<Patch *> patches;
         cv::KalmanFilter kf = {4,2};
     };
 
-//    class KalmanFilter
-//    {
-//    public:
-//        KalmanFilter();
-//        ~KalmanFilter();
-//    private:
-//        cv::KalmanFilter
-//
-//    };
-
 
 }