VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-26 17:58:43 -05:00
Code Issues Projects Releases Wiki Activity

GLSpectrum: take zooming into account when computing FFT bin number. Fixes #1140

Browse Source
This commit is contained in:
f4exb 2022-03-06 23:08:34 +01:00
parent 3dc0c26ff5
commit 74497a68a0
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sdrgui/gui/glspectrum.cpp
View File

@ -2229,6 +2229,11 @@ void GLSpectrum::applyChanges()
void GLSpectrum::updateHistogramMarkers() void GLSpectrum::updateHistogramMarkers()
{ {
int64_t centerFrequency;
int frequencySpan;
getFrequencyZoom(centerFrequency, frequencySpan);
int effFftSize = m_fftSize * ((float) frequencySpan / (float) m_sampleRate);
for (int i = 0; i < m_histogramMarkers.size(); i++) for (int i = 0; i < m_histogramMarkers.size(); i++)
{ {
float powerI = m_linear ? float powerI = m_linear ?
@ -2238,8 +2243,10 @@ void GLSpectrum::updateHistogramMarkers()
(m_histogramMarkers[i].m_frequency - m_frequencyScale.getRangeMin()) / m_frequencyScale.getRange(); (m_histogramMarkers[i].m_frequency - m_frequencyScale.getRangeMin()) / m_frequencyScale.getRange();
m_histogramMarkers[i].m_point.ry() = m_histogramMarkers[i].m_point.ry() =
(m_powerScale.getRangeMax() - powerI) / m_powerScale.getRange(); (m_powerScale.getRangeMax() - powerI) / m_powerScale.getRange();
// m_histogramMarkers[i].m_fftBin =
// (((m_histogramMarkers[i].m_frequency - m_centerFrequency) / (float) m_sampleRate) + 0.5) * m_fftSize;
m_histogramMarkers[i].m_fftBin = m_histogramMarkers[i].m_fftBin =
(((m_histogramMarkers[i].m_frequency - m_centerFrequency) / (float) m_sampleRate) * m_fftSize) + (m_fftSize / 2); (((m_histogramMarkers[i].m_frequency - centerFrequency) / (float) frequencySpan) + 0.5) * effFftSize;
m_histogramMarkers[i].m_point.rx() = m_histogramMarkers[i].m_point.rx() < 0 ? m_histogramMarkers[i].m_point.rx() = m_histogramMarkers[i].m_point.rx() < 0 ?
0 : m_histogramMarkers[i].m_point.rx() > 1 ? 0 : m_histogramMarkers[i].m_point.rx() > 1 ?
1 : m_histogramMarkers[i].m_point.rx(); 1 : m_histogramMarkers[i].m_point.rx();