Merge branch 'xcjk' of http://121.42.8.157:13000/software-l/server into xcjk

card_base.h

@@ -6,6 +6,8 @@
 #include "point.h"
 #include "common.h"
 #include <boost/circular_buffer.hpp>
+#include "../algo/MovAvgFilter/CMovAvgFilter.h"
+#include "../algo/GaussianFilter/CGaussianFilter.h"
 
 struct task;
 template<typename T> struct zloop;
@@ -135,8 +137,8 @@ struct card_location_base:card,std::enable_shared_from_this<card_location_base>
     bool m_enable_anti_collision = false;
     int m_call_level = 0;
 
-	//CMovAvgFilter m_mov_avg_filter;
-	//CGaussianFilter m_gaussian_filter;
+	CMovAvgFilter m_mov_avg_filter;
+	CGaussianFilter m_gaussian_filter;
 
     card_location_base()=default;
     card_location_base(const std::string&type,uint32_t id,uint16_t dis,int16_t t,int32_t,int32_t,uint32_t );