diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
| commit | eea870b1dd9c5b90dfa7d94e6a15ffe44cfbee7f (patch) | |
| tree | af3aa889c94cff9c503edefeaf19cb3635693bfb /gr-qtgui/lib/WaterfallDisplayPlot.cc | |
| parent | e648165dcc7609524681b5eaf9620798b75b8420 (diff) | |
| parent | 9acf35715fbb8aca5a991a3f41965db8f4cde683 (diff) | |
Merge branch 'runtime-gruel' into next
Conflicts:
gnuradio-runtime/lib/CMakeLists.txt
Diffstat (limited to 'gr-qtgui/lib/WaterfallDisplayPlot.cc')
| -rw-r--r-- | gr-qtgui/lib/WaterfallDisplayPlot.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gr-qtgui/lib/WaterfallDisplayPlot.cc b/gr-qtgui/lib/WaterfallDisplayPlot.cc index c1b8fd00c3..aa78000741 100644 --- a/gr-qtgui/lib/WaterfallDisplayPlot.cc +++ b/gr-qtgui/lib/WaterfallDisplayPlot.cc @@ -264,7 +264,7 @@ void WaterfallDisplayPlot::plotNewData(const std::vector<double*> dataPoints, const int64_t numDataPoints, const double timePerFFT, - const gruel::high_res_timer_type timestamp, + const gr::high_res_timer_type timestamp, const int droppedFrames) { if(!_stop) { @@ -283,7 +283,7 @@ WaterfallDisplayPlot::plotNewData(const std::vector<double*> dataPoints, replot(); } - _lastReplot = gruel::high_res_timer_now(); + _lastReplot = gr::high_res_timer_now(); } for(int i = 0; i < _nplots; i++) { @@ -312,7 +312,7 @@ void WaterfallDisplayPlot::plotNewData(const double* dataPoints, const int64_t numDataPoints, const double timePerFFT, - const gruel::high_res_timer_type timestamp, + const gr::high_res_timer_type timestamp, const int droppedFrames) { std::vector<double*> vecDataPoints; @@ -569,7 +569,7 @@ WaterfallDisplayPlot::_updateIntensityRangeDisplay() replot(); // Update the last replot timer - _lastReplot = gruel::high_res_timer_now(); + _lastReplot = gr::high_res_timer_now(); } #endif /* WATERFALL_DISPLAY_PLOT_C */ |