VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-03-27 22:59:28 -04:00
Code Issues Projects Releases Wiki Activity

GLSpectrum: keep spectrum markers within display limits

Browse Source
This commit is contained in:
f4exb 2021-08-01 06:10:43 +02:00
parent a49a88d67c
commit beb03eef01
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sdrgui/gui/glspectrum.cpp
View File

@ -2024,6 +2024,15 @@ void GLSpectrum::updateHistogramMarkers()
(m_powerScale.getRangeMax() - powerI) / m_powerScale.getRange(); (m_powerScale.getRangeMax() - powerI) / m_powerScale.getRange();
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 - m_centerFrequency) / (float) m_sampleRate) * m_fftSize) + (m_fftSize / 2);
m_histogramMarkers[i].m_point.rx() = m_histogramMarkers[i].m_point.rx() < 0 ?
0 : m_histogramMarkers[i].m_point.rx() > 1 ?
1 : m_histogramMarkers[i].m_point.rx();
m_histogramMarkers[i].m_point.ry() = m_histogramMarkers[i].m_point.ry() < 0 ?
0 : m_histogramMarkers[i].m_point.ry() > 1 ?
1 : m_histogramMarkers[i].m_point.ry();
m_histogramMarkers[i].m_fftBin = m_histogramMarkers[i].m_fftBin < 0 ?
0 : m_histogramMarkers[i].m_fftBin > m_fftSize - 1 ?
m_fftSize - 1 : m_histogramMarkers[i].m_fftBin;
m_histogramMarkers[i].m_frequencyStr = displayScaled( m_histogramMarkers[i].m_frequencyStr = displayScaled(
m_histogramMarkers[i].m_frequency, m_histogramMarkers[i].m_frequency,
'f', 'f',
@ -2066,6 +2075,12 @@ void GLSpectrum::updateWaterfallMarkers()
(m_waterfallMarkers[i].m_frequency - m_frequencyScale.getRangeMin()) / m_frequencyScale.getRange(); (m_waterfallMarkers[i].m_frequency - m_frequencyScale.getRangeMin()) / m_frequencyScale.getRange();
m_waterfallMarkers[i].m_point.ry() = m_waterfallMarkers[i].m_point.ry() =
(m_waterfallMarkers[i].m_time - m_timeScale.getRangeMin()) / m_timeScale.getRange(); (m_waterfallMarkers[i].m_time - m_timeScale.getRangeMin()) / m_timeScale.getRange();
m_waterfallMarkers[i].m_point.rx() = m_waterfallMarkers[i].m_point.rx() < 0 ?
0 : m_waterfallMarkers[i].m_point.rx() > 1 ?
1 : m_waterfallMarkers[i].m_point.rx();
m_waterfallMarkers[i].m_point.ry() = m_waterfallMarkers[i].m_point.ry() < 0 ?
0 : m_waterfallMarkers[i].m_point.ry() > 1 ?
1 : m_waterfallMarkers[i].m_point.ry();
m_waterfallMarkers[i].m_frequencyStr = displayScaled( m_waterfallMarkers[i].m_frequencyStr = displayScaled(
m_waterfallMarkers[i].m_frequency, m_waterfallMarkers[i].m_frequency,
'f', 'f',