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/spectrumdisplayform.cc | |
| parent | 22b70d0889ef3c51e27a31ee18d153093a55cbb8 (diff) | |
| parent | 98758cbfa9a2aff714952d19e773bc370dfa2185 (diff) | |
Merged next into uninstalled import branch.
Diffstat (limited to 'gr-qtgui/lib/spectrumdisplayform.cc')
| -rw-r--r-- | gr-qtgui/lib/spectrumdisplayform.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gr-qtgui/lib/spectrumdisplayform.cc b/gr-qtgui/lib/spectrumdisplayform.cc index 8d7caebda8..24f15886ba 100644 --- a/gr-qtgui/lib/spectrumdisplayform.cc +++ b/gr-qtgui/lib/spectrumdisplayform.cc @@ -23,8 +23,8 @@ #include <cmath> #include <QColorDialog> #include <QMessageBox> -#include <spectrumdisplayform.h> -#include "qtgui_types.h" +#include <qtgui/spectrumdisplayform.h> +#include <qtgui/qtgui_types.h> SpectrumDisplayForm::SpectrumDisplayForm(QWidget* parent) : QWidget(parent) @@ -192,10 +192,10 @@ SpectrumDisplayForm::newFrequencyData( const SpectrumUpdateEvent* spectrumUpdate const float* fftMagDataPoints = spectrumUpdateEvent->getFFTPoints(); const uint64_t numFFTDataPoints = spectrumUpdateEvent->getNumFFTDataPoints(); const uint64_t numTimeDomainDataPoints = spectrumUpdateEvent->getNumTimeDomainDataPoints(); - const gruel::high_res_timer_type dataTimestamp = spectrumUpdateEvent->getDataTimestamp(); + const gr::high_res_timer_type dataTimestamp = spectrumUpdateEvent->getDataTimestamp(); const bool repeatDataFlag = spectrumUpdateEvent->getRepeatDataFlag(); const bool lastOfMultipleUpdatesFlag = spectrumUpdateEvent->getLastOfMultipleUpdateFlag(); - const gruel::high_res_timer_type generatedTimestamp = spectrumUpdateEvent->getEventGeneratedTimestamp(); + const gr::high_res_timer_type generatedTimestamp = spectrumUpdateEvent->getEventGeneratedTimestamp(); double* realTimeDomainDataPoints = (double*)spectrumUpdateEvent->getRealTimeDomainPoints(); double* imagTimeDomainDataPoints = (double*)spectrumUpdateEvent->getImagTimeDomainPoints(); |