VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-10-30 20:40:20 -04:00
Code Issues Projects Releases Wiki Activity

GLSpectrum: set default window to Hanning

Browse Source
This commit is contained in:
f4exb 2019-10-27 22:24:14 +01:00
parent 4949e1fd04
commit 47e80ad8d1
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdrbase/dsp/glspectrumsettings.cpp
View File

@ -32,7 +32,7 @@ void GLSpectrumSettings::resetToDefaults()
{ {
m_fftSize = 1024; m_fftSize = 1024;
m_fftOverlap = 0; m_fftOverlap = 0;
m_fftWindow = FFTWindow::Hamming; m_fftWindow = FFTWindow::Hanning;
m_refLevel = 0; m_refLevel = 0;
m_powerRange = 100; m_powerRange = 100;
m_decay = 1; m_decay = 1;
@ -94,7 +94,7 @@ bool GLSpectrumSettings::deserialize(const QByteArray& data)
{ {
d.readS32(1, &m_fftSize, 1024); d.readS32(1, &m_fftSize, 1024);
d.readS32(2, &m_fftOverlap, 0); 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(4, &m_refLevel, 0);
d.readReal(5, &m_powerRange, 100); d.readReal(5, &m_powerRange, 100);
d.readBool(6, &m_displayWaterfall, true); d.readBool(6, &m_displayWaterfall, true);

6
sdrgui/gui/glspectrumgui.cpp
View File

@ -13,7 +13,7 @@ GLSpectrumGUI::GLSpectrumGUI(QWidget* parent) :
m_glSpectrum(0), m_glSpectrum(0),
m_fftSize(1024), m_fftSize(1024),
m_fftOverlap(0), m_fftOverlap(0),
m_fftWindow(FFTWindow::Hamming), m_fftWindow(FFTWindow::Hanning),
m_refLevel(0), m_refLevel(0),
m_powerRange(100), m_powerRange(100),
m_decay(1), m_decay(1),
@ -63,7 +63,7 @@ void GLSpectrumGUI::resetToDefaults()
{ {
m_fftSize = 1024; m_fftSize = 1024;
m_fftOverlap = 0; m_fftOverlap = 0;
m_fftWindow = FFTWindow::Hamming; m_fftWindow = FFTWindow::Hanning;
m_refLevel = 0; m_refLevel = 0;
m_powerRange = 100; m_powerRange = 100;
m_decay = 1; m_decay = 1;
@ -126,7 +126,7 @@ bool GLSpectrumGUI::deserialize(const QByteArray& data)
{ {
d.readS32(1, &m_fftSize, 1024); d.readS32(1, &m_fftSize, 1024);
d.readS32(2, &m_fftOverlap, 0); 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(4, &m_refLevel, 0);
d.readReal(5, &m_powerRange, 100); d.readReal(5, &m_powerRange, 100);
d.readBool(6, &m_displayWaterfall, true); d.readBool(6, &m_displayWaterfall, true);

4
sdrgui/readme.md
View File

@ -357,8 +357,8 @@ Use this combo box to select which window is applied to the FFT:
- **Bart**: Bartlett - **Bart**: Bartlett
- **B-H**: Blackmann-Harris - **B-H**: Blackmann-Harris
- **FT**: Flat top - **FT**: Flat top
- **Ham**: Hamming (default) - **Ham**: Hamming
- **Han**: Hanning - **Han**: Hanning (default)
- **Rec**: Rectangular (no window) - **Rec**: Rectangular (no window)
<h4>4.2. FFT size</h4> <h4>4.2. FFT size</h4>