X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=include%2FTracker.h;h=9eb3139c2b59132173f408424113dfbe43cdfe22;hb=b5f0328f4054d19fcf8a6b870d5448be8087d29c;hp=bdf45f049f80ef177ece38023da3a751f6c47c8f;hpb=3ff9a5ad691b8dca9d91f8e9786a8d08d31b70fa;p=trackerpp.git

diff --git a/include/Tracker.h b/include/Tracker.h
index bdf45f0..9eb3139 100644
--- a/include/Tracker.h
+++ b/include/Tracker.h
@@ -6,9 +6,12 @@
 #include <vector>
 #include "Metrics.h"
 #include "SharedPtr.h"
+#include "MultiTracker.h"
 
 namespace suanzi {
 
+    TK_DECLARE_PTR(Tracker);
+    TK_DECLARE_PTR(Patch);
     typedef enum 
     {
         Fire = -1,
@@ -17,36 +20,24 @@ namespace suanzi {
         Delete
     } TrackerStatus;
 
-    TK_DECLARE_PTR(Tracker);
-//    TK_DECLARE_PTR(KalmanFilter);
     class Tracker
     {
     public:
         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;
 
     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
-//
-//    };
-
 
 }