mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-09-27 15:26:33 -04:00
GLSpectrum: fixed settings and waterfall share serialization. Reinstate #609
This commit is contained in:
parent
696c6c9379
commit
92ae4c358e
@ -75,7 +75,6 @@ void GLSpectrumGUI::setBuddies(SpectrumVis* spectrumVis, GLSpectrum* glSpectrum)
|
|||||||
m_glSpectrum = glSpectrum;
|
m_glSpectrum = glSpectrum;
|
||||||
m_glSpectrum->setMessageQueueToGUI(&m_messageQueue);
|
m_glSpectrum->setMessageQueueToGUI(&m_messageQueue);
|
||||||
m_spectrumVis->setMessageQueueToGUI(&m_messageQueue);
|
m_spectrumVis->setMessageQueueToGUI(&m_messageQueue);
|
||||||
applyGLSpectrumSettings();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void GLSpectrumGUI::resetToDefaults()
|
void GLSpectrumGUI::resetToDefaults()
|
||||||
@ -190,6 +189,7 @@ void GLSpectrumGUI::applyGLSpectrumSettings()
|
|||||||
m_glSpectrum->setDisplayGrid(m_settings.m_displayGrid);
|
m_glSpectrum->setDisplayGrid(m_settings.m_displayGrid);
|
||||||
m_glSpectrum->setDisplayGridIntensity(m_settings.m_displayGridIntensity);
|
m_glSpectrum->setDisplayGridIntensity(m_settings.m_displayGridIntensity);
|
||||||
m_glSpectrum->setDisplayTraceIntensity(m_settings.m_displayTraceIntensity);
|
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)) {
|
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 ?
|
m_glSpectrum->setTimingRate(getAveragingValue(m_settings.m_averagingIndex, m_settings.m_averagingMode) == 0 ?
|
||||||
@ -528,6 +528,19 @@ bool GLSpectrumGUI::handleMessage(const Message& message)
|
|||||||
ui->wsSpectrum->blockSignals(false);
|
ui->wsSpectrum->blockSignals(false);
|
||||||
return true;
|
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;
|
||||||
|
ui->freeze->blockSignals(true);
|
||||||
|
ui->freeze->doToggle(!msg.getStartStop()); // this is a freeze so stop is true
|
||||||
|
ui->freeze->blockSignals(false);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user