X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=src%2FTracker.h;h=490201abcb3ef88f20d0ae3237e63f2a6f7850aa;hb=0e3565052ce6db176c34c448a7368b463d318558;hp=c87f465d101bf7f9f9e9562541bbb5d6b973c132;hpb=5675c1a74ffcb95725eb11463e51cfebbc88a15e;p=trackerpp.git

diff --git a/src/Tracker.h b/src/Tracker.h
index c87f465..490201a 100644
--- a/src/Tracker.h
+++ b/src/Tracker.h
@@ -5,33 +5,47 @@
 #include <string>
 #include <vector>
 #include "Metrics.h"
+#include "SharedPtr.h"
 
 namespace suanzi {
 
-typedef enum 
-{
-    Fire = -1,
-    Active = 2,
-    Lost,
-    Delete
-} TrackerStatus;
-
-class Tracker
-{
-public:
-    Tracker(int id);
-    virtual ~Tracker();
-    void updateState(const cv::Mat& image);
-    void addPatch(Patch* p);
-
-private:
-    TrackerStatus status;
-    TrackerStatus preStatus;
-    int id;
-    int age;
-    int last_active;
-    std::vector<Patch *> patches;
-};
+    typedef enum 
+    {
+        Fire = -1,
+        Active = 2,
+        Lost,
+        Delete
+    } TrackerStatus;
+
+    TK_DECLARE_PTR(Tracker);
+//    TK_DECLARE_PTR(KalmanFilter);
+    class Tracker
+    {
+    public:
+        Tracker(int id);
+        virtual ~Tracker();
+        void updateState(const cv::Mat& image);
+        void addPatch(Patch* p);
+        TrackerStatus status;
+
+    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
+//
+//    };
 
 
 }