From 47e80ad8d17fba98f74c138cb0d1d3465c7cf25c Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 27 Oct 2019 22:24:14 +0100 Subject: [PATCH] GLSpectrum: set default window to Hanning --- sdrbase/dsp/glspectrumsettings.cpp | 4 ++-- sdrgui/gui/glspectrumgui.cpp | 6 +++--- sdrgui/readme.md | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sdrbase/dsp/glspectrumsettings.cpp b/sdrbase/dsp/glspectrumsettings.cpp index 9961d6c99..a6c9ffcb6 100644 --- a/sdrbase/dsp/glspectrumsettings.cpp +++ b/sdrbase/dsp/glspectrumsettings.cpp @@ -32,7 +32,7 @@ void GLSpectrumSettings::resetToDefaults() { m_fftSize = 1024; m_fftOverlap = 0; - m_fftWindow = FFTWindow::Hamming; + m_fftWindow = FFTWindow::Hanning; m_refLevel = 0; m_powerRange = 100; m_decay = 1; @@ -94,7 +94,7 @@ bool GLSpectrumSettings::deserialize(const QByteArray& data) { d.readS32(1, &m_fftSize, 1024); d.readS32(2, &m_fftOverlap, 0); - d.readS32(3, &m_fftWindow, FFTWindow::Hamming); + d.readS32(3, &m_fftWindow, FFTWindow::Hanning); d.readReal(4, &m_refLevel, 0); d.readReal(5, &m_powerRange, 100); d.readBool(6, &m_displayWaterfall, true); diff --git a/sdrgui/gui/glspectrumgui.cpp b/sdrgui/gui/glspectrumgui.cpp index 3c1dbaae1..2f60909d4 100644 --- a/sdrgui/gui/glspectrumgui.cpp +++ b/sdrgui/gui/glspectrumgui.cpp @@ -13,7 +13,7 @@ GLSpectrumGUI::GLSpectrumGUI(QWidget* parent) : m_glSpectrum(0), m_fftSize(1024), m_fftOverlap(0), - m_fftWindow(FFTWindow::Hamming), + m_fftWindow(FFTWindow::Hanning), m_refLevel(0), m_powerRange(100), m_decay(1), @@ -63,7 +63,7 @@ void GLSpectrumGUI::resetToDefaults() { m_fftSize = 1024; m_fftOverlap = 0; - m_fftWindow = FFTWindow::Hamming; + m_fftWindow = FFTWindow::Hanning; m_refLevel = 0; m_powerRange = 100; m_decay = 1; @@ -126,7 +126,7 @@ bool GLSpectrumGUI::deserialize(const QByteArray& data) { d.readS32(1, &m_fftSize, 1024); d.readS32(2, &m_fftOverlap, 0); - d.readS32(3, &m_fftWindow, FFTWindow::Hamming); + d.readS32(3, &m_fftWindow, FFTWindow::Hanning); d.readReal(4, &m_refLevel, 0); d.readReal(5, &m_powerRange, 100); d.readBool(6, &m_displayWaterfall, true); diff --git a/sdrgui/readme.md b/sdrgui/readme.md index 9eb21d1e0..25bf72ca0 100644 --- a/sdrgui/readme.md +++ b/sdrgui/readme.md @@ -357,8 +357,8 @@ Use this combo box to select which window is applied to the FFT: - **Bart**: Bartlett - **B-H**: Blackmann-Harris - **FT**: Flat top - - **Ham**: Hamming (default) - - **Han**: Hanning + - **Ham**: Hamming + - **Han**: Hanning (default) - **Rec**: Rectangular (no window)

4.2. FFT size