VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-11-25 09:33:18 -05:00
Code Issues Projects Releases Wiki Activity

GLSpectrum settings rename m_averagingNb to m_averagingValue for better consistency and ensure synchronization with m_averagingIndex

Browse Source
This commit is contained in:
f4exb 2020-05-06 01:36:58 +02:00
parent c633250fe5
commit 9c459a47a5
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,7 +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);
swgSpectrum->setAveragingValue(spectrumSettings.m_averagingNb); swgSpectrum->setAveragingValue(GLSpectrumSettings::getAveragingValue(spectrumSettings.m_averagingIndex, spectrumSettings.m_averagingMode));
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);
@ -379,8 +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();
} }
if (channelSettingsKeys.contains("spectrumConfig.averagingValue")) { if (channelSettingsKeys.contains("spectrumConfig.averagingValue"))
spectrumSettings.m_averagingNb = response.getChannelAnalyzerSettings()->getSpectrumConfig()->getAveragingValue(); {
spectrumSettings.m_averagingValue = response.getChannelAnalyzerSettings()->getSpectrumConfig()->getAveragingValue();
spectrumSettings.m_averagingIndex = GLSpectrumSettings::getAveragingIndex(spectrumSettings.m_averagingValue, spectrumSettings.m_averagingMode);
} }
if (channelSettingsKeys.contains("spectrumConfig.decay")) { if (channelSettingsKeys.contains("spectrumConfig.decay")) {
spectrumSettings.m_decay = response.getChannelAnalyzerSettings()->getSpectrumConfig()->getDecay(); spectrumSettings.m_decay = response.getChannelAnalyzerSettings()->getSpectrumConfig()->getDecay();

3
sdrbase/dsp/glspectrumsettings.cpp
View File

@ -45,6 +45,7 @@ void GLSpectrumSettings::resetToDefaults()
m_displayGrid = false; m_displayGrid = false;
m_averagingMode = AvgModeNone; m_averagingMode = AvgModeNone;
m_averagingIndex = 0; m_averagingIndex = 0;
m_averagingValue = 1;
m_linear = false; m_linear = false;
m_wsSpectrumAddress = "127.0.0.1"; m_wsSpectrumAddress = "127.0.0.1";
m_wsSpectrumPort = 8887; m_wsSpectrumPort = 8887;
@ -120,7 +121,7 @@ bool GLSpectrumSettings::deserialize(const QByteArray& data)
m_averagingMode = tmp < 0 ? AvgModeNone : tmp > 3 ? AvgModeMax : (AveragingMode) tmp; m_averagingMode = tmp < 0 ? AvgModeNone : tmp > 3 ? AvgModeMax : (AveragingMode) tmp;
d.readS32(20, &tmp, 0); d.readS32(20, &tmp, 0);
m_averagingIndex = getAveragingIndex(tmp, m_averagingMode); m_averagingIndex = getAveragingIndex(tmp, m_averagingMode);
m_averagingNb = getAveragingValue(m_averagingIndex, m_averagingMode); m_averagingValue = getAveragingValue(m_averagingIndex, m_averagingMode);
d.readBool(21, &m_linear, false); d.readBool(21, &m_linear, false);
d.readString(22, &m_wsSpectrumAddress, "127.0.0.1"); d.readString(22, &m_wsSpectrumAddress, "127.0.0.1");
d.readU32(23, &utmp, 8887); d.readU32(23, &utmp, 8887);

2
sdrbase/dsp/glspectrumsettings.h
View File

@ -55,7 +55,7 @@ public:
bool m_displayGrid; bool m_displayGrid;
AveragingMode m_averagingMode; AveragingMode m_averagingMode;
int m_averagingIndex; int m_averagingIndex;
unsigned int m_averagingNb; unsigned int m_averagingValue;
bool m_linear; //!< linear else logarithmic scale bool m_linear; //!< linear else logarithmic scale
bool m_ssb; //!< SSB display with spectrum center at start of array or display - else spectrum center is on center bool m_ssb; //!< SSB display with spectrum center at start of array or display - else spectrum center is on center
bool m_usb; //!< USB display with increasing frequencies towads the right - else decreasing frequencies bool m_usb; //!< USB display with increasing frequencies towads the right - else decreasing frequencies

4
sdrbase/webapi/webapiadapterbase.cpp
View File

@ -221,8 +221,8 @@ void WebAPIAdapterBase::webapiUpdatePreset(
} }
if (spectrumIt->contains("averagingValue")) if (spectrumIt->contains("averagingValue"))
{ {
spectrumSettings.m_averagingNb = apiPreset->getSpectrumConfig()->getAveragingValue(); spectrumSettings.m_averagingValue = apiPreset->getSpectrumConfig()->getAveragingValue();
spectrumSettings.m_averagingIndex = GLSpectrumSettings::getAveragingIndex(spectrumSettings.m_averagingNb, spectrumSettings.m_averagingMode); spectrumSettings.m_averagingIndex = GLSpectrumSettings::getAveragingIndex(spectrumSettings.m_averagingValue, spectrumSettings.m_averagingMode);
} }
if (spectrumIt->contains("decay")) { if (spectrumIt->contains("decay")) {
spectrumSettings.m_decay = apiPreset->getSpectrumConfig()->getDecay(); spectrumSettings.m_decay = apiPreset->getSpectrumConfig()->getDecay();

4
sdrbase/webapi/webapirequestmapper.cpp
View File

@ -2744,9 +2744,11 @@ bool WebAPIRequestMapper::validateSpectrumSettings(SWGSDRangel::SWGGLSpectrum& s
} }
if (jsonObject.contains("wsSpectrumPort")) if (jsonObject.contains("wsSpectrumPort"))
{ {
spectrumSettings.setUsb(jsonObject["wsSpectrumPort"].toInt(8887)); spectrumSettings.setWsSpectrumPort(jsonObject["wsSpectrumPort"].toInt(8887));
spectrumSettingsKeys.append("wsSpectrumPort"); spectrumSettingsKeys.append("wsSpectrumPort");
} }
return true;
} }
bool WebAPIRequestMapper::validateDeviceListItem(SWGSDRangel::SWGDeviceListItem& deviceListItem, QJsonObject& jsonObject) bool WebAPIRequestMapper::validateDeviceListItem(SWGSDRangel::SWGDeviceListItem& deviceListItem, QJsonObject& jsonObject)