qtgui: removed all traces of highResTimeFunctions.h

19 files changed, 54 insertions, 57 deletions

diff --git a/gr-qtgui/lib/ConstellationDisplayPlot.cc b/gr-qtgui/lib/ConstellationDisplayPlot.cc
index cecfc1d29..dda7cfea2 100644
--- a/gr-qtgui/lib/ConstellationDisplayPlot.cc
+++ b/gr-qtgui/lib/ConstellationDisplayPlot.cc
@@ -183,8 +183,8 @@ void ConstellationDisplayPlot::PlotNewData(const double* realDataPoints,
 					   const double timeInterval)
 {
   if((numDataPoints > 0) && 
-     (get_highres_clock() - _lastReplot > timeInterval*gruel::high_res_timer_tps())) {
-    
+     (gruel::high_res_timer_now() - _lastReplot > timeInterval*gruel::high_res_timer_tps())) {
+
     if(numDataPoints != _numPoints){
       _numPoints = numDataPoints;
 
@@ -199,7 +199,7 @@ void ConstellationDisplayPlot::PlotNewData(const double* realDataPoints,
     memcpy(_realDataPoints, realDataPoints, numDataPoints*sizeof(double));
     memcpy(_imagDataPoints, imagDataPoints, numDataPoints*sizeof(double));
 
-    _lastReplot = get_highres_clock();
+    _lastReplot = gruel::high_res_timer_now();
   }
 }
 
diff --git a/gr-qtgui/lib/ConstellationDisplayPlot.h b/gr-qtgui/lib/ConstellationDisplayPlot.h
index 38e401c68..23004f86c 100644
--- a/gr-qtgui/lib/ConstellationDisplayPlot.h
+++ b/gr-qtgui/lib/ConstellationDisplayPlot.h
@@ -34,7 +34,7 @@
 #include <qwt_plot_zoomer.h>
 #include <qwt_plot_panner.h>
 #include <qwt_plot_marker.h>
-#include <highResTimeFunctions.h>
+#include <gruel/high_res_timer.h>
 #include <qwt_symbol.h>
 #include <qtgui_util.h>
 
@@ -83,7 +83,7 @@ private:
   double* _realDataPoints;
   double* _imagDataPoints;
 
-  highres_timespec _lastReplot;
+  gruel::high_res_timer_type _lastReplot;
 
   int64_t _numPoints;
   int64_t _penSize;
diff --git a/gr-qtgui/lib/FrequencyDisplayPlot.cc b/gr-qtgui/lib/FrequencyDisplayPlot.cc
index 5db32c6f1..f57edd8f6 100644
--- a/gr-qtgui/lib/FrequencyDisplayPlot.cc
+++ b/gr-qtgui/lib/FrequencyDisplayPlot.cc
@@ -362,7 +362,7 @@ FrequencyDisplayPlot::PlotNewData(const double* dataPoints, const int64_t numDat
 {
   // Only update plot if there is data and if the time interval has elapsed
   if((numDataPoints > 0) && 
-     (get_highres_clock() - _lastReplot > timeInterval*gruel::high_res_timer_tps())) {
+     (gruel::high_res_timer_now() - _lastReplot > timeInterval*gruel::high_res_timer_tps())) {
     
     if(numDataPoints != _numPoints) {
       _numPoints = numDataPoints;
@@ -401,7 +401,7 @@ FrequencyDisplayPlot::PlotNewData(const double* dataPoints, const int64_t numDat
 
     SetUpperIntensityLevel(_peakAmplitude);
 
-    _lastReplot = get_highres_clock();
+    _lastReplot = gruel::high_res_timer_now();
   }
 }
 
diff --git a/gr-qtgui/lib/FrequencyDisplayPlot.h b/gr-qtgui/lib/FrequencyDisplayPlot.h
index 98c8d77b1..a263fec2f 100644
--- a/gr-qtgui/lib/FrequencyDisplayPlot.h
+++ b/gr-qtgui/lib/FrequencyDisplayPlot.h
@@ -35,7 +35,7 @@
 #include <qwt_plot_panner.h>
 #include <qwt_plot_marker.h>
 #include <qwt_plot_magnifier.h>
-#include <highResTimeFunctions.h>
+#include <gruel/high_res_timer.h>
 #include <qwt_symbol.h>
 #include <qtgui_util.h>
 
@@ -122,7 +122,7 @@ private:
 
   double _noiseFloorAmplitude;
 
-  highres_timespec _lastReplot;
+  gruel::high_res_timer_type _lastReplot;
 
   bool _useCenterFrequencyFlag;
 };
diff --git a/gr-qtgui/lib/Makefile.am b/gr-qtgui/lib/Makefile.am
index 95b636d89..849ee8360 100644
--- a/gr-qtgui/lib/Makefile.am
+++ b/gr-qtgui/lib/Makefile.am
@@ -70,7 +70,6 @@ grinclude_HEADERS =			\
 	WaterfallDisplayPlot.h		\
 	waterfallGlobalData.h		\
 	ConstellationDisplayPlot.h	\
-	highResTimeFunctions.h		\
 	plot_waterfall.h		\
 	spectrumdisplayform.h		\
 	timedisplayform.h		\
diff --git a/gr-qtgui/lib/SpectrumGUIClass.cc b/gr-qtgui/lib/SpectrumGUIClass.cc
index 002e944ea..af95e2bb2 100644
--- a/gr-qtgui/lib/SpectrumGUIClass.cc
+++ b/gr-qtgui/lib/SpectrumGUIClass.cc
@@ -126,7 +126,7 @@ SpectrumGUIClass::OpenSpectrumWindow(QWidget* parent,
   _lastGUIUpdateTime = 0;
 
   // Draw Blank Display
-  UpdateWindow(false, NULL, 0, NULL, 0, NULL, 0, get_highres_clock(), true);
+  UpdateWindow(false, NULL, 0, NULL, 0, NULL, 0, gruel::high_res_timer_now(), true);
 
   // Set up the initial frequency axis settings
   SetFrequencyRange(_centerFrequency, _startFrequency, _stopFrequency);
@@ -229,7 +229,7 @@ SpectrumGUIClass::UpdateWindow(const bool updateDisplayFlag,
 			       const uint64_t realTimeDomainDataSize,
 			       const float* complexTimeDomainData,
 			       const uint64_t complexTimeDomainDataSize,
-			       const highres_timespec timestamp,
+			       const gruel::high_res_timer_type timestamp,
 			       const bool lastOfMultipleFFTUpdateFlag)
 {
   //gruel::scoped_lock lock(d_mutex);
@@ -283,8 +283,8 @@ SpectrumGUIClass::UpdateWindow(const bool updateDisplayFlag,
     _lastDataPointCount = bufferSize;
   }
 
-  const highres_timespec currentTime = get_highres_clock();
-  const highres_timespec lastUpdateGUITime = GetLastGUIUpdateTime();
+  const gruel::high_res_timer_type currentTime = gruel::high_res_timer_now();
+  const gruel::high_res_timer_type lastUpdateGUITime = GetLastGUIUpdateTime();
 
   if((currentTime - lastUpdateGUITime > (4*_updateTime)*gruel::high_res_timer_tps()) &&
      (GetPendingGUIUpdateEvents() > 0) && lastUpdateGUITime != 0) {
@@ -376,17 +376,17 @@ SpectrumGUIClass::SetFFTSize(const int newSize)
   _fftSize = newSize;
 }
 
-highres_timespec
+gruel::high_res_timer_type
 SpectrumGUIClass::GetLastGUIUpdateTime()
 {
   gruel::scoped_lock lock(d_mutex);
-  highres_timespec returnValue;
+  gruel::high_res_timer_type returnValue;
   returnValue = _lastGUIUpdateTime;
   return returnValue;
 }
 
 void
-SpectrumGUIClass::SetLastGUIUpdateTime(const highres_timespec newTime)
+SpectrumGUIClass::SetLastGUIUpdateTime(const gruel::high_res_timer_type newTime)
 {
   gruel::scoped_lock lock(d_mutex);
   _lastGUIUpdateTime = newTime;
diff --git a/gr-qtgui/lib/SpectrumGUIClass.h b/gr-qtgui/lib/SpectrumGUIClass.h
index 95f010671..857c2515f 100644
--- a/gr-qtgui/lib/SpectrumGUIClass.h
+++ b/gr-qtgui/lib/SpectrumGUIClass.h
@@ -66,7 +66,7 @@ public:
 		    const uint64_t, const float*,
 		    const uint64_t, const float*,
 		    const uint64_t,
-		    const highres_timespec, const bool);
+		    const gruel::high_res_timer_type, const bool);
 
   float GetPowerValue();
   void SetPowerValue(const float);
@@ -78,8 +78,8 @@ public:
   int GetFFTSizeIndex();
   void SetFFTSize(const int);
 
-  highres_timespec GetLastGUIUpdateTime();
-  void SetLastGUIUpdateTime(const highres_timespec);
+  gruel::high_res_timer_type GetLastGUIUpdateTime();
+  void SetLastGUIUpdateTime(const gruel::high_res_timer_type);
 
   unsigned int GetPendingGUIUpdateEvents();
   void IncrementPendingGUIUpdateEvents();
@@ -114,7 +114,7 @@ private:
   int _windowType;
   int64_t _lastDataPointCount;
   int _fftSize;
-  highres_timespec _lastGUIUpdateTime;
+  gruel::high_res_timer_type _lastGUIUpdateTime;
   unsigned int _pendingGUIUpdateEventsCount;
   int _droppedEntriesCount;
   bool _fftBuffersCreatedFlag;
diff --git a/gr-qtgui/lib/TimeDomainDisplayPlot.h b/gr-qtgui/lib/TimeDomainDisplayPlot.h
index 4c7b1e319..af87e1b14 100644
--- a/gr-qtgui/lib/TimeDomainDisplayPlot.h
+++ b/gr-qtgui/lib/TimeDomainDisplayPlot.h
@@ -36,7 +36,6 @@
 #include <qwt_plot_panner.h>
 #include <qwt_plot_magnifier.h>
 #include <qwt_plot_marker.h>
-#include <highResTimeFunctions.h>
 #include <qwt_symbol.h>
 #include <qtgui_util.h>
 
diff --git a/gr-qtgui/lib/WaterfallDisplayPlot.cc b/gr-qtgui/lib/WaterfallDisplayPlot.cc
index 90386281a..20e1fa4ec 100644
--- a/gr-qtgui/lib/WaterfallDisplayPlot.cc
+++ b/gr-qtgui/lib/WaterfallDisplayPlot.cc
@@ -118,12 +118,12 @@ public:
   {    
   }
 
-  virtual highres_timespec GetZeroTime() const
+  virtual gruel::high_res_timer_type GetZeroTime() const
   {
     return _zeroTime;
   }
   
-  virtual void SetZeroTime(const highres_timespec newTime)
+  virtual void SetZeroTime(const gruel::high_res_timer_type newTime)
   {
     _zeroTime = newTime;
   }
@@ -140,7 +140,7 @@ public:
 
   
 protected:
-  highres_timespec _zeroTime;
+  gruel::high_res_timer_type _zeroTime;
   double _secondsPerLine;
   
 private:
@@ -391,7 +391,7 @@ void
 WaterfallDisplayPlot::PlotNewData(const double* dataPoints, 
 				  const int64_t numDataPoints,
 				  const double timePerFFT,
-				  const highres_timespec timestamp,
+				  const gruel::high_res_timer_type timestamp,
 				  const int droppedFrames)
 {
   if(numDataPoints > 0){
@@ -407,10 +407,10 @@ WaterfallDisplayPlot::PlotNewData(const double* dataPoints,
 	replot();
       }
       
-      _lastReplot = get_highres_clock();
+      _lastReplot = gruel::high_res_timer_now();
     }
 
-    if(get_highres_clock() - _lastReplot > timePerFFT*gruel::high_res_timer_tps()) {
+    if(gruel::high_res_timer_now() - _lastReplot > timePerFFT*gruel::high_res_timer_tps()) {
       //FIXME: We may want to average the data between these updates to smooth display
       _waterfallData->addFFTData(dataPoints, numDataPoints, droppedFrames);
       _waterfallData->IncrementNumLinesToUpdate();
@@ -427,7 +427,7 @@ WaterfallDisplayPlot::PlotNewData(const double* dataPoints,
       
       replot();
 
-      _lastReplot = get_highres_clock();
+      _lastReplot = gruel::high_res_timer_now();
     }
   }
 }
@@ -570,7 +570,7 @@ WaterfallDisplayPlot::_UpdateIntensityRangeDisplay()
   replot();
 
   // Update the last replot timer
-  _lastReplot = get_highres_clock();
+  _lastReplot = gruel::high_res_timer_now();
 }
 
 void
diff --git a/gr-qtgui/lib/WaterfallDisplayPlot.h b/gr-qtgui/lib/WaterfallDisplayPlot.h
index 435453fcc..0c6a521b1 100644
--- a/gr-qtgui/lib/WaterfallDisplayPlot.h
+++ b/gr-qtgui/lib/WaterfallDisplayPlot.h
@@ -32,7 +32,7 @@
 #include <qtgui_util.h>
 #include <plot_waterfall.h>
 
-#include <highResTimeFunctions.h>
+#include <gruel/high_res_timer.h>
 
 class WaterfallDisplayPlot:public QwtPlot{
   Q_OBJECT
@@ -51,7 +51,7 @@ public:
   double GetStopFrequency()const;
 
   void PlotNewData(const double* dataPoints, const int64_t numDataPoints,
-		   const double timePerFFT, const highres_timespec timestamp,
+		   const double timePerFFT, const gruel::high_res_timer_type timestamp,
 		   const int droppedFrames);
 
   void SetIntensityRange(const double minIntensity, const double maxIntensity);
@@ -98,7 +98,7 @@ private:
 
   WaterfallData* _waterfallData;
 
-  highres_timespec _lastReplot;
+  gruel::high_res_timer_type _lastReplot;
 
   bool _useCenterFrequencyFlag;
 
diff --git a/gr-qtgui/lib/qtgui_sink_c.cc b/gr-qtgui/lib/qtgui_sink_c.cc
index e980318ca..965be0773 100644
--- a/gr-qtgui/lib/qtgui_sink_c.cc
+++ b/gr-qtgui/lib/qtgui_sink_c.cc
@@ -272,7 +272,7 @@ qtgui_sink_c::general_work (int noutput_items,
 
     // If we have enough input for one full FFT, do it
     if(datasize >= resid) {
-      const highres_timespec currentTime = get_highres_clock();
+      const gruel::high_res_timer_type currentTime = gruel::high_res_timer_now();
       
       // Fill up residbuf with d_fftsize number of items
       memcpy(d_residbuf+d_index, &in[j], sizeof(gr_complex)*resid);
diff --git a/gr-qtgui/lib/qtgui_sink_f.cc b/gr-qtgui/lib/qtgui_sink_f.cc
index 4e1799150..a435064c0 100644
--- a/gr-qtgui/lib/qtgui_sink_f.cc
+++ b/gr-qtgui/lib/qtgui_sink_f.cc
@@ -268,7 +268,7 @@ qtgui_sink_f::general_work (int noutput_items,
 
     // If we have enough input for one full FFT, do it
     if(datasize >= resid) {
-      const highres_timespec currentTime = get_highres_clock();
+      const gruel::high_res_timer_type currentTime = gruel::high_res_timer_now();
       
       // Fill up residbuf with d_fftsize number of items
       memcpy(d_residbuf+d_index, &in[j], sizeof(float)*resid);
diff --git a/gr-qtgui/lib/qtgui_time_sink_c.cc b/gr-qtgui/lib/qtgui_time_sink_c.cc
index 3d5786da1..3d38419b2 100644
--- a/gr-qtgui/lib/qtgui_time_sink_c.cc
+++ b/gr-qtgui/lib/qtgui_time_sink_c.cc
@@ -159,7 +159,7 @@ qtgui_time_sink_c::general_work (int noutput_items,
     
     // If we have enough input for one full plot, do it
     if(datasize >= resid) {
-      d_current_time = get_highres_clock();
+      d_current_time = gruel::high_res_timer_now();
       
       // Fill up residbufs with d_size number of items
       for(n = 0; n < d_nconnections; n+=2) {
@@ -171,8 +171,7 @@ qtgui_time_sink_c::general_work (int noutput_items,
       }	
 
       // Update the plot if its time
-      //if(diff_highres_timespec(d_current_time, d_last_time) > d_update_time) {
-      if(get_highres_clock() - d_last_time > d_update_time) {
+      if(gruel::high_res_timer_now() - d_last_time > d_update_time) {
 	d_last_time = d_current_time;
 	d_qApplication->postEvent(d_main_gui,
 				  new TimeUpdateEvent(d_residbufs, d_size));	
diff --git a/gr-qtgui/lib/qtgui_time_sink_c.h b/gr-qtgui/lib/qtgui_time_sink_c.h
index f06ffa8f5..459423c40 100644
--- a/gr-qtgui/lib/qtgui_time_sink_c.h
+++ b/gr-qtgui/lib/qtgui_time_sink_c.h
@@ -68,8 +68,8 @@ private:
   QWidget *d_parent;
   TimeDisplayForm *d_main_gui;
 
-  highres_timespec d_current_time;
-  highres_timespec d_last_time;
+  gruel::high_res_timer_type d_current_time;
+  gruel::high_res_timer_type d_last_time;
 
 public:
   ~qtgui_time_sink_c();
diff --git a/gr-qtgui/lib/qtgui_time_sink_f.cc b/gr-qtgui/lib/qtgui_time_sink_f.cc
index 8fd867340..58cc7a38a 100644
--- a/gr-qtgui/lib/qtgui_time_sink_f.cc
+++ b/gr-qtgui/lib/qtgui_time_sink_f.cc
@@ -159,7 +159,7 @@ qtgui_time_sink_f::general_work (int noutput_items,
     
     // If we have enough input for one full plot, do it
     if(datasize >= resid) {
-      d_current_time = get_highres_clock();
+      d_current_time = gruel::high_res_timer_now();
       
       // Fill up residbufs with d_size number of items
       for(n = 0; n < d_nconnections; n++) {
@@ -170,7 +170,7 @@ qtgui_time_sink_f::general_work (int noutput_items,
       }	
 
       // Update the plot if its time
-      if(get_highres_clock() - d_last_time > d_update_time) {
+      if(gruel::high_res_timer_now() - d_last_time > d_update_time) {
 	d_last_time = d_current_time;
 	d_qApplication->postEvent(d_main_gui,
 				  new TimeUpdateEvent(d_residbufs, d_size));	
diff --git a/gr-qtgui/lib/qtgui_time_sink_f.h b/gr-qtgui/lib/qtgui_time_sink_f.h
index 7cb0a9d37..632246c6e 100644
--- a/gr-qtgui/lib/qtgui_time_sink_f.h
+++ b/gr-qtgui/lib/qtgui_time_sink_f.h
@@ -68,8 +68,8 @@ private:
   QWidget *d_parent;
   TimeDisplayForm *d_main_gui;
 
-  highres_timespec d_current_time;
-  highres_timespec d_last_time;
+  gruel::high_res_timer_type d_current_time;
+  gruel::high_res_timer_type d_last_time;
 
 public:
   ~qtgui_time_sink_f();
diff --git a/gr-qtgui/lib/spectrumUpdateEvents.cc b/gr-qtgui/lib/spectrumUpdateEvents.cc
index 6d7ca2701..9be2f5357 100644
--- a/gr-qtgui/lib/spectrumUpdateEvents.cc
+++ b/gr-qtgui/lib/spectrumUpdateEvents.cc
@@ -8,10 +8,10 @@ SpectrumUpdateEvent::SpectrumUpdateEvent(const std::complex<float>* fftPoints,
 					 const double* realTimeDomainPoints,
 					 const double* imagTimeDomainPoints,
 					 const uint64_t numTimeDomainDataPoints,
-					 const highres_timespec dataTimestamp,
+					 const gruel::high_res_timer_type dataTimestamp,
 					 const bool repeatDataFlag,
 					 const bool lastOfMultipleUpdateFlag,
-					 const highres_timespec generatedTimestamp,
+					 const gruel::high_res_timer_type generatedTimestamp,
 					 const int droppedFFTFrames)
   : QEvent(QEvent::Type(10005))
 {
@@ -90,7 +90,7 @@ SpectrumUpdateEvent::getNumTimeDomainDataPoints() const
   return _numTimeDomainDataPoints;
 }
 
-highres_timespec
+gruel::high_res_timer_type
 SpectrumUpdateEvent::getDataTimestamp() const
 {
   return _dataTimestamp;
@@ -108,7 +108,7 @@ SpectrumUpdateEvent::getLastOfMultipleUpdateFlag() const
   return _lastOfMultipleUpdateFlag;
 }
 
-highres_timespec
+gruel::high_res_timer_type
 SpectrumUpdateEvent::getEventGeneratedTimestamp() const
 {
   return _eventGeneratedTimestamp;
diff --git a/gr-qtgui/lib/spectrumUpdateEvents.h b/gr-qtgui/lib/spectrumUpdateEvents.h
index 9224cad08..5a17657b7 100644
--- a/gr-qtgui/lib/spectrumUpdateEvents.h
+++ b/gr-qtgui/lib/spectrumUpdateEvents.h
@@ -6,7 +6,7 @@
 #include <QString>
 #include <complex>
 #include <vector>
-#include <highResTimeFunctions.h>
+#include <gruel/high_res_timer.h>
 
 class SpectrumUpdateEvent:public QEvent{
 
@@ -16,10 +16,10 @@ public:
 		      const double* realTimeDomainPoints,
 		      const double* imagTimeDomainPoints,
 		      const uint64_t numTimeDomainDataPoints,
-		      const highres_timespec dataTimestamp,
+		      const gruel::high_res_timer_type dataTimestamp,
 		      const bool repeatDataFlag,
 		      const bool lastOfMultipleUpdateFlag,
-		      const highres_timespec generatedTimestamp,
+		      const gruel::high_res_timer_type generatedTimestamp,
 		      const int droppedFFTFrames);
 
   ~SpectrumUpdateEvent();
@@ -29,10 +29,10 @@ public:
   const double* getImagTimeDomainPoints() const;
   uint64_t getNumFFTDataPoints() const;
   uint64_t getNumTimeDomainDataPoints() const;
-  highres_timespec getDataTimestamp() const;
+  gruel::high_res_timer_type getDataTimestamp() const;
   bool getRepeatDataFlag() const;
   bool getLastOfMultipleUpdateFlag() const;
-  highres_timespec getEventGeneratedTimestamp() const;
+  gruel::high_res_timer_type getEventGeneratedTimestamp() const;
   int getDroppedFFTFrames() const;
 
 protected:
@@ -43,10 +43,10 @@ private:
   double* _imagDataTimeDomainPoints;
   uint64_t _numFFTDataPoints;
   uint64_t _numTimeDomainDataPoints;
-  highres_timespec _dataTimestamp;
+  gruel::high_res_timer_type _dataTimestamp;
   bool _repeatDataFlag;
   bool _lastOfMultipleUpdateFlag;
-  highres_timespec _eventGeneratedTimestamp;
+  gruel::high_res_timer_type _eventGeneratedTimestamp;
   int _droppedFFTFrames;
 };
 
diff --git a/gr-qtgui/lib/spectrumdisplayform.cc b/gr-qtgui/lib/spectrumdisplayform.cc
index df1903391..0e8594029 100644
--- a/gr-qtgui/lib/spectrumdisplayform.cc
+++ b/gr-qtgui/lib/spectrumdisplayform.cc
@@ -145,10 +145,10 @@ SpectrumDisplayForm::newFrequencyData( const SpectrumUpdateEvent* spectrumUpdate
   const std::complex<float>* complexDataPoints = spectrumUpdateEvent->getFFTPoints();
   const uint64_t numFFTDataPoints = spectrumUpdateEvent->getNumFFTDataPoints();
   const uint64_t numTimeDomainDataPoints = spectrumUpdateEvent->getNumTimeDomainDataPoints();
-  const highres_timespec dataTimestamp = spectrumUpdateEvent->getDataTimestamp();
+  const gruel::high_res_timer_type dataTimestamp = spectrumUpdateEvent->getDataTimestamp();
   const bool repeatDataFlag = spectrumUpdateEvent->getRepeatDataFlag();
   const bool lastOfMultipleUpdatesFlag = spectrumUpdateEvent->getLastOfMultipleUpdateFlag();
-  const highres_timespec generatedTimestamp = spectrumUpdateEvent->getEventGeneratedTimestamp();
+  const gruel::high_res_timer_type generatedTimestamp = spectrumUpdateEvent->getEventGeneratedTimestamp();
   double* realTimeDomainDataPoints = (double*)spectrumUpdateEvent->getRealTimeDomainPoints();
   double* imagTimeDomainDataPoints = (double*)spectrumUpdateEvent->getImagTimeDomainPoints();