- use Tracker

git-svn-id: http://moon:8086/svn/software/trunk/projects/mpsk_rx_gui@1037 b431acfa-c32f-4a4a-93f1-934dc6c82436

Source/Receiver.hpp

@@ -18,6 +18,8 @@
 #include <cpp/radio/interpolation/Farrow.hpp>
 #include <cpp/radio/interpolation/DownSampler.hpp>
 #include <cpp/radio/interpolation/PolyPhase.hpp>
+#include <cpp/radio/metrics/Statistics.hpp>
+#include <cpp/radio/metrics/Tracker.hpp>
 
 #include <cpp/radio/Nco.hpp>
 
@@ -240,7 +242,7 @@ public:
 	virtual void setParams(const params_t &params) = 0;
 	virtual const params_t& getParams() = 0;
 	virtual const status_t& getStatus() = 0;
-	virtual const cpx_t& getTracker(uint32 index) = 0;
+	virtual cpx_t getTracker(uint32 index) = 0;
 	virtual void reset() = 0;
 	virtual void statisticsReset() = 0;
 	virtual void strReset() = 0;
@@ -354,8 +356,6 @@ private:
 	bool m_ReceiverEnable;
 	sample_clock_t m_symClock;
 	pfd_t m_pfdCpr;
-	cpx_t m_trackers_[4];
-	cpx_t m_trackers[4];
 	
 	// Filter 
 	Interpolation::DownSampler m_firArmDown;
@@ -396,6 +396,10 @@ private:
 	sym_stat_t m_sym_stat;
 	statistics_t m_statistics;
 
+	// Metrics
+	Metrics::Statistics m_statisticsProvider;
+	Metrics::Tracker m_tracker;
+
 	FrameReceiver m_frameReceiver;
 	params_t m_params;
 
@@ -403,6 +407,7 @@ private:
 	Processor::Buffer<ComplexScalar> m_buffer_agc;
 	Processor::Buffer<ComplexScalar> m_buffer_ip;
 
+	
 	void timerCallback();
 	void processBaseband(CVec const &iq, uint32_t len);
 	void minMaxInit(minmax_t *pObj, radio_float_t min_initial, radio_float_t max_initial)
@@ -464,7 +469,7 @@ private:
 	void statisticsReset() override;
 	void dfeOffUpdateFromCma() override;
 	void dfeOnUpdateFromDfeOff() override;
-	cpx_t& getTracker(uint32 index) override;
+	cpx_t getTracker(uint32 index) override;
 
 	void onData(void *pData, uint32_t size) override
 	{