VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-08 00:44:48 -04:00
Code Issues Projects Releases Wiki Activity

Spectrum markers: externalize histogram and waterfall markers

Browse Source
This commit is contained in:
f4exb
2021-07-25 11:21:03 +02:00
parent 6036f62ae4
commit 1c2c8352f2
4 changed files with 133 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrgui/gui/glspectrum.cpp
+5 -5
View File
@@ -1148,7 +1148,7 @@ void GLSpectrum::drawMarkers()
QPointF ypoint = m_histogramMarkers.at(i).m_point;
QString powerStr = m_histogramMarkers.at(i).m_powerStr;
if (m_histogramMarkers.at(i).m_markerType == HistogramMarkerTypePower)
if (m_histogramMarkers.at(i).m_markerType == SpectrumHistogramMarkerTypePower)
{
ypoint.ry() =
(m_powerScale.getRangeMax() - m_currentSpectrum[m_histogramMarkers.at(i).m_fftBin]) / m_powerScale.getRange();
@@ -1195,10 +1195,10 @@ void GLSpectrum::drawMarkers()
}
else
{
float power0 = m_histogramMarkers.at(0).m_markerType == HistogramMarkerTypePower ?
float power0 = m_histogramMarkers.at(0).m_markerType == SpectrumHistogramMarkerTypePower ?
m_currentSpectrum[m_histogramMarkers.at(0).m_fftBin] :
m_histogramMarkers.at(0).m_power;
float poweri = m_histogramMarkers.at(i).m_markerType == HistogramMarkerTypePower ?
float poweri = m_histogramMarkers.at(i).m_markerType == SpectrumHistogramMarkerTypePower ?
m_currentSpectrum[m_histogramMarkers.at(i).m_fftBin] :
m_histogramMarkers.at(i).m_power;
QString deltaPowerStr = displayScaledF(
@@ -2178,7 +2178,7 @@ void GLSpectrum::mousePressEvent(QMouseEvent* event)
{
if (m_histogramMarkers.size() < 2)
{
m_histogramMarkers.push_back(HistogramMarker());
m_histogramMarkers.push_back(SpectrumHistogramMarker());
m_histogramMarkers.back().m_point = pHis;
m_histogramMarkers.back().m_frequency = frequency;
m_histogramMarkers.back().m_fftBin = fftBin;
@@ -2223,7 +2223,7 @@ void GLSpectrum::mousePressEvent(QMouseEvent* event)
{
if (m_waterfallMarkers.size() < 2)
{
m_waterfallMarkers.push_back(WaterfallMarker());
m_waterfallMarkers.push_back(SpectrumWaterfallMarker());
m_waterfallMarkers.back().m_point = pWat;
m_waterfallMarkers.back().m_frequency = frequency;
m_waterfallMarkers.back().m_frequencyStr = displayScaled(