1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-07 08:24:43 -04:00

GLSpectrum: fixed settings and waterfall share serialization. Fixes #609

This commit is contained in:
f4exb
2020-08-29 11:10:11 +02:00
parent a88b2074c4
commit 97efda734f
4 changed files with 33 additions and 7 deletions
+7 -1
View File
@@ -87,7 +87,7 @@ bool GLSpectrumGUI::deserialize(const QByteArray& data)
{
if (m_settings.deserialize(data))
{
displaySettings();
displaySettings(); // ends with blockApplySettings(false)
applySettings();
return true;
}
@@ -173,6 +173,7 @@ void GLSpectrumGUI::applySettings()
m_glSpectrum->setDisplayGrid(m_settings.m_displayGrid);
m_glSpectrum->setDisplayGridIntensity(m_settings.m_displayGridIntensity);
m_glSpectrum->setDisplayTraceIntensity(m_settings.m_displayTraceIntensity);
m_glSpectrum->setWaterfallShare(m_settings.m_waterfallShare);
if ((m_settings.m_averagingMode == GLSpectrumSettings::AvgModeFixed) || (m_settings.m_averagingMode == GLSpectrumSettings::AvgModeMax)) {
m_glSpectrum->setTimingRate(getAveragingValue(m_settings.m_averagingIndex, m_settings.m_averagingMode) == 0 ?
@@ -492,6 +493,11 @@ bool GLSpectrumGUI::handleMessage(const Message& message)
setAveragingToolitp();
return true;
}
else if (GLSpectrum::MsgReportWaterfallShare::match(message))
{
const GLSpectrum::MsgReportWaterfallShare& report = (const GLSpectrum::MsgReportWaterfallShare&) message;
m_settings.m_waterfallShare = report.getWaterfallShare();
}
else if (SpectrumVis::MsgStartStop::match(message))
{
const SpectrumVis::MsgStartStop& msg = (SpectrumVis::MsgStartStop&) message;