VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-15 12:51:49 -05:00
Code Issues Projects Releases Wiki Activity

Fixed conflicts

Browse Source
This commit is contained in:
f4exb 2020-11-11 17:17:33 +01:00
parent 9ea22a9cd5
commit 24c9c3c660
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/channelrx/chanalyzer/chanalyzerwebapiadapter.cpp
View File

@ -132,11 +132,7 @@ void ChannelAnalyzerWebAPIAdapter::webapiFormatChannelSettings(
swgSpectrum->init(); swgSpectrum->init();
response.getChannelAnalyzerSettings()->setSpectrumConfig(swgSpectrum); response.getChannelAnalyzerSettings()->setSpectrumConfig(swgSpectrum);
swgSpectrum->setAveragingMode((int) spectrumSettings.m_averagingMode); swgSpectrum->setAveragingMode((int) spectrumSettings.m_averagingMode);
<<<<<<< ours
swgSpectrum->setAveragingValue(spectrumSettings.m_averagingValue);
=======
swgSpectrum->setAveragingValue(GLSpectrumSettings::getAveragingValue(spectrumSettings.m_averagingIndex, spectrumSettings.m_averagingMode)); swgSpectrum->setAveragingValue(GLSpectrumSettings::getAveragingValue(spectrumSettings.m_averagingIndex, spectrumSettings.m_averagingMode));
>>>>>>> theirs
swgSpectrum->setDecay(spectrumSettings.m_decay); swgSpectrum->setDecay(spectrumSettings.m_decay);
swgSpectrum->setDecayDivisor(spectrumSettings.m_decayDivisor); swgSpectrum->setDecayDivisor(spectrumSettings.m_decayDivisor);
swgSpectrum->setDisplayCurrent(spectrumSettings.m_displayCurrent ? 1 : 0); swgSpectrum->setDisplayCurrent(spectrumSettings.m_displayCurrent ? 1 : 0);
@ -383,15 +379,10 @@ void ChannelAnalyzerWebAPIAdapter::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("spectrumConfig.averagingMode")) { if (channelSettingsKeys.contains("spectrumConfig.averagingMode")) {
spectrumSettings.m_averagingMode = (GLSpectrumSettings::AveragingMode) response.getChannelAnalyzerSettings()->getSpectrumConfig()->getAveragingMode(); spectrumSettings.m_averagingMode = (GLSpectrumSettings::AveragingMode) response.getChannelAnalyzerSettings()->getSpectrumConfig()->getAveragingMode();
} }
<<<<<<< ours
if (channelSettingsKeys.contains("spectrumConfig.averagingValue")) {
spectrumSettings.m_averagingValue = response.getChannelAnalyzerSettings()->getSpectrumConfig()->getAveragingValue();
=======
if (channelSettingsKeys.contains("spectrumConfig.averagingValue")) if (channelSettingsKeys.contains("spectrumConfig.averagingValue"))
{ {
spectrumSettings.m_averagingValue = response.getChannelAnalyzerSettings()->getSpectrumConfig()->getAveragingValue(); spectrumSettings.m_averagingValue = response.getChannelAnalyzerSettings()->getSpectrumConfig()->getAveragingValue();
spectrumSettings.m_averagingIndex = GLSpectrumSettings::getAveragingIndex(spectrumSettings.m_averagingValue, spectrumSettings.m_averagingMode); spectrumSettings.m_averagingIndex = GLSpectrumSettings::getAveragingIndex(spectrumSettings.m_averagingValue, spectrumSettings.m_averagingMode);
>>>>>>> theirs
} }
if (channelSettingsKeys.contains("spectrumConfig.decay")) { if (channelSettingsKeys.contains("spectrumConfig.decay")) {
spectrumSettings.m_decay = response.getChannelAnalyzerSettings()->getSpectrumConfig()->getDecay(); spectrumSettings.m_decay = response.getChannelAnalyzerSettings()->getSpectrumConfig()->getDecay();

4
sdrbase/dsp/glspectrumsettings.cpp
View File

@ -48,11 +48,7 @@ void GLSpectrumSettings::resetToDefaults()
m_displayGrid = false; m_displayGrid = false;
m_averagingMode = AvgModeNone; m_averagingMode = AvgModeNone;
m_averagingIndex = 0; m_averagingIndex = 0;
<<<<<<< ours
m_averagingValue = 1; m_averagingValue = 1;
=======
m_averagingValue = 1;
>>>>>>> theirs
m_linear = false; m_linear = false;
m_ssb = false; m_ssb = false;
m_usb = true; m_usb = true;