mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge pull request #2074 from godsic/bugfix/chanalyzer-settings-typo 

Fix typos in ChannelAnalyzer settings
pull/2075/head
Edouard Griffiths 2024-04-19 15:56:45 +02:00 zatwierdzone przez GitHub
rodzic 6b41a77e31 f55adc481d
commit acc06658ec
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: B5690EEEBB952194
2 zmienionych plików z 12 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
plugins/channelrx/chanalyzer/chanalyzer.cpp
Wyświetl plik

@ -380,13 +380,13 @@ void ChannelAnalyzer::webapiUpdateChannelSettings(
const QStringList& channelSettingsKeys, const QStringList& channelSettingsKeys,
SWGSDRangel::SWGChannelSettings& response) SWGSDRangel::SWGChannelSettings& response)
{ {
if (channelSettingsKeys.contains("frequency")) { if (channelSettingsKeys.contains("inputFrequencyOffset")) {
settings.m_inputFrequencyOffset = response.getChannelAnalyzerSettings()->getFrequency(); settings.m_inputFrequencyOffset = response.getChannelAnalyzerSettings()->getFrequency();
} }
if (channelSettingsKeys.contains("downSample")) { if (channelSettingsKeys.contains("rationalDownSample ")) {
settings.m_rationalDownSample = response.getChannelAnalyzerSettings()->getDownSample() != 0; settings.m_rationalDownSample = response.getChannelAnalyzerSettings()->getDownSample() != 0;
} }
if (channelSettingsKeys.contains("downSampleRate")) { if (channelSettingsKeys.contains("rationalDownSamplerRate")) {
settings.m_rationalDownSamplerRate = response.getChannelAnalyzerSettings()->getDownSampleRate(); settings.m_rationalDownSamplerRate = response.getChannelAnalyzerSettings()->getDownSampleRate();
} }
if (channelSettingsKeys.contains("bandwidth")) { if (channelSettingsKeys.contains("bandwidth")) {
@ -639,13 +639,13 @@ void ChannelAnalyzer::webapiFormatChannelSettings(
// transfer data that has been modified. When force is on transfer all data except reverse API data // transfer data that has been modified. When force is on transfer all data except reverse API data
if (channelSettingsKeys.contains("frequency") || force) { if (channelSettingsKeys.contains("inputFrequencyOffset") || force) {
swgChannelAnalyzerSettings->setFrequency(settings.m_inputFrequencyOffset); swgChannelAnalyzerSettings->setFrequency(settings.m_inputFrequencyOffset);
} }
if (channelSettingsKeys.contains("downSample")) { if (channelSettingsKeys.contains("rationalDownSample")) {
swgChannelAnalyzerSettings->setDownSample(settings.m_rationalDownSample ? 1 : 0); swgChannelAnalyzerSettings->setDownSample(settings.m_rationalDownSample ? 1 : 0);
} }
if (channelSettingsKeys.contains("downSampleRate")) { if (channelSettingsKeys.contains("rationalDownSamplerRate")) {
swgChannelAnalyzerSettings->setDownSampleRate(settings.m_rationalDownSamplerRate); swgChannelAnalyzerSettings->setDownSampleRate(settings.m_rationalDownSamplerRate);
} }
if (channelSettingsKeys.contains("bandwidth")) { if (channelSettingsKeys.contains("bandwidth")) {

12
swagger/sdrangel/code/qt5/client/SWGChannelAnalyzerSettings.cpp
Wyświetl plik

@ -210,11 +210,11 @@ SWGChannelAnalyzerSettings::fromJson(QString &json) {
void void
SWGChannelAnalyzerSettings::fromJsonObject(QJsonObject &pJson) { SWGChannelAnalyzerSettings::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&frequency, pJson["frequency"], "qint32", ""); ::SWGSDRangel::setValue(&frequency, pJson["inputFrequencyOffset"], "qint32", "");
::SWGSDRangel::setValue(&down_sample, pJson["downSample"], "qint32", ""); ::SWGSDRangel::setValue(&down_sample, pJson["rationalDownSample"], "qint32", "");
::SWGSDRangel::setValue(&down_sample_rate, pJson["downSampleRate"], "qint32", ""); ::SWGSDRangel::setValue(&down_sample_rate, pJson["rationalDownSamplerRate"], "qint32", "");
::SWGSDRangel::setValue(&bandwidth, pJson["bandwidth"], "qint32", ""); ::SWGSDRangel::setValue(&bandwidth, pJson["bandwidth"], "qint32", "");
@ -285,13 +285,13 @@ QJsonObject*
SWGChannelAnalyzerSettings::asJsonObject() { SWGChannelAnalyzerSettings::asJsonObject() {
QJsonObject* obj = new QJsonObject(); QJsonObject* obj = new QJsonObject();
if(m_frequency_isSet){ if(m_frequency_isSet){
obj->insert("frequency", QJsonValue(frequency)); obj->insert("inputFrequencyOffset", QJsonValue(frequency));
} }
if(m_down_sample_isSet){ if(m_down_sample_isSet){
obj->insert("downSample", QJsonValue(down_sample)); obj->insert("rationalDownSample", QJsonValue(down_sample));
} }
if(m_down_sample_rate_isSet){ if(m_down_sample_rate_isSet){
obj->insert("downSampleRate", QJsonValue(down_sample_rate)); obj->insert("rationalDownSamplerRate", QJsonValue(down_sample_rate));
} }
if(m_bandwidth_isSet){ if(m_bandwidth_isSet){
obj->insert("bandwidth", QJsonValue(bandwidth)); obj->insert("bandwidth", QJsonValue(bandwidth));