diff options
author | Ben Reynwar <ben@reynwar.net> | 2013-04-02 23:04:08 -0700 |
---|---|---|
committer | Ben Reynwar <ben@reynwar.net> | 2013-04-02 23:04:08 -0700 |
commit | c6dbde23b256a41b3d92cb4ad6b63287095d53c7 (patch) | |
tree | 71db12ea2e1667770c22568dcdf5e0857d5f1e59 /gr-qtgui/lib/WaterfallDisplayPlot.cc | |
parent | 22b70d0889ef3c51e27a31ee18d153093a55cbb8 (diff) | |
parent | 98758cbfa9a2aff714952d19e773bc370dfa2185 (diff) |
Merged next into uninstalled import branch.
Diffstat (limited to 'gr-qtgui/lib/WaterfallDisplayPlot.cc')
-rw-r--r-- | gr-qtgui/lib/WaterfallDisplayPlot.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gr-qtgui/lib/WaterfallDisplayPlot.cc b/gr-qtgui/lib/WaterfallDisplayPlot.cc index 05c89e3ecb..aa78000741 100644 --- a/gr-qtgui/lib/WaterfallDisplayPlot.cc +++ b/gr-qtgui/lib/WaterfallDisplayPlot.cc @@ -23,9 +23,9 @@ #ifndef WATERFALL_DISPLAY_PLOT_C #define WATERFALL_DISPLAY_PLOT_C -#include <WaterfallDisplayPlot.h> +#include <qtgui/WaterfallDisplayPlot.h> -#include "qtgui_types.h" +#include <qtgui/qtgui_types.h> #include <qwt_color_map.h> #include <qwt_scale_draw.h> #include <qwt_legend.h> @@ -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 */ |