diff options
| author | Martin Braun <martin.braun@ettus.com> | 2020-08-14 16:54:02 +0200 |
|---|---|---|
| committer | Martin Braun <martin@gnuradio.org> | 2020-08-17 00:35:35 -0700 |
| commit | df17aeb1ae0dc9407c1b15c4329b6331dca59e8e (patch) | |
| tree | 13338b18b4715ab34fe5b3ecd35131d17bfa6841 | |
| parent | ed972766296683b671f59eca1e83c947f88060f4 (diff) | |
fixup! qtgui: Replace firdes::window with fft::window
| -rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h | 3 | ||||
| -rw-r--r-- | gr-qtgui/lib/freqcontrolpanel.cc | 16 |
2 files changed, 10 insertions, 9 deletions
diff --git a/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h b/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h index 5c4750d770..e509734a01 100644 --- a/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h +++ b/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h @@ -11,6 +11,7 @@ #ifndef FREQ_CONTROL_PANEL_H #define FREQ_CONTROL_PANEL_H +#include <gnuradio/fft/window.h> #include <gnuradio/qtgui/displayform.h> #include <gnuradio/qtgui/freqdisplayform.h> #include <QtGui/QtGui> @@ -39,7 +40,7 @@ public slots: void toggleMinHold(bool en); void toggleFFTSize(int val); - void toggleFFTWindow(const gr::filter::firdes::win_type win); + void toggleFFTWindow(const gr::fft::window::win_type win); void toggleTriggerMode(gr::qtgui::trigger_mode mode); diff --git a/gr-qtgui/lib/freqcontrolpanel.cc b/gr-qtgui/lib/freqcontrolpanel.cc index 51a97ce239..41b126adc8 100644 --- a/gr-qtgui/lib/freqcontrolpanel.cc +++ b/gr-qtgui/lib/freqcontrolpanel.cc @@ -240,23 +240,23 @@ void FreqControlPanel::toggleFFTSize(int val) d_fft_size_combo->setCurrentIndex(index); } -void FreqControlPanel::toggleFFTWindow(const gr::filter::firdes::win_type win) +void FreqControlPanel::toggleFFTWindow(const gr::fft::window::win_type win) { if (win == -1) d_fft_win_combo->setCurrentIndex(0); - if (win == gr::filter::firdes::WIN_HAMMING) + if (win == gr::fft::window::WIN_HAMMING) d_fft_win_combo->setCurrentIndex(1); - else if (win == gr::filter::firdes::WIN_HANN) + else if (win == gr::fft::window::WIN_HANN) d_fft_win_combo->setCurrentIndex(2); - else if (win == gr::filter::firdes::WIN_BLACKMAN) + else if (win == gr::fft::window::WIN_BLACKMAN) d_fft_win_combo->setCurrentIndex(3); - else if (win == gr::filter::firdes::WIN_BLACKMAN_hARRIS) + else if (win == gr::fft::window::WIN_BLACKMAN_hARRIS) d_fft_win_combo->setCurrentIndex(4); - else if (win == gr::filter::firdes::WIN_RECTANGULAR) + else if (win == gr::fft::window::WIN_RECTANGULAR) d_fft_win_combo->setCurrentIndex(5); - else if (win == gr::filter::firdes::WIN_KAISER) + else if (win == gr::fft::window::WIN_KAISER) d_fft_win_combo->setCurrentIndex(6); - else if (win == gr::filter::firdes::WIN_FLATTOP) + else if (win == gr::fft::window::WIN_FLATTOP) d_fft_win_combo->setCurrentIndex(7); } |