VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-10 10:33:29 -05:00
Code Issues Projects Releases Wiki Activity

API: implemented Channel Marker in Rx channels and complete serializable objects for some

Browse Source
This commit is contained in:
f4exb 2021-12-02 23:54:39 +01:00
parent ddaeaf4b43
commit 8a438a94c1
160 changed files with 1926 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/channelrx/chanalyzer/chanalyzer.cpp
View File

@ -298,9 +298,12 @@ void ChannelAnalyzer::webapiUpdateChannelSettings(
if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) { if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) {
settings.m_spectrumGUI->updateFrom(channelSettingsKeys, response.getChannelAnalyzerSettings()->getSpectrumConfig()); settings.m_spectrumGUI->updateFrom(channelSettingsKeys, response.getChannelAnalyzerSettings()->getSpectrumConfig());
} }
if (settings.m_spectrumGUI && channelSettingsKeys.contains("scopeConfig")) { if (settings.m_scopeGUI && channelSettingsKeys.contains("scopeConfig")) {
settings.m_scopeGUI->updateFrom(channelSettingsKeys, response.getChannelAnalyzerSettings()->getScopeConfig()); settings.m_scopeGUI->updateFrom(channelSettingsKeys, response.getChannelAnalyzerSettings()->getScopeConfig());
} }
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getChannelAnalyzerSettings()->getChannelMarker());
}
} }
void ChannelAnalyzer::webapiFormatChannelSettings( void ChannelAnalyzer::webapiFormatChannelSettings(
@ -373,6 +376,20 @@ void ChannelAnalyzer::webapiFormatChannelSettings(
response.getChannelAnalyzerSettings()->setScopeConfig(swgGLScope); response.getChannelAnalyzerSettings()->setScopeConfig(swgGLScope);
} }
} }
if (settings.m_channelMarker)
{
if (response.getChannelAnalyzerSettings()->getChannelMarker())
{
settings.m_channelMarker->formatTo(response.getChannelAnalyzerSettings()->getChannelMarker());
}
else
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
response.getChannelAnalyzerSettings()->setChannelMarker(swgChannelMarker);
}
}
} }
void ChannelAnalyzer::webapiReverseSendSettings( void ChannelAnalyzer::webapiReverseSendSettings(
@ -531,6 +548,13 @@ void ChannelAnalyzer::webapiFormatChannelSettings(
settings.m_scopeGUI->formatTo(swgGLScope); settings.m_scopeGUI->formatTo(swgGLScope);
swgChannelAnalyzerSettings->setScopeConfig(swgGLScope); swgChannelAnalyzerSettings->setScopeConfig(swgGLScope);
} }
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
swgChannelAnalyzerSettings->setChannelMarker(swgChannelMarker);
}
} }
void ChannelAnalyzer::networkManagerFinished(QNetworkReply *reply) void ChannelAnalyzer::networkManagerFinished(QNetworkReply *reply)

1
plugins/channelrx/chanalyzer/chanalyzergui.cpp
View File

@ -245,6 +245,7 @@ bool ChannelAnalyzerGUI::handleMessage(const Message& message)
blockApplySettings(true); blockApplySettings(true);
ui->spectrumGUI->updateSettings(); ui->spectrumGUI->updateSettings();
ui->scopeGUI->updateSettings(); ui->scopeGUI->updateSettings();
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings(); displaySettings();
blockApplySettings(false); blockApplySettings(false);

18
plugins/channelrx/demodadsb/adsbdemod.cpp
View File

@ -40,6 +40,7 @@
#include "dsp/dspcommands.h" #include "dsp/dspcommands.h"
#include "dsp/devicesamplemimo.h" #include "dsp/devicesamplemimo.h"
#include "device/deviceapi.h" #include "device/deviceapi.h"
#include "settings/serializable.h"
#include "util/db.h" #include "util/db.h"
#include "maincore.h" #include "maincore.h"
@ -387,6 +388,9 @@ void ADSBDemod::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
settings.m_reverseAPIChannelIndex = response.getAdsbDemodSettings()->getReverseApiChannelIndex(); settings.m_reverseAPIChannelIndex = response.getAdsbDemodSettings()->getReverseApiChannelIndex();
} }
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getAdsbDemodSettings()->getChannelMarker());
}
} }
int ADSBDemod::webapiReportGet( int ADSBDemod::webapiReportGet(
@ -437,6 +441,20 @@ void ADSBDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& res
response.getAdsbDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort); response.getAdsbDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getAdsbDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); response.getAdsbDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
response.getAdsbDemodSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex); response.getAdsbDemodSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
if (settings.m_channelMarker)
{
if (response.getAdsbDemodSettings()->getChannelMarker())
{
settings.m_channelMarker->formatTo(response.getAdsbDemodSettings()->getChannelMarker());
}
else
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
response.getAdsbDemodSettings()->setChannelMarker(swgChannelMarker);
}
}
} }
void ADSBDemod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response) void ADSBDemod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)

1
plugins/channelrx/demodadsb/adsbdemodgui.cpp
View File

@ -1561,6 +1561,7 @@ bool ADSBDemodGUI::handleMessage(const Message& message)
const ADSBDemod::MsgConfigureADSBDemod& cfg = (ADSBDemod::MsgConfigureADSBDemod&) message; const ADSBDemod::MsgConfigureADSBDemod& cfg = (ADSBDemod::MsgConfigureADSBDemod&) message;
m_settings = cfg.getSettings(); m_settings = cfg.getSettings();
blockApplySettings(true); blockApplySettings(true);
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings(); displaySettings();
blockApplySettings(false); blockApplySettings(false);
return true; return true;

48
plugins/channelrx/demodais/aisdemod.cpp
View File

@ -464,6 +464,12 @@ void AISDemod::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
settings.m_reverseAPIChannelIndex = response.getAisDemodSettings()->getReverseApiChannelIndex(); settings.m_reverseAPIChannelIndex = response.getAisDemodSettings()->getReverseApiChannelIndex();
} }
if (settings.m_scopeGUI && channelSettingsKeys.contains("scopeConfig")) {
settings.m_scopeGUI->updateFrom(channelSettingsKeys, response.getAisDemodSettings()->getScopeConfig());
}
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getAisDemodSettings()->getChannelMarker());
}
} }
void AISDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const AISDemodSettings& settings) void AISDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const AISDemodSettings& settings)
@ -499,6 +505,34 @@ void AISDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& resp
response.getAisDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort); response.getAisDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getAisDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); response.getAisDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
response.getAisDemodSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex); response.getAisDemodSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
if (settings.m_scopeGUI)
{
if (response.getAisDemodSettings()->getScopeConfig())
{
settings.m_scopeGUI->formatTo(response.getAisDemodSettings()->getScopeConfig());
}
else
{
SWGSDRangel::SWGGLScope *swgGLScope = new SWGSDRangel::SWGGLScope();
settings.m_scopeGUI->formatTo(swgGLScope);
response.getAisDemodSettings()->setScopeConfig(swgGLScope);
}
}
if (settings.m_channelMarker)
{
if (response.getAisDemodSettings()->getChannelMarker())
{
settings.m_channelMarker->formatTo(response.getAisDemodSettings()->getChannelMarker());
}
else
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
response.getAisDemodSettings()->setChannelMarker(swgChannelMarker);
}
}
} }
void AISDemod::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const AISDemodSettings& settings, bool force) void AISDemod::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const AISDemodSettings& settings, bool force)
@ -584,6 +618,20 @@ void AISDemod::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex") || force) { if (channelSettingsKeys.contains("streamIndex") || force) {
swgAISDemodSettings->setStreamIndex(settings.m_streamIndex); swgAISDemodSettings->setStreamIndex(settings.m_streamIndex);
} }
if (settings.m_scopeGUI && (channelSettingsKeys.contains("scopeConfig") || force))
{
SWGSDRangel::SWGGLScope *swgGLScope = new SWGSDRangel::SWGGLScope();
settings.m_scopeGUI->formatTo(swgGLScope);
swgAISDemodSettings->setScopeConfig(swgGLScope);
}
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
swgAISDemodSettings->setChannelMarker(swgChannelMarker);
}
} }
void AISDemod::networkManagerFinished(QNetworkReply *reply) void AISDemod::networkManagerFinished(QNetworkReply *reply)

2
plugins/channelrx/demodais/aisdemodgui.cpp
View File

@ -198,6 +198,8 @@ bool AISDemodGUI::handleMessage(const Message& message)
const AISDemod::MsgConfigureAISDemod& cfg = (AISDemod::MsgConfigureAISDemod&) message; const AISDemod::MsgConfigureAISDemod& cfg = (AISDemod::MsgConfigureAISDemod&) message;
m_settings = cfg.getSettings(); m_settings = cfg.getSettings();
blockApplySettings(true); blockApplySettings(true);
ui->scopeGUI->updateSettings();
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings(); displaySettings();
blockApplySettings(false); blockApplySettings(false);
return true; return true;

25
plugins/channelrx/demodam/amdemod.cpp
View File

@ -36,6 +36,7 @@
#include "dsp/dspcommands.h" #include "dsp/dspcommands.h"
#include "device/deviceapi.h" #include "device/deviceapi.h"
#include "feature/feature.h" #include "feature/feature.h"
#include "settings/serializable.h"
#include "util/db.h" #include "util/db.h"
#include "maincore.h" #include "maincore.h"
@ -383,6 +384,9 @@ void AMDemod::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
settings.m_reverseAPIChannelIndex = response.getAmDemodSettings()->getReverseApiChannelIndex(); settings.m_reverseAPIChannelIndex = response.getAmDemodSettings()->getReverseApiChannelIndex();
} }
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getAmDemodSettings()->getChannelMarker());
}
} }
int AMDemod::webapiReportGet( int AMDemod::webapiReportGet(
@ -432,6 +436,20 @@ void AMDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respo
response.getAmDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort); response.getAmDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getAmDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); response.getAmDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
response.getAmDemodSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex); response.getAmDemodSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
if (settings.m_channelMarker)
{
if (response.getAmDemodSettings()->getChannelMarker())
{
settings.m_channelMarker->formatTo(response.getAmDemodSettings()->getChannelMarker());
}
else
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
response.getAmDemodSettings()->setChannelMarker(swgChannelMarker);
}
}
} }
void AMDemod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response) void AMDemod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@ -545,6 +563,13 @@ void AMDemod::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex") || force) { if (channelSettingsKeys.contains("streamIndex") || force) {
swgAMDemodSettings->setStreamIndex(settings.m_streamIndex); swgAMDemodSettings->setStreamIndex(settings.m_streamIndex);
} }
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
swgAMDemodSettings->setChannelMarker(swgChannelMarker);
}
} }
void AMDemod::networkManagerFinished(QNetworkReply *reply) void AMDemod::networkManagerFinished(QNetworkReply *reply)

1
plugins/channelrx/demodam/amdemodgui.cpp
View File

@ -80,6 +80,7 @@ bool AMDemodGUI::handleMessage(const Message& message)
const AMDemod::MsgConfigureAMDemod& cfg = (AMDemod::MsgConfigureAMDemod&) message; const AMDemod::MsgConfigureAMDemod& cfg = (AMDemod::MsgConfigureAMDemod&) message;
m_settings = cfg.getSettings(); m_settings = cfg.getSettings();
blockApplySettings(true); blockApplySettings(true);
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings(); displaySettings();
blockApplySettings(false); blockApplySettings(false);
return true; return true;

25
plugins/channelrx/demodapt/aptdemod.cpp
View File

@ -39,6 +39,7 @@
#include "dsp/dspcommands.h" #include "dsp/dspcommands.h"
#include "device/deviceapi.h" #include "device/deviceapi.h"
#include "feature/feature.h" #include "feature/feature.h"
#include "settings/serializable.h"
#include "util/db.h" #include "util/db.h"
#include "maincore.h" #include "maincore.h"
@ -436,6 +437,9 @@ void APTDemod::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
settings.m_reverseAPIChannelIndex = response.getAptDemodSettings()->getReverseApiChannelIndex(); settings.m_reverseAPIChannelIndex = response.getAptDemodSettings()->getReverseApiChannelIndex();
} }
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getAptDemodSettings()->getChannelMarker());
}
} }
void APTDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const APTDemodSettings& settings) void APTDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const APTDemodSettings& settings)
@ -475,6 +479,20 @@ void APTDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& resp
response.getAptDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort); response.getAptDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getAptDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); response.getAptDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
response.getAptDemodSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex); response.getAptDemodSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
if (settings.m_channelMarker)
{
if (response.getAptDemodSettings()->getChannelMarker())
{
settings.m_channelMarker->formatTo(response.getAptDemodSettings()->getChannelMarker());
}
else
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
response.getAptDemodSettings()->setChannelMarker(swgChannelMarker);
}
}
} }
void APTDemod::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const APTDemodSettings& settings, bool force) void APTDemod::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const APTDemodSettings& settings, bool force)
@ -569,6 +587,13 @@ void APTDemod::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex") || force) { if (channelSettingsKeys.contains("streamIndex") || force) {
swgAPTDemodSettings->setStreamIndex(settings.m_streamIndex); swgAPTDemodSettings->setStreamIndex(settings.m_streamIndex);
} }
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
swgAPTDemodSettings->setChannelMarker(swgChannelMarker);
}
} }
int APTDemod::webapiActionsPost( int APTDemod::webapiActionsPost(

1
plugins/channelrx/demodapt/aptdemodgui.cpp
View File

@ -94,6 +94,7 @@ bool APTDemodGUI::handleMessage(const Message& message)
const APTDemod::MsgConfigureAPTDemod& cfg = (APTDemod::MsgConfigureAPTDemod&) message; const APTDemod::MsgConfigureAPTDemod& cfg = (APTDemod::MsgConfigureAPTDemod&) message;
m_settings = cfg.getSettings(); m_settings = cfg.getSettings();
blockApplySettings(true); blockApplySettings(true);
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings(); displaySettings();
blockApplySettings(false); blockApplySettings(false);
return true; return true;

25
plugins/channelrx/demodbfm/bfmdemod.cpp
View File

@ -348,6 +348,9 @@ void BFMDemod::webapiUpdateChannelSettings(
if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) { if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) {
settings.m_spectrumGUI->updateFrom(channelSettingsKeys, response.getBfmDemodSettings()->getSpectrumConfig()); settings.m_spectrumGUI->updateFrom(channelSettingsKeys, response.getBfmDemodSettings()->getSpectrumConfig());
} }
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getBfmDemodSettings()->getChannelMarker());
}
} }
int BFMDemod::webapiReportGet( int BFMDemod::webapiReportGet(
@ -412,6 +415,20 @@ void BFMDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& resp
response.getBfmDemodSettings()->setSpectrumConfig(swgGLSpectrum); response.getBfmDemodSettings()->setSpectrumConfig(swgGLSpectrum);
} }
} }
if (settings.m_channelMarker)
{
if (response.getBfmDemodSettings()->getChannelMarker())
{
settings.m_channelMarker->formatTo(response.getBfmDemodSettings()->getChannelMarker());
}
else
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
response.getBfmDemodSettings()->setChannelMarker(swgChannelMarker);
}
}
} }
void BFMDemod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response) void BFMDemod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@ -568,12 +585,20 @@ void BFMDemod::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex") || force) { if (channelSettingsKeys.contains("streamIndex") || force) {
swgBFMDemodSettings->setStreamIndex(settings.m_streamIndex); swgBFMDemodSettings->setStreamIndex(settings.m_streamIndex);
} }
if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force)) if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force))
{ {
SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum(); SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum();
settings.m_spectrumGUI->formatTo(swgGLSpectrum); settings.m_spectrumGUI->formatTo(swgGLSpectrum);
swgBFMDemodSettings->setSpectrumConfig(swgGLSpectrum); swgBFMDemodSettings->setSpectrumConfig(swgGLSpectrum);
} }
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
swgBFMDemodSettings->setChannelMarker(swgChannelMarker);
}
} }
void BFMDemod::networkManagerFinished(QNetworkReply *reply) void BFMDemod::networkManagerFinished(QNetworkReply *reply)

1
plugins/channelrx/demodbfm/bfmdemodgui.cpp
View File

@ -105,6 +105,7 @@ bool BFMDemodGUI::handleMessage(const Message& message)
m_settings = cfg.getSettings(); m_settings = cfg.getSettings();
blockApplySettings(true); blockApplySettings(true);
ui->spectrumGUI->updateSettings(); ui->spectrumGUI->updateSettings();
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings(); displaySettings();
blockApplySettings(false); blockApplySettings(false);
return true; return true;

25
plugins/channelrx/demodchirpchat/chirpchatdemod.cpp
View File

@ -593,6 +593,9 @@ void ChirpChatDemod::webapiUpdateChannelSettings(
if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) { if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) {
settings.m_spectrumGUI->updateFrom(channelSettingsKeys, response.getChirpChatDemodSettings()->getSpectrumConfig()); settings.m_spectrumGUI->updateFrom(channelSettingsKeys, response.getChirpChatDemodSettings()->getSpectrumConfig());
} }
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getChirpChatDemodSettings()->getChannelMarker());
}
} }
int ChirpChatDemod::webapiReportGet( int ChirpChatDemod::webapiReportGet(
@ -664,6 +667,20 @@ void ChirpChatDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings
response.getChirpChatDemodSettings()->setSpectrumConfig(swgGLSpectrum); response.getChirpChatDemodSettings()->setSpectrumConfig(swgGLSpectrum);
} }
} }
if (settings.m_channelMarker)
{
if (response.getChirpChatDemodSettings()->getChannelMarker())
{
settings.m_channelMarker->formatTo(response.getChirpChatDemodSettings()->getChannelMarker());
}
else
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
response.getChirpChatDemodSettings()->setChannelMarker(swgChannelMarker);
}
}
} }
void ChirpChatDemod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response) void ChirpChatDemod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@ -816,12 +833,20 @@ void ChirpChatDemod::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("title") || force) { if (channelSettingsKeys.contains("title") || force) {
swgChirpChatDemodSettings->setTitle(new QString(settings.m_title)); swgChirpChatDemodSettings->setTitle(new QString(settings.m_title));
} }
if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force)) if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force))
{ {
SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum(); SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum();
settings.m_spectrumGUI->formatTo(swgGLSpectrum); settings.m_spectrumGUI->formatTo(swgGLSpectrum);
swgChirpChatDemodSettings->setSpectrumConfig(swgGLSpectrum); swgChirpChatDemodSettings->setSpectrumConfig(swgGLSpectrum);
} }
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
swgChirpChatDemodSettings->setChannelMarker(swgChannelMarker);
}
} }
void ChirpChatDemod::networkManagerFinished(QNetworkReply *reply) void ChirpChatDemod::networkManagerFinished(QNetworkReply *reply)

1
plugins/channelrx/demodchirpchat/chirpchatdemodgui.cpp
View File

@ -116,6 +116,7 @@ bool ChirpChatDemodGUI::handleMessage(const Message& message)
m_settings = cfg.getSettings(); m_settings = cfg.getSettings();
blockApplySettings(true); blockApplySettings(true);
ui->spectrumGUI->updateSettings(); ui->spectrumGUI->updateSettings();
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings(); displaySettings();
blockApplySettings(false); blockApplySettings(false);

25
plugins/channelrx/demoddab/dabdemod.cpp
View File

@ -36,6 +36,7 @@
#include "dsp/dspcommands.h" #include "dsp/dspcommands.h"
#include "device/deviceapi.h" #include "device/deviceapi.h"
#include "feature/feature.h" #include "feature/feature.h"
#include "settings/serializable.h"
#include "util/db.h" #include "util/db.h"
#include "maincore.h" #include "maincore.h"
@ -455,6 +456,9 @@ void DABDemod::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
settings.m_reverseAPIChannelIndex = response.getDabDemodSettings()->getReverseApiChannelIndex(); settings.m_reverseAPIChannelIndex = response.getDabDemodSettings()->getReverseApiChannelIndex();
} }
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getDabDemodSettings()->getChannelMarker());
}
} }
void DABDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const DABDemodSettings& settings) void DABDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const DABDemodSettings& settings)
@ -485,6 +489,20 @@ void DABDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& resp
response.getDabDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort); response.getDabDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getDabDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); response.getDabDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
response.getDabDemodSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex); response.getDabDemodSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
if (settings.m_channelMarker)
{
if (response.getDabDemodSettings()->getChannelMarker())
{
settings.m_channelMarker->formatTo(response.getDabDemodSettings()->getChannelMarker());
}
else
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
response.getDabDemodSettings()->setChannelMarker(swgChannelMarker);
}
}
} }
void DABDemod::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const DABDemodSettings& settings, bool force) void DABDemod::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const DABDemodSettings& settings, bool force)
@ -555,6 +573,13 @@ void DABDemod::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex") || force) { if (channelSettingsKeys.contains("streamIndex") || force) {
swgDABDemodSettings->setStreamIndex(settings.m_streamIndex); swgDABDemodSettings->setStreamIndex(settings.m_streamIndex);
} }
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
swgDABDemodSettings->setChannelMarker(swgChannelMarker);
}
} }
void DABDemod::networkManagerFinished(QNetworkReply *reply) void DABDemod::networkManagerFinished(QNetworkReply *reply)

1
plugins/channelrx/demoddab/dabdemodgui.cpp
View File

@ -193,6 +193,7 @@ bool DABDemodGUI::handleMessage(const Message& message)
const DABDemod::MsgConfigureDABDemod& cfg = (DABDemod::MsgConfigureDABDemod&) message; const DABDemod::MsgConfigureDABDemod& cfg = (DABDemod::MsgConfigureDABDemod&) message;
m_settings = cfg.getSettings(); m_settings = cfg.getSettings();
blockApplySettings(true); blockApplySettings(true);
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings(); displaySettings();
blockApplySettings(false); blockApplySettings(false);
return true; return true;

25
plugins/channelrx/demoddatv/datvdemod.cpp
View File

@ -27,6 +27,7 @@
#include "SWGChannelReport.h" #include "SWGChannelReport.h"
#include "device/deviceapi.h" #include "device/deviceapi.h"
#include "settings/serializable.h"
#include "datvdemod.h" #include "datvdemod.h"
#include "maincore.h" #include "maincore.h"
@ -397,6 +398,9 @@ void DATVDemod::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
settings.m_reverseAPIChannelIndex = response.getDatvDemodSettings()->getReverseApiChannelIndex(); settings.m_reverseAPIChannelIndex = response.getDatvDemodSettings()->getReverseApiChannelIndex();
} }
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getDatvDemodSettings()->getChannelMarker());
}
} }
void DATVDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const DATVDemodSettings& settings) void DATVDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const DATVDemodSettings& settings)
@ -465,6 +469,20 @@ void DATVDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& res
response.getDatvDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort); response.getDatvDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getDatvDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); response.getDatvDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
response.getDatvDemodSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex); response.getDatvDemodSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
if (settings.m_channelMarker)
{
if (response.getDatvDemodSettings()->getChannelMarker())
{
settings.m_channelMarker->formatTo(response.getDatvDemodSettings()->getChannelMarker());
}
else
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
response.getDatvDemodSettings()->setChannelMarker(swgChannelMarker);
}
}
} }
void DATVDemod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response) void DATVDemod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@ -608,6 +626,13 @@ void DATVDemod::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex") || force) { if (channelSettingsKeys.contains("streamIndex") || force) {
swgDATVDemodSettings->setStreamIndex(settings.m_streamIndex); swgDATVDemodSettings->setStreamIndex(settings.m_streamIndex);
} }
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
swgDATVDemodSettings->setChannelMarker(swgChannelMarker);
}
} }
void DATVDemod::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const DATVDemodSettings& settings, bool force) void DATVDemod::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const DATVDemodSettings& settings, bool force)

3
plugins/channelrx/demoddatv/datvdemodgui.cpp
View File

@ -96,6 +96,7 @@ bool DATVDemodGUI::handleMessage(const Message& message)
{ {
DATVDemod::MsgConfigureDATVDemod& cfg = (DATVDemod::MsgConfigureDATVDemod&) message; DATVDemod::MsgConfigureDATVDemod& cfg = (DATVDemod::MsgConfigureDATVDemod&) message;
m_settings = cfg.getSettings(); m_settings = cfg.getSettings();
m_objChannelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings(); displaySettings();
return true; return true;
} }
@ -226,6 +227,8 @@ DATVDemodGUI::DATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Ba
connect(m_datvDemod->getUDPStream(), &DATVUDPStream::fifoData, this, &DATVDemodGUI::on_StreamDataAvailable); connect(m_datvDemod->getUDPStream(), &DATVUDPStream::fifoData, this, &DATVDemodGUI::on_StreamDataAvailable);
} }
m_settings.setChannelMarker(&m_objChannelMarker);
connect(ui->screenTV_2, &DATVideoRender::onMetaDataChanged, this, &DATVDemodGUI::on_StreamMetaDataChanged); connect(ui->screenTV_2, &DATVideoRender::onMetaDataChanged, this, &DATVDemodGUI::on_StreamMetaDataChanged);
m_intPreviousDecodedData=0; m_intPreviousDecodedData=0;

24
plugins/channelrx/demoddsd/dsddemod.cpp
View File

@ -38,6 +38,7 @@
#include "dsp/dspcommands.h" #include "dsp/dspcommands.h"
#include "device/deviceapi.h" #include "device/deviceapi.h"
#include "feature/feature.h" #include "feature/feature.h"
#include "settings/serializable.h"
#include "util/db.h" #include "util/db.h"
#include "maincore.h" #include "maincore.h"
@ -436,6 +437,9 @@ void DSDDemod::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
settings.m_reverseAPIChannelIndex = response.getDsdDemodSettings()->getReverseApiChannelIndex(); settings.m_reverseAPIChannelIndex = response.getDsdDemodSettings()->getReverseApiChannelIndex();
} }
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getDsdDemodSettings()->getChannelMarker());
}
} }
int DSDDemod::webapiReportGet( int DSDDemod::webapiReportGet(
@ -497,6 +501,19 @@ void DSDDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& resp
response.getDsdDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); response.getDsdDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
response.getDsdDemodSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex); response.getDsdDemodSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
if (settings.m_channelMarker)
{
if (response.getDsdDemodSettings()->getChannelMarker())
{
settings.m_channelMarker->formatTo(response.getDsdDemodSettings()->getChannelMarker());
}
else
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
response.getDsdDemodSettings()->setChannelMarker(swgChannelMarker);
}
}
} }
void DSDDemod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response) void DSDDemod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@ -652,6 +669,13 @@ void DSDDemod::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex") || force) { if (channelSettingsKeys.contains("streamIndex") || force) {
swgDSDDemodSettings->setStreamIndex(settings.m_streamIndex); swgDSDDemodSettings->setStreamIndex(settings.m_streamIndex);
} }
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
swgDSDDemodSettings->setChannelMarker(swgChannelMarker);
}
} }
void DSDDemod::networkManagerFinished(QNetworkReply *reply) void DSDDemod::networkManagerFinished(QNetworkReply *reply)

1
plugins/channelrx/demoddsd/dsddemodgui.cpp
View File

@ -89,6 +89,7 @@ bool DSDDemodGUI::handleMessage(const Message& message)
const DSDDemod::MsgConfigureDSDDemod& cfg = (DSDDemod::MsgConfigureDSDDemod&) message; const DSDDemod::MsgConfigureDSDDemod& cfg = (DSDDemod::MsgConfigureDSDDemod&) message;
m_settings = cfg.getSettings(); m_settings = cfg.getSettings();
blockApplySettings(true); blockApplySettings(true);
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings(); displaySettings();
blockApplySettings(false); blockApplySettings(false);
return true; return true;

14
plugins/channelrx/demoddsd/dsddemodsettings.cpp
View File

@ -23,8 +23,7 @@
#include "dsddemodsettings.h" #include "dsddemodsettings.h"
DSDDemodSettings::DSDDemodSettings() : DSDDemodSettings::DSDDemodSettings() :
m_channelMarker(0), m_channelMarker(nullptr)
m_scopeGUI(0)
{ {
resetToDefaults(); resetToDefaults();
} }
@ -73,11 +72,6 @@ QByteArray DSDDemodSettings::serialize() const
s.writeU32(7, m_rgbColor); s.writeU32(7, m_rgbColor);
s.writeS32(8, m_squelchGate); s.writeS32(8, m_squelchGate);
s.writeS32(9, m_volume*10.0); s.writeS32(9, m_volume*10.0);
if (m_scopeGUI) {
s.writeBlob(10, m_scopeGUI->serialize());
}
s.writeS32(11, m_baudRate); s.writeS32(11, m_baudRate);
s.writeBool(12, m_enableCosineFiltering); s.writeBool(12, m_enableCosineFiltering);
s.writeBool(13, m_syncOrConstellation); s.writeBool(13, m_syncOrConstellation);
@ -144,12 +138,6 @@ bool DSDDemodSettings::deserialize(const QByteArray& data)
d.readS32(8, &m_squelchGate, 5); d.readS32(8, &m_squelchGate, 5);
d.readS32(9, &tmp, 20); d.readS32(9, &tmp, 20);
m_volume = tmp / 10.0; m_volume = tmp / 10.0;
if (m_scopeGUI) {
d.readBlob(10, &bytetmp);
m_scopeGUI->deserialize(bytetmp);
}
d.readS32(11, &m_baudRate, 4800); d.readS32(11, &m_baudRate, 4800);
d.readBool(12, &m_enableCosineFiltering, false); d.readBool(12, &m_enableCosineFiltering, false);
d.readBool(13, &m_syncOrConstellation, false); d.readBool(13, &m_syncOrConstellation, false);

2
plugins/channelrx/demoddsd/dsddemodsettings.h
View File

@ -54,13 +54,11 @@ struct DSDDemodSettings
uint16_t m_reverseAPIChannelIndex; uint16_t m_reverseAPIChannelIndex;
Serializable *m_channelMarker; Serializable *m_channelMarker;
Serializable *m_scopeGUI;
QByteArray m_rollupState; QByteArray m_rollupState;
DSDDemodSettings(); DSDDemodSettings();
void resetToDefaults(); void resetToDefaults();
void setChannelMarker(Serializable *channelMarker) { m_channelMarker = channelMarker; } void setChannelMarker(Serializable *channelMarker) { m_channelMarker = channelMarker; }
void setScopeGUI(Serializable *scopeGUI) { m_scopeGUI = scopeGUI; }
QByteArray serialize() const; QByteArray serialize() const;
bool deserialize(const QByteArray& data); bool deserialize(const QByteArray& data);
}; };

25
plugins/channelrx/demodfreedv/freedvdemod.cpp
View File

@ -345,6 +345,9 @@ void FreeDVDemod::webapiUpdateChannelSettings(
if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) { if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) {
settings.m_spectrumGUI->updateFrom(channelSettingsKeys, response.getFreeDvDemodSettings()->getSpectrumConfig()); settings.m_spectrumGUI->updateFrom(channelSettingsKeys, response.getFreeDvDemodSettings()->getSpectrumConfig());
} }
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getFreeDvDemodSettings()->getChannelMarker());
}
} }
int FreeDVDemod::webapiReportGet( int FreeDVDemod::webapiReportGet(
@ -408,6 +411,20 @@ void FreeDVDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& r
response.getFreeDvDemodSettings()->setSpectrumConfig(swgGLSpectrum); response.getFreeDvDemodSettings()->setSpectrumConfig(swgGLSpectrum);
} }
} }
if (settings.m_channelMarker)
{
if (response.getFreeDvDemodSettings()->getChannelMarker())
{
settings.m_channelMarker->formatTo(response.getFreeDvDemodSettings()->getChannelMarker());
}
else
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
response.getFreeDvDemodSettings()->setChannelMarker(swgChannelMarker);
}
}
} }
void FreeDVDemod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response) void FreeDVDemod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@ -518,12 +535,20 @@ void FreeDVDemod::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex") || force) { if (channelSettingsKeys.contains("streamIndex") || force) {
swgFreeDVDemodSettings->setStreamIndex(settings.m_streamIndex); swgFreeDVDemodSettings->setStreamIndex(settings.m_streamIndex);
} }
if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force)) if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force))
{ {
SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum(); SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum();
settings.m_spectrumGUI->formatTo(swgGLSpectrum); settings.m_spectrumGUI->formatTo(swgGLSpectrum);
swgFreeDVDemodSettings->setSpectrumConfig(swgGLSpectrum); swgFreeDVDemodSettings->setSpectrumConfig(swgGLSpectrum);
} }
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
swgFreeDVDemodSettings->setChannelMarker(swgChannelMarker);
}
} }
void FreeDVDemod::networkManagerFinished(QNetworkReply *reply) void FreeDVDemod::networkManagerFinished(QNetworkReply *reply)

1
plugins/channelrx/demodfreedv/freedvdemodgui.cpp
View File

@ -84,6 +84,7 @@ bool FreeDVDemodGUI::handleMessage(const Message& message)
m_settings = cfg.getSettings(); m_settings = cfg.getSettings();
blockApplySettings(true); blockApplySettings(true);
ui->spectrumGUI->updateSettings(); ui->spectrumGUI->updateSettings();
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings(); displaySettings();
blockApplySettings(false); blockApplySettings(false);
return true; return true;

25
plugins/channelrx/demodnfm/nfmdemod.cpp
View File

@ -36,6 +36,7 @@
#include "dsp/devicesamplemimo.h" #include "dsp/devicesamplemimo.h"
#include "device/deviceapi.h" #include "device/deviceapi.h"
#include "feature/feature.h" #include "feature/feature.h"
#include "settings/serializable.h"
#include "util/db.h" #include "util/db.h"
#include "maincore.h" #include "maincore.h"
@ -399,6 +400,9 @@ void NFMDemod::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
settings.m_reverseAPIChannelIndex = response.getNfmDemodSettings()->getReverseApiChannelIndex(); settings.m_reverseAPIChannelIndex = response.getNfmDemodSettings()->getReverseApiChannelIndex();
} }
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getNfmDemodSettings()->getChannelMarker());
}
} }
int NFMDemod::webapiReportGet( int NFMDemod::webapiReportGet(
@ -452,6 +456,20 @@ void NFMDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& resp
response.getNfmDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort); response.getNfmDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getNfmDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); response.getNfmDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
response.getNfmDemodSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex); response.getNfmDemodSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
if (settings.m_channelMarker)
{
if (response.getNfmDemodSettings()->getChannelMarker())
{
settings.m_channelMarker->formatTo(response.getNfmDemodSettings()->getChannelMarker());
}
else
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
response.getNfmDemodSettings()->setChannelMarker(swgChannelMarker);
}
}
} }
void NFMDemod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response) void NFMDemod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@ -588,6 +606,13 @@ void NFMDemod::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex") || force) { if (channelSettingsKeys.contains("streamIndex") || force) {
swgNFMDemodSettings->setStreamIndex(settings.m_streamIndex); swgNFMDemodSettings->setStreamIndex(settings.m_streamIndex);
} }
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
swgNFMDemodSettings->setChannelMarker(swgChannelMarker);
}
} }
void NFMDemod::networkManagerFinished(QNetworkReply *reply) void NFMDemod::networkManagerFinished(QNetworkReply *reply)

1
plugins/channelrx/demodnfm/nfmdemodgui.cpp
View File

@ -75,6 +75,7 @@ bool NFMDemodGUI::handleMessage(const Message& message)
const NFMDemod::MsgConfigureNFMDemod& cfg = (NFMDemod::MsgConfigureNFMDemod&) message; const NFMDemod::MsgConfigureNFMDemod& cfg = (NFMDemod::MsgConfigureNFMDemod&) message;
m_settings = cfg.getSettings(); m_settings = cfg.getSettings();
blockApplySettings(true); blockApplySettings(true);
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings(); displaySettings();
blockApplySettings(false); blockApplySettings(false);
return true; return true;

25
plugins/channelrx/demodpacket/packetdemod.cpp
View File

@ -37,6 +37,7 @@
#include "dsp/dspcommands.h" #include "dsp/dspcommands.h"
#include "device/deviceapi.h" #include "device/deviceapi.h"
#include "feature/feature.h" #include "feature/feature.h"
#include "settings/serializable.h"
#include "util/ax25.h" #include "util/ax25.h"
#include "util/db.h" #include "util/db.h"
#include "maincore.h" #include "maincore.h"
@ -463,6 +464,9 @@ void PacketDemod::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
settings.m_reverseAPIChannelIndex = response.getPacketDemodSettings()->getReverseApiChannelIndex(); settings.m_reverseAPIChannelIndex = response.getPacketDemodSettings()->getReverseApiChannelIndex();
} }
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getPacketDemodSettings()->getChannelMarker());
}
} }
void PacketDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const PacketDemodSettings& settings) void PacketDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const PacketDemodSettings& settings)
@ -496,6 +500,20 @@ void PacketDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& r
response.getPacketDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort); response.getPacketDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getPacketDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); response.getPacketDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
response.getPacketDemodSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex); response.getPacketDemodSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
if (settings.m_channelMarker)
{
if (response.getPacketDemodSettings()->getChannelMarker())
{
settings.m_channelMarker->formatTo(response.getPacketDemodSettings()->getChannelMarker());
}
else
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
response.getPacketDemodSettings()->setChannelMarker(swgChannelMarker);
}
}
} }
void PacketDemod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response) void PacketDemod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@ -585,6 +603,13 @@ void PacketDemod::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex") || force) { if (channelSettingsKeys.contains("streamIndex") || force) {
swgPacketDemodSettings->setStreamIndex(settings.m_streamIndex); swgPacketDemodSettings->setStreamIndex(settings.m_streamIndex);
} }
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
swgPacketDemodSettings->setChannelMarker(swgChannelMarker);
}
} }
void PacketDemod::networkManagerFinished(QNetworkReply *reply) void PacketDemod::networkManagerFinished(QNetworkReply *reply)

1
plugins/channelrx/demodpacket/packetdemodgui.cpp
View File

@ -203,6 +203,7 @@ bool PacketDemodGUI::handleMessage(const Message& message)
const PacketDemod::MsgConfigurePacketDemod& cfg = (PacketDemod::MsgConfigurePacketDemod&) message; const PacketDemod::MsgConfigurePacketDemod& cfg = (PacketDemod::MsgConfigurePacketDemod&) message;
m_settings = cfg.getSettings(); m_settings = cfg.getSettings();
blockApplySettings(true); blockApplySettings(true);
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings(); displaySettings();
blockApplySettings(false); blockApplySettings(false);
return true; return true;

49
plugins/channelrx/demodpager/pagerdemod.cpp
View File

@ -446,6 +446,12 @@ void PagerDemod::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
settings.m_reverseAPIChannelIndex = response.getPagerDemodSettings()->getReverseApiChannelIndex(); settings.m_reverseAPIChannelIndex = response.getPagerDemodSettings()->getReverseApiChannelIndex();
} }
if (settings.m_scopeGUI && channelSettingsKeys.contains("scopeConfig")) {
settings.m_scopeGUI->updateFrom(channelSettingsKeys, response.getPagerDemodSettings()->getScopeConfig());
}
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getPagerDemodSettings()->getChannelMarker());
}
} }
void PagerDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const PagerDemodSettings& settings) void PagerDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const PagerDemodSettings& settings)
@ -481,6 +487,35 @@ void PagerDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& re
response.getPagerDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort); response.getPagerDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getPagerDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); response.getPagerDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
response.getPagerDemodSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex); response.getPagerDemodSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
if (settings.m_scopeGUI)
{
if (response.getPagerDemodSettings()->getScopeConfig())
{
settings.m_scopeGUI->formatTo(response.getPagerDemodSettings()->getScopeConfig());
}
else
{
SWGSDRangel::SWGGLScope *swgGLScope = new SWGSDRangel::SWGGLScope();
settings.m_scopeGUI->formatTo(swgGLScope);
response.getPagerDemodSettings()->setScopeConfig(swgGLScope);
}
}
if (settings.m_channelMarker)
{
if (response.getPagerDemodSettings()->getChannelMarker())
{
settings.m_channelMarker->formatTo(response.getPagerDemodSettings()->getChannelMarker());
}
else
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
response.getPagerDemodSettings()->setChannelMarker(swgChannelMarker);
}
}
} }
void PagerDemod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response) void PagerDemod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@ -576,6 +611,20 @@ void PagerDemod::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex") || force) { if (channelSettingsKeys.contains("streamIndex") || force) {
swgPagerDemodSettings->setStreamIndex(settings.m_streamIndex); swgPagerDemodSettings->setStreamIndex(settings.m_streamIndex);
} }
if (settings.m_scopeGUI && (channelSettingsKeys.contains("scopeConfig") || force))
{
SWGSDRangel::SWGGLScope *swgGLScope = new SWGSDRangel::SWGGLScope();
settings.m_scopeGUI->formatTo(swgGLScope);
swgPagerDemodSettings->setScopeConfig(swgGLScope);
}
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
swgPagerDemodSettings->setChannelMarker(swgChannelMarker);
}
} }
void PagerDemod::networkManagerFinished(QNetworkReply *reply) void PagerDemod::networkManagerFinished(QNetworkReply *reply)

2
plugins/channelrx/demodpager/pagerdemodgui.cpp
View File

@ -256,6 +256,8 @@ bool PagerDemodGUI::handleMessage(const Message& message)
const PagerDemod::MsgConfigurePagerDemod& cfg = (PagerDemod::MsgConfigurePagerDemod&) message; const PagerDemod::MsgConfigurePagerDemod& cfg = (PagerDemod::MsgConfigurePagerDemod&) message;
m_settings = cfg.getSettings(); m_settings = cfg.getSettings();
blockApplySettings(true); blockApplySettings(true);
ui->scopeGUI->updateSettings();
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings(); displaySettings();
blockApplySettings(false); blockApplySettings(false);
return true; return true;

25
plugins/channelrx/demodssb/ssbdemod.cpp
View File

@ -420,6 +420,9 @@ void SSBDemod::webapiUpdateChannelSettings(
if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) { if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) {
settings.m_spectrumGUI->updateFrom(channelSettingsKeys, response.getSsbDemodSettings()->getSpectrumConfig()); settings.m_spectrumGUI->updateFrom(channelSettingsKeys, response.getSsbDemodSettings()->getSpectrumConfig());
} }
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getSsbDemodSettings()->getChannelMarker());
}
} }
int SSBDemod::webapiReportGet( int SSBDemod::webapiReportGet(
@ -490,6 +493,20 @@ void SSBDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& resp
response.getSsbDemodSettings()->setSpectrumConfig(swgGLSpectrum); response.getSsbDemodSettings()->setSpectrumConfig(swgGLSpectrum);
} }
} }
if (settings.m_channelMarker)
{
if (response.getSsbDemodSettings()->getChannelMarker())
{
settings.m_channelMarker->formatTo(response.getSsbDemodSettings()->getChannelMarker());
}
else
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
response.getSsbDemodSettings()->setChannelMarker(swgChannelMarker);
}
}
} }
void SSBDemod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response) void SSBDemod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@ -621,12 +638,20 @@ void SSBDemod::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex") || force) { if (channelSettingsKeys.contains("streamIndex") || force) {
swgSSBDemodSettings->setStreamIndex(settings.m_streamIndex); swgSSBDemodSettings->setStreamIndex(settings.m_streamIndex);
} }
if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force)) if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force))
{ {
SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum(); SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum();
settings.m_spectrumGUI->formatTo(swgGLSpectrum); settings.m_spectrumGUI->formatTo(swgGLSpectrum);
swgSSBDemodSettings->setSpectrumConfig(swgGLSpectrum); swgSSBDemodSettings->setSpectrumConfig(swgGLSpectrum);
} }
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
swgSSBDemodSettings->setChannelMarker(swgChannelMarker);
}
} }
void SSBDemod::networkManagerFinished(QNetworkReply *reply) void SSBDemod::networkManagerFinished(QNetworkReply *reply)

1
plugins/channelrx/demodssb/ssbdemodgui.cpp
View File

@ -70,6 +70,7 @@ bool SSBDemodGUI::handleMessage(const Message& message)
m_settings = cfg.getSettings(); m_settings = cfg.getSettings();
blockApplySettings(true); blockApplySettings(true);
ui->spectrumGUI->updateSettings(); ui->spectrumGUI->updateSettings();
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings(); displaySettings();
blockApplySettings(false); blockApplySettings(false);
return true; return true;

25
plugins/channelrx/filesink/filesink.cpp
View File

@ -497,6 +497,9 @@ void FileSink::webapiUpdateChannelSettings(
if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) { if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) {
settings.m_spectrumGUI->updateFrom(channelSettingsKeys, response.getFileSinkSettings()->getSpectrumConfig()); settings.m_spectrumGUI->updateFrom(channelSettingsKeys, response.getFileSinkSettings()->getSpectrumConfig());
} }
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getFileSinkSettings()->getChannelMarker());
}
} }
void FileSink::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const FileSinkSettings& settings) void FileSink::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const FileSinkSettings& settings)
@ -549,6 +552,20 @@ void FileSink::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& resp
response.getFileSinkSettings()->setSpectrumConfig(swgGLSpectrum); response.getFileSinkSettings()->setSpectrumConfig(swgGLSpectrum);
} }
} }
if (settings.m_channelMarker)
{
if (response.getFileSinkSettings()->getChannelMarker())
{
settings.m_channelMarker->formatTo(response.getFileSinkSettings()->getChannelMarker());
}
else
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
response.getFileSinkSettings()->setChannelMarker(swgChannelMarker);
}
}
} }
void FileSink::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response) void FileSink::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@ -659,12 +676,20 @@ void FileSink::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex")) { if (channelSettingsKeys.contains("streamIndex")) {
swgFileSinkSettings->setStreamIndex(settings.m_streamIndex); swgFileSinkSettings->setStreamIndex(settings.m_streamIndex);
} }
if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force)) if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force))
{ {
SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum(); SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum();
settings.m_spectrumGUI->formatTo(swgGLSpectrum); settings.m_spectrumGUI->formatTo(swgGLSpectrum);
swgFileSinkSettings->setSpectrumConfig(swgGLSpectrum); swgFileSinkSettings->setSpectrumConfig(swgGLSpectrum);
} }
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
swgFileSinkSettings->setChannelMarker(swgChannelMarker);
}
} }
void FileSink::networkManagerFinished(QNetworkReply *reply) void FileSink::networkManagerFinished(QNetworkReply *reply)

2
plugins/channelrx/filesink/filesinkgui.cpp
View File

@ -97,6 +97,7 @@ bool FileSinkGUI::handleMessage(const Message& message)
m_settings = cfg.getSettings(); m_settings = cfg.getSettings();
blockApplySettings(true); blockApplySettings(true);
ui->glSpectrumGUI->updateSettings(); ui->glSpectrumGUI->updateSettings();
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings(); displaySettings();
blockApplySettings(false); blockApplySettings(false);
return true; return true;
@ -208,6 +209,7 @@ FileSinkGUI::FileSinkGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
m_channelMarker.blockSignals(false); m_channelMarker.blockSignals(false);
m_channelMarker.setVisible(true); // activate signal on the last setting only m_channelMarker.setVisible(true); // activate signal on the last setting only
m_settings.setChannelMarker(&m_channelMarker);
m_settings.setSpectrumGUI(ui->glSpectrumGUI); m_settings.setSpectrumGUI(ui->glSpectrumGUI);
m_deviceUISet->addChannelMarker(&m_channelMarker); m_deviceUISet->addChannelMarker(&m_channelMarker);

2
plugins/channelrx/filesink/filesinksettings.h
View File

@ -43,11 +43,13 @@ struct FileSinkSettings
uint16_t m_reverseAPIChannelIndex; uint16_t m_reverseAPIChannelIndex;
Serializable *m_spectrumGUI; Serializable *m_spectrumGUI;
Serializable *m_channelMarker;
QByteArray m_rollupState; QByteArray m_rollupState;
FileSinkSettings(); FileSinkSettings();
void resetToDefaults(); void resetToDefaults();
void setSpectrumGUI(Serializable *spectrumGUI) { m_spectrumGUI = spectrumGUI; } void setSpectrumGUI(Serializable *spectrumGUI) { m_spectrumGUI = spectrumGUI; }
void setChannelMarker(Serializable *channelMarker) { m_channelMarker = channelMarker; }
QByteArray serialize() const; QByteArray serialize() const;
bool deserialize(const QByteArray& data); bool deserialize(const QByteArray& data);

25
plugins/channelrx/freqtracker/freqtracker.cpp
View File

@ -402,6 +402,9 @@ void FreqTracker::webapiUpdateChannelSettings(
if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) { if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) {
settings.m_spectrumGUI->updateFrom(channelSettingsKeys, response.getFreqTrackerSettings()->getSpectrumConfig()); settings.m_spectrumGUI->updateFrom(channelSettingsKeys, response.getFreqTrackerSettings()->getSpectrumConfig());
} }
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getFreqTrackerSettings()->getChannelMarker());
}
} }
int FreqTracker::webapiReportGet( int FreqTracker::webapiReportGet(
@ -463,6 +466,20 @@ void FreqTracker::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& r
response.getFreqTrackerSettings()->setSpectrumConfig(swgGLSpectrum); response.getFreqTrackerSettings()->setSpectrumConfig(swgGLSpectrum);
} }
} }
if (settings.m_channelMarker)
{
if (response.getFreqTrackerSettings()->getChannelMarker())
{
settings.m_channelMarker->formatTo(response.getFreqTrackerSettings()->getChannelMarker());
}
else
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
response.getFreqTrackerSettings()->setChannelMarker(swgChannelMarker);
}
}
} }
void FreqTracker::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response) void FreqTracker::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@ -585,12 +602,20 @@ void FreqTracker::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex") || force) { if (channelSettingsKeys.contains("streamIndex") || force) {
swgFreqTrackerSettings->setStreamIndex(settings.m_streamIndex); swgFreqTrackerSettings->setStreamIndex(settings.m_streamIndex);
} }
if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force)) if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force))
{ {
SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum(); SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum();
settings.m_spectrumGUI->formatTo(swgGLSpectrum); settings.m_spectrumGUI->formatTo(swgGLSpectrum);
swgFreqTrackerSettings->setSpectrumConfig(swgGLSpectrum); swgFreqTrackerSettings->setSpectrumConfig(swgGLSpectrum);
} }
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
swgFreqTrackerSettings->setChannelMarker(swgChannelMarker);
}
} }
void FreqTracker::networkManagerFinished(QNetworkReply *reply) void FreqTracker::networkManagerFinished(QNetworkReply *reply)

1
plugins/channelrx/freqtracker/freqtrackergui.cpp
View File

@ -82,6 +82,7 @@ bool FreqTrackerGUI::handleMessage(const Message& message)
m_settings = cfg.getSettings(); m_settings = cfg.getSettings();
blockApplySettings(true); blockApplySettings(true);
ui->spectrumGUI->updateSettings(); ui->spectrumGUI->updateSettings();
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings(); displaySettings();
blockApplySettings(false); blockApplySettings(false);
return true; return true;

25
plugins/channelrx/localsink/localsink.cpp
View File

@ -34,6 +34,7 @@
#include "dsp/devicesamplemimo.h" #include "dsp/devicesamplemimo.h"
#include "device/deviceapi.h" #include "device/deviceapi.h"
#include "feature/feature.h" #include "feature/feature.h"
#include "settings/serializable.h"
#include "maincore.h" #include "maincore.h"
#include "localsinkbaseband.h" #include "localsinkbaseband.h"
@ -411,6 +412,9 @@ void LocalSink::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
settings.m_reverseAPIChannelIndex = response.getLocalSinkSettings()->getReverseApiChannelIndex(); settings.m_reverseAPIChannelIndex = response.getLocalSinkSettings()->getReverseApiChannelIndex();
} }
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getLocalSinkSettings()->getChannelMarker());
}
} }
void LocalSink::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const LocalSinkSettings& settings) void LocalSink::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const LocalSinkSettings& settings)
@ -439,6 +443,20 @@ void LocalSink::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& res
response.getLocalSinkSettings()->setReverseApiPort(settings.m_reverseAPIPort); response.getLocalSinkSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getLocalSinkSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); response.getLocalSinkSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
response.getLocalSinkSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex); response.getLocalSinkSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
if (settings.m_channelMarker)
{
if (response.getLocalSinkSettings()->getChannelMarker())
{
settings.m_channelMarker->formatTo(response.getLocalSinkSettings()->getChannelMarker());
}
else
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
response.getLocalSinkSettings()->setChannelMarker(swgChannelMarker);
}
}
} }
void LocalSink::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const LocalSinkSettings& settings, bool force) void LocalSink::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const LocalSinkSettings& settings, bool force)
@ -525,6 +543,13 @@ void LocalSink::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex") || force) { if (channelSettingsKeys.contains("streamIndex") || force) {
swgLocalSinkSettings->setStreamIndex(settings.m_streamIndex); swgLocalSinkSettings->setStreamIndex(settings.m_streamIndex);
} }
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
swgLocalSinkSettings->setChannelMarker(swgChannelMarker);
}
} }
void LocalSink::networkManagerFinished(QNetworkReply *reply) void LocalSink::networkManagerFinished(QNetworkReply *reply)

1
plugins/channelrx/localsink/localsinkgui.cpp
View File

@ -82,6 +82,7 @@ bool LocalSinkGUI::handleMessage(const Message& message)
const LocalSink::MsgConfigureLocalSink& cfg = (LocalSink::MsgConfigureLocalSink&) message; const LocalSink::MsgConfigureLocalSink& cfg = (LocalSink::MsgConfigureLocalSink&) message;
m_settings = cfg.getSettings(); m_settings = cfg.getSettings();
blockApplySettings(true); blockApplySettings(true);
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings(); displaySettings();
blockApplySettings(false); blockApplySettings(false);
return true; return true;

24
plugins/channelrx/noisefigure/noisefigure.cpp
View File

@ -643,6 +643,9 @@ void NoiseFigure::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
settings.m_reverseAPIChannelIndex = response.getNoiseFigureSettings()->getReverseApiChannelIndex(); settings.m_reverseAPIChannelIndex = response.getNoiseFigureSettings()->getReverseApiChannelIndex();
} }
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getNoiseFigureSettings()->getChannelMarker());
}
} }
void NoiseFigure::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const NoiseFigureSettings& settings) void NoiseFigure::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const NoiseFigureSettings& settings)
@ -668,6 +671,20 @@ void NoiseFigure::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& r
response.getNoiseFigureSettings()->setReverseApiPort(settings.m_reverseAPIPort); response.getNoiseFigureSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getNoiseFigureSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); response.getNoiseFigureSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
response.getNoiseFigureSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex); response.getNoiseFigureSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
if (settings.m_channelMarker)
{
if (response.getNoiseFigureSettings()->getChannelMarker())
{
settings.m_channelMarker->formatTo(response.getNoiseFigureSettings()->getChannelMarker());
}
else
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
response.getNoiseFigureSettings()->setChannelMarker(swgChannelMarker);
}
}
} }
void NoiseFigure::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const NoiseFigureSettings& settings, bool force) void NoiseFigure::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const NoiseFigureSettings& settings, bool force)
@ -768,6 +785,13 @@ void NoiseFigure::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex") || force) { if (channelSettingsKeys.contains("streamIndex") || force) {
swgNoiseFigureSettings->setStreamIndex(settings.m_streamIndex); swgNoiseFigureSettings->setStreamIndex(settings.m_streamIndex);
} }
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
swgNoiseFigureSettings->setChannelMarker(swgChannelMarker);
}
} }
void NoiseFigure::networkManagerFinished(QNetworkReply *reply) void NoiseFigure::networkManagerFinished(QNetworkReply *reply)

1
plugins/channelrx/noisefigure/noisefiguregui.cpp
View File

@ -280,6 +280,7 @@ bool NoiseFigureGUI::handleMessage(const Message& message)
const NoiseFigure::MsgConfigureNoiseFigure& cfg = (NoiseFigure::MsgConfigureNoiseFigure&) message; const NoiseFigure::MsgConfigureNoiseFigure& cfg = (NoiseFigure::MsgConfigureNoiseFigure&) message;
m_settings = cfg.getSettings(); m_settings = cfg.getSettings();
blockApplySettings(true); blockApplySettings(true);
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings(); displaySettings();
blockApplySettings(false); blockApplySettings(false);
return true; return true;

24
plugins/channelrx/radioastronomy/radioastronomy.cpp
View File

@ -908,6 +908,9 @@ void RadioAstronomy::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
settings.m_reverseAPIChannelIndex = response.getRadioAstronomySettings()->getReverseApiChannelIndex(); settings.m_reverseAPIChannelIndex = response.getRadioAstronomySettings()->getReverseApiChannelIndex();
} }
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getRadioAstronomySettings()->getChannelMarker());
}
} }
void RadioAstronomy::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const RadioAstronomySettings& settings) void RadioAstronomy::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const RadioAstronomySettings& settings)
@ -955,6 +958,20 @@ void RadioAstronomy::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings
response.getRadioAstronomySettings()->setReverseApiPort(settings.m_reverseAPIPort); response.getRadioAstronomySettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getRadioAstronomySettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); response.getRadioAstronomySettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
response.getRadioAstronomySettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex); response.getRadioAstronomySettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
if (settings.m_channelMarker)
{
if (response.getRadioAstronomySettings()->getChannelMarker())
{
settings.m_channelMarker->formatTo(response.getRadioAstronomySettings()->getChannelMarker());
}
else
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
response.getRadioAstronomySettings()->setChannelMarker(swgChannelMarker);
}
}
} }
void RadioAstronomy::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const RadioAstronomySettings& settings, bool force) void RadioAstronomy::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const RadioAstronomySettings& settings, bool force)
@ -1073,6 +1090,13 @@ void RadioAstronomy::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex") || force) { if (channelSettingsKeys.contains("streamIndex") || force) {
swgRadioAstronomySettings->setStreamIndex(settings.m_streamIndex); swgRadioAstronomySettings->setStreamIndex(settings.m_streamIndex);
} }
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
swgRadioAstronomySettings->setChannelMarker(swgChannelMarker);
}
} }
void RadioAstronomy::networkManagerFinished(QNetworkReply *reply) void RadioAstronomy::networkManagerFinished(QNetworkReply *reply)

1
plugins/channelrx/radioastronomy/radioastronomygui.cpp
View File

@ -1022,6 +1022,7 @@ bool RadioAstronomyGUI::handleMessage(const Message& message)
const RadioAstronomy::MsgConfigureRadioAstronomy& cfg = (RadioAstronomy::MsgConfigureRadioAstronomy&) message; const RadioAstronomy::MsgConfigureRadioAstronomy& cfg = (RadioAstronomy::MsgConfigureRadioAstronomy&) message;
m_settings = cfg.getSettings(); m_settings = cfg.getSettings();
blockApplySettings(true); blockApplySettings(true);
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings(); displaySettings();
blockApplySettings(false); blockApplySettings(false);
return true; return true;

48
plugins/channelrx/radioclock/radioclock.cpp
View File

@ -333,6 +333,12 @@ void RadioClock::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
settings.m_reverseAPIChannelIndex = response.getRadioClockSettings()->getReverseApiChannelIndex(); settings.m_reverseAPIChannelIndex = response.getRadioClockSettings()->getReverseApiChannelIndex();
} }
if (settings.m_scopeGUI && channelSettingsKeys.contains("scopeConfig")) {
settings.m_scopeGUI->updateFrom(channelSettingsKeys, response.getRadioClockSettings()->getScopeConfig());
}
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getRadioClockSettings()->getChannelMarker());
}
} }
void RadioClock::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const RadioClockSettings& settings) void RadioClock::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const RadioClockSettings& settings)
@ -362,6 +368,34 @@ void RadioClock::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& re
response.getRadioClockSettings()->setReverseApiPort(settings.m_reverseAPIPort); response.getRadioClockSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getRadioClockSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); response.getRadioClockSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
response.getRadioClockSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex); response.getRadioClockSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
if (settings.m_scopeGUI)
{
if (response.getRadioClockSettings()->getScopeConfig())
{
settings.m_scopeGUI->formatTo(response.getRadioClockSettings()->getScopeConfig());
}
else
{
SWGSDRangel::SWGGLScope *swgGLScope = new SWGSDRangel::SWGGLScope();
settings.m_scopeGUI->formatTo(swgGLScope);
response.getRadioClockSettings()->setScopeConfig(swgGLScope);
}
}
if (settings.m_channelMarker)
{
if (response.getRadioClockSettings()->getChannelMarker())
{
settings.m_channelMarker->formatTo(response.getRadioClockSettings()->getChannelMarker());
}
else
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
response.getRadioClockSettings()->setChannelMarker(swgChannelMarker);
}
}
} }
void RadioClock::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response) void RadioClock::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@ -452,6 +486,20 @@ void RadioClock::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex") || force) { if (channelSettingsKeys.contains("streamIndex") || force) {
swgRadioClockSettings->setStreamIndex(settings.m_streamIndex); swgRadioClockSettings->setStreamIndex(settings.m_streamIndex);
} }
if (settings.m_scopeGUI && (channelSettingsKeys.contains("scopeConfig") || force))
{
SWGSDRangel::SWGGLScope *swgGLScope = new SWGSDRangel::SWGGLScope();
settings.m_scopeGUI->formatTo(swgGLScope);
swgRadioClockSettings->setScopeConfig(swgGLScope);
}
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
swgRadioClockSettings->setChannelMarker(swgChannelMarker);
}
} }
void RadioClock::networkManagerFinished(QNetworkReply *reply) void RadioClock::networkManagerFinished(QNetworkReply *reply)

2
plugins/channelrx/radioclock/radioclockgui.cpp
View File

@ -95,6 +95,8 @@ bool RadioClockGUI::handleMessage(const Message& message)
const RadioClock::MsgConfigureRadioClock& cfg = (RadioClock::MsgConfigureRadioClock&) message; const RadioClock::MsgConfigureRadioClock& cfg = (RadioClock::MsgConfigureRadioClock&) message;
m_settings = cfg.getSettings(); m_settings = cfg.getSettings();
blockApplySettings(true); blockApplySettings(true);
ui->scopeGUI->updateSettings();
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings(); displaySettings();
blockApplySettings(false); blockApplySettings(false);
return true; return true;

25
plugins/channelrx/remotesink/remotesink.cpp
View File

@ -37,6 +37,7 @@
#include "dsp/dspdevicesourceengine.h" #include "dsp/dspdevicesourceengine.h"
#include "device/deviceapi.h" #include "device/deviceapi.h"
#include "feature/feature.h" #include "feature/feature.h"
#include "settings/serializable.h"
#include "maincore.h" #include "maincore.h"
#include "remotesinkbaseband.h" #include "remotesinkbaseband.h"
@ -382,6 +383,9 @@ void RemoteSink::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
settings.m_reverseAPIChannelIndex = response.getRemoteSinkSettings()->getReverseApiChannelIndex(); settings.m_reverseAPIChannelIndex = response.getRemoteSinkSettings()->getReverseApiChannelIndex();
} }
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getRemoteSinkSettings()->getChannelMarker());
}
} }
void RemoteSink::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const RemoteSinkSettings& settings) void RemoteSink::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const RemoteSinkSettings& settings)
@ -418,6 +422,20 @@ void RemoteSink::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& re
response.getRemoteSinkSettings()->setReverseApiPort(settings.m_reverseAPIPort); response.getRemoteSinkSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getRemoteSinkSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); response.getRemoteSinkSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
response.getRemoteSinkSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex); response.getRemoteSinkSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
if (settings.m_channelMarker)
{
if (response.getRemoteSinkSettings()->getChannelMarker())
{
settings.m_channelMarker->formatTo(response.getRemoteSinkSettings()->getChannelMarker());
}
else
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
response.getRemoteSinkSettings()->setChannelMarker(swgChannelMarker);
}
}
} }
void RemoteSink::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const RemoteSinkSettings& settings, bool force) void RemoteSink::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const RemoteSinkSettings& settings, bool force)
@ -511,6 +529,13 @@ void RemoteSink::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex") || force) { if (channelSettingsKeys.contains("streamIndex") || force) {
swgRemoteSinkSettings->setStreamIndex(settings.m_streamIndex); swgRemoteSinkSettings->setStreamIndex(settings.m_streamIndex);
} }
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
swgRemoteSinkSettings->setChannelMarker(swgChannelMarker);
}
} }
void RemoteSink::networkManagerFinished(QNetworkReply *reply) void RemoteSink::networkManagerFinished(QNetworkReply *reply)

1
plugins/channelrx/remotesink/remotesinkgui.cpp
View File

@ -70,6 +70,7 @@ bool RemoteSinkGUI::handleMessage(const Message& message)
const RemoteSink::MsgConfigureRemoteSink& cfg = (RemoteSink::MsgConfigureRemoteSink&) message; const RemoteSink::MsgConfigureRemoteSink& cfg = (RemoteSink::MsgConfigureRemoteSink&) message;
m_settings = cfg.getSettings(); m_settings = cfg.getSettings();
blockApplySettings(true); blockApplySettings(true);
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings(); displaySettings();
blockApplySettings(false); blockApplySettings(false);

25
plugins/channelrx/sigmffilesink/sigmffilesink.cpp
View File

@ -497,6 +497,9 @@ void SigMFFileSink::webapiUpdateChannelSettings(
if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) { if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) {
settings.m_spectrumGUI->updateFrom(channelSettingsKeys, response.getSigMfFileSinkSettings()->getSpectrumConfig()); settings.m_spectrumGUI->updateFrom(channelSettingsKeys, response.getSigMfFileSinkSettings()->getSpectrumConfig());
} }
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getSigMfFileSinkSettings()->getChannelMarker());
}
} }
void SigMFFileSink::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const SigMFFileSinkSettings& settings) void SigMFFileSink::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const SigMFFileSinkSettings& settings)
@ -549,6 +552,20 @@ void SigMFFileSink::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings&
response.getSigMfFileSinkSettings()->setSpectrumConfig(swgGLSpectrum); response.getSigMfFileSinkSettings()->setSpectrumConfig(swgGLSpectrum);
} }
} }
if (settings.m_channelMarker)
{
if (response.getSigMfFileSinkSettings()->getChannelMarker())
{
settings.m_channelMarker->formatTo(response.getSigMfFileSinkSettings()->getChannelMarker());
}
else
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
response.getSigMfFileSinkSettings()->setChannelMarker(swgChannelMarker);
}
}
} }
void SigMFFileSink::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response) void SigMFFileSink::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@ -659,12 +676,20 @@ void SigMFFileSink::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex")) { if (channelSettingsKeys.contains("streamIndex")) {
swgSigMFFileSinkSettings->setStreamIndex(settings.m_streamIndex); swgSigMFFileSinkSettings->setStreamIndex(settings.m_streamIndex);
} }
if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force)) if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force))
{ {
SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum(); SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum();
settings.m_spectrumGUI->formatTo(swgGLSpectrum); settings.m_spectrumGUI->formatTo(swgGLSpectrum);
swgSigMFFileSinkSettings->setSpectrumConfig(swgGLSpectrum); swgSigMFFileSinkSettings->setSpectrumConfig(swgGLSpectrum);
} }
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
swgSigMFFileSinkSettings->setChannelMarker(swgChannelMarker);
}
} }
void SigMFFileSink::networkManagerFinished(QNetworkReply *reply) void SigMFFileSink::networkManagerFinished(QNetworkReply *reply)

2
plugins/channelrx/sigmffilesink/sigmffilesinkgui.cpp
View File

@ -96,6 +96,7 @@ bool SigMFFileSinkGUI::handleMessage(const Message& message)
m_settings = cfg.getSettings(); m_settings = cfg.getSettings();
blockApplySettings(true); blockApplySettings(true);
ui->glSpectrumGUI->updateSettings(); ui->glSpectrumGUI->updateSettings();
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings(); displaySettings();
blockApplySettings(false); blockApplySettings(false);
return true; return true;
@ -196,6 +197,7 @@ SigMFFileSinkGUI::SigMFFileSinkGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISe
m_channelMarker.setVisible(true); // activate signal on the last setting only m_channelMarker.setVisible(true); // activate signal on the last setting only
m_settings.setSpectrumGUI(ui->glSpectrumGUI); m_settings.setSpectrumGUI(ui->glSpectrumGUI);
m_settings.setChannelMarker(&m_channelMarker);
m_deviceUISet->addChannelMarker(&m_channelMarker); m_deviceUISet->addChannelMarker(&m_channelMarker);
m_deviceUISet->addRollupWidget(this); m_deviceUISet->addRollupWidget(this);

2
plugins/channelrx/sigmffilesink/sigmffilesinksettings.h
View File

@ -44,11 +44,13 @@ struct SigMFFileSinkSettings
uint16_t m_reverseAPIChannelIndex; uint16_t m_reverseAPIChannelIndex;
Serializable *m_spectrumGUI; Serializable *m_spectrumGUI;
Serializable *m_channelMarker;
QByteArray m_rollupState; QByteArray m_rollupState;
SigMFFileSinkSettings(); SigMFFileSinkSettings();
void resetToDefaults(); void resetToDefaults();
void setSpectrumGUI(Serializable *spectrumGUI) { m_spectrumGUI = spectrumGUI; } void setSpectrumGUI(Serializable *spectrumGUI) { m_spectrumGUI = spectrumGUI; }
void setChannelMarker(Serializable *channelMarker) { m_channelMarker = channelMarker; }
QByteArray serialize() const; QByteArray serialize() const;
bool deserialize(const QByteArray& data); bool deserialize(const QByteArray& data);

25
plugins/channelrx/udpsink/udpsink.cpp
View File

@ -388,6 +388,9 @@ void UDPSink::webapiUpdateChannelSettings(
if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) { if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) {
settings.m_spectrumGUI->updateFrom(channelSettingsKeys, response.getUdpSinkSettings()->getSpectrumConfig()); settings.m_spectrumGUI->updateFrom(channelSettingsKeys, response.getUdpSinkSettings()->getSpectrumConfig());
} }
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getUdpSinkSettings()->getChannelMarker());
}
} }
int UDPSink::webapiReportGet( int UDPSink::webapiReportGet(
@ -460,6 +463,20 @@ void UDPSink::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respo
response.getUdpSinkSettings()->setSpectrumConfig(swgGLSpectrum); response.getUdpSinkSettings()->setSpectrumConfig(swgGLSpectrum);
} }
} }
if (settings.m_channelMarker)
{
if (response.getUdpSinkSettings()->getChannelMarker())
{
settings.m_channelMarker->formatTo(response.getUdpSinkSettings()->getChannelMarker());
}
else
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
response.getUdpSinkSettings()->setChannelMarker(swgChannelMarker);
}
}
} }
void UDPSink::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response) void UDPSink::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
@ -593,12 +610,20 @@ void UDPSink::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex") || force) { if (channelSettingsKeys.contains("streamIndex") || force) {
swgUDPSinkSettings->setStreamIndex(settings.m_streamIndex); swgUDPSinkSettings->setStreamIndex(settings.m_streamIndex);
} }
if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force)) if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force))
{ {
SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum(); SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum();
settings.m_spectrumGUI->formatTo(swgGLSpectrum); settings.m_spectrumGUI->formatTo(swgGLSpectrum);
swgUDPSinkSettings->setSpectrumConfig(swgGLSpectrum); swgUDPSinkSettings->setSpectrumConfig(swgGLSpectrum);
} }
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
swgUDPSinkSettings->setChannelMarker(swgChannelMarker);
}
} }
void UDPSink::networkManagerFinished(QNetworkReply *reply) void UDPSink::networkManagerFinished(QNetworkReply *reply)

1
plugins/channelrx/udpsink/udpsinkgui.cpp
View File

@ -76,6 +76,7 @@ bool UDPSinkGUI::handleMessage(const Message& message )
m_settings = cfg.getSettings(); m_settings = cfg.getSettings();
blockApplySettings(true); blockApplySettings(true);
ui->spectrumGUI->updateSettings(); ui->spectrumGUI->updateSettings();
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings(); displaySettings();
blockApplySettings(false); blockApplySettings(false);
return true; return true;

5
sdrbase/dsp/channelmarker.cpp
View File

@ -230,6 +230,11 @@ void ChannelMarker::updateFrom(const QStringList& keys, const SWGSDRangel::SWGOb
} }
} }
void ChannelMarker::updateSettings(const ChannelMarker *channelMarker)
{
m_fScaleDisplayType = channelMarker->m_fScaleDisplayType;
}
void ChannelMarker::addStreamIndex(int streamIndex) void ChannelMarker::addStreamIndex(int streamIndex)
{ {
m_enabledStreamsBits |= (1<<streamIndex); m_enabledStreamsBits |= (1<<streamIndex);

1
sdrbase/dsp/channelmarker.h
View File

@ -103,6 +103,7 @@ public:
virtual bool deserialize(const QByteArray& data); virtual bool deserialize(const QByteArray& data);
virtual void formatTo(SWGSDRangel::SWGObject *swgObject) const; virtual void formatTo(SWGSDRangel::SWGObject *swgObject) const;
virtual void updateFrom(const QStringList& keys, const SWGSDRangel::SWGObject *swgObject); virtual void updateFrom(const QStringList& keys, const SWGSDRangel::SWGObject *swgObject);
void updateSettings(const ChannelMarker *channelMarker);
protected: protected:
static QRgb m_colorTable[]; static QRgb m_colorTable[];

89
sdrbase/resources/webapi/doc/html2/index.html
View File

@ -808,6 +808,9 @@ margin-bottom: 20px;
}, },
"reverseAPIChannelIndex" : { "reverseAPIChannelIndex" : {
"type" : "integer" "type" : "integer"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
} }
}, },
"description" : "ADSBDemod" "description" : "ADSBDemod"
@ -987,6 +990,12 @@ margin-bottom: 20px;
}, },
"reverseAPIChannelIndex" : { "reverseAPIChannelIndex" : {
"type" : "integer" "type" : "integer"
},
"scopeConfig" : {
"$ref" : "#/definitions/GLScope"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
} }
}, },
"description" : "AISDemod" "description" : "AISDemod"
@ -1295,6 +1304,9 @@ margin-bottom: 20px;
}, },
"reverseAPIChannelIndex" : { "reverseAPIChannelIndex" : {
"type" : "integer" "type" : "integer"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
} }
}, },
"description" : "AMDemod" "description" : "AMDemod"
@ -1544,6 +1556,9 @@ margin-bottom: 20px;
}, },
"reverseAPIChannelIndex" : { "reverseAPIChannelIndex" : {
"type" : "integer" "type" : "integer"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
} }
}, },
"description" : "APTDemod" "description" : "APTDemod"
@ -2328,6 +2343,9 @@ margin-bottom: 20px;
}, },
"spectrumConfig" : { "spectrumConfig" : {
"$ref" : "#/definitions/GLSpectrum" "$ref" : "#/definitions/GLSpectrum"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
} }
}, },
"description" : "BFMDemod" "description" : "BFMDemod"
@ -3584,6 +3602,9 @@ margin-bottom: 20px;
}, },
"spectrumConfig" : { "spectrumConfig" : {
"$ref" : "#/definitions/GLSpectrum" "$ref" : "#/definitions/GLSpectrum"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
} }
}, },
"description" : "ChirpChatDemod" "description" : "ChirpChatDemod"
@ -3870,6 +3891,9 @@ margin-bottom: 20px;
}, },
"reverseAPIChannelIndex" : { "reverseAPIChannelIndex" : {
"type" : "integer" "type" : "integer"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
} }
}, },
"description" : "DABDemod" "description" : "DABDemod"
@ -4048,6 +4072,9 @@ margin-bottom: 20px;
}, },
"reverseAPIChannelIndex" : { "reverseAPIChannelIndex" : {
"type" : "integer" "type" : "integer"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
} }
}, },
"description" : "DATVDemod" "description" : "DATVDemod"
@ -4314,6 +4341,9 @@ margin-bottom: 20px;
}, },
"reverseAPIChannelIndex" : { "reverseAPIChannelIndex" : {
"type" : "integer" "type" : "integer"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
} }
}, },
"description" : "DSDDemod" "description" : "DSDDemod"
@ -5446,6 +5476,9 @@ margin-bottom: 20px;
}, },
"spectrumConfig" : { "spectrumConfig" : {
"$ref" : "#/definitions/GLSpectrum" "$ref" : "#/definitions/GLSpectrum"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
} }
}, },
"description" : "FileSink" "description" : "FileSink"
@ -5629,6 +5662,9 @@ margin-bottom: 20px;
}, },
"spectrumConfig" : { "spectrumConfig" : {
"$ref" : "#/definitions/GLSpectrum" "$ref" : "#/definitions/GLSpectrum"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
} }
}, },
"description" : "FreeDVDemod" "description" : "FreeDVDemod"
@ -5823,6 +5859,9 @@ margin-bottom: 20px;
}, },
"spectrumConfig" : { "spectrumConfig" : {
"$ref" : "#/definitions/GLSpectrum" "$ref" : "#/definitions/GLSpectrum"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
} }
}, },
"description" : "FreqTracker" "description" : "FreqTracker"
@ -7449,6 +7488,9 @@ margin-bottom: 20px;
}, },
"reverseAPIChannelIndex" : { "reverseAPIChannelIndex" : {
"type" : "integer" "type" : "integer"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
} }
}, },
"description" : "Local channel sink settings" "description" : "Local channel sink settings"
@ -7961,6 +8003,9 @@ margin-bottom: 20px;
}, },
"reverseAPIChannelIndex" : { "reverseAPIChannelIndex" : {
"type" : "integer" "type" : "integer"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
} }
}, },
"description" : "NFMDemod" "description" : "NFMDemod"
@ -8175,6 +8220,9 @@ margin-bottom: 20px;
}, },
"reverseAPIChannelIndex" : { "reverseAPIChannelIndex" : {
"type" : "integer" "type" : "integer"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
} }
}, },
"description" : "NoiseFigure" "description" : "NoiseFigure"
@ -8362,6 +8410,9 @@ margin-bottom: 20px;
}, },
"reverseAPIChannelIndex" : { "reverseAPIChannelIndex" : {
"type" : "integer" "type" : "integer"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
} }
}, },
"description" : "PacketDemod" "description" : "PacketDemod"
@ -8684,6 +8735,12 @@ margin-bottom: 20px;
}, },
"reverseAPIChannelIndex" : { "reverseAPIChannelIndex" : {
"type" : "integer" "type" : "integer"
},
"scopeConfig" : {
"$ref" : "#/definitions/GLScope"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
} }
}, },
"description" : "PagerDemod" "description" : "PagerDemod"
@ -9531,6 +9588,9 @@ margin-bottom: 20px;
}, },
"reverseAPIChannelIndex" : { "reverseAPIChannelIndex" : {
"type" : "integer" "type" : "integer"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
} }
}, },
"description" : "RadioAstronomy" "description" : "RadioAstronomy"
@ -9603,6 +9663,12 @@ margin-bottom: 20px;
}, },
"reverseAPIChannelIndex" : { "reverseAPIChannelIndex" : {
"type" : "integer" "type" : "integer"
},
"scopeConfig" : {
"$ref" : "#/definitions/GLScope"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
} }
}, },
"description" : "RadioClock" "description" : "RadioClock"
@ -9827,6 +9893,9 @@ margin-bottom: 20px;
}, },
"reverseAPIChannelIndex" : { "reverseAPIChannelIndex" : {
"type" : "integer" "type" : "integer"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
} }
}, },
"description" : "Remote channel sink settings" "description" : "Remote channel sink settings"
@ -10372,6 +10441,9 @@ margin-bottom: 20px;
}, },
"spectrumConfig" : { "spectrumConfig" : {
"$ref" : "#/definitions/GLSpectrum" "$ref" : "#/definitions/GLSpectrum"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
} }
}, },
"description" : "SSBDemod" "description" : "SSBDemod"
@ -11028,6 +11100,9 @@ margin-bottom: 20px;
}, },
"spectrumConfig" : { "spectrumConfig" : {
"$ref" : "#/definitions/GLSpectrum" "$ref" : "#/definitions/GLSpectrum"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
} }
}, },
"description" : "SigMFFileSink" "description" : "SigMFFileSink"
@ -12278,6 +12353,9 @@ margin-bottom: 20px;
}, },
"spectrumConfig" : { "spectrumConfig" : {
"$ref" : "#/definitions/GLSpectrum" "$ref" : "#/definitions/GLSpectrum"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
} }
}, },
"description" : "UDPSink" "description" : "UDPSink"
@ -12685,6 +12763,9 @@ margin-bottom: 20px;
"identThreshold" : { "identThreshold" : {
"type" : "integer", "type" : "integer",
"description" : "Morse code ident threshold (linear SNR)" "description" : "Morse code ident threshold (linear SNR)"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
} }
}, },
"description" : "VORDemodSC" "description" : "VORDemodSC"
@ -12739,6 +12820,9 @@ margin-bottom: 20px;
"magDecAdjust" : { "magDecAdjust" : {
"type" : "integer", "type" : "integer",
"description" : "Adjust radial lines on map for magnetic declination of VOR" "description" : "Adjust radial lines on map for magnetic declination of VOR"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
} }
}, },
"description" : "VORDemod" "description" : "VORDemod"
@ -12878,6 +12962,9 @@ margin-bottom: 20px;
}, },
"reverseAPIChannelIndex" : { "reverseAPIChannelIndex" : {
"type" : "integer" "type" : "integer"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
} }
}, },
"description" : "WFMDemod" "description" : "WFMDemod"
@ -51467,7 +51554,7 @@ except ApiException as e:
</div> </div>
<div id="generator"> <div id="generator">
<div class="content"> <div class="content">
Generated 2021-12-01T01:10:25.279+01:00 Generated 2021-12-02T23:38:15.455+01:00
</div> </div>
</div> </div>
</div> </div>

2
sdrbase/resources/webapi/doc/swagger/include/ADSBDemod.yaml
View File

@ -73,6 +73,8 @@ ADSBDemodSettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
channelMarker:
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
ADSBDemodReport: ADSBDemodReport:
description: ADSBDemod description: ADSBDemod

4
sdrbase/resources/webapi/doc/swagger/include/AISDemod.yaml
View File

@ -50,6 +50,10 @@ AISDemodSettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
scopeConfig:
$ref: "/doc/swagger/include/GLScope.yaml#/GLScope"
channelMarker:
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
AISDemodReport: AISDemodReport:
description: AISDemod description: AISDemod

2
sdrbase/resources/webapi/doc/swagger/include/AMDemod.yaml
View File

@ -47,6 +47,8 @@ AMDemodSettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
channelMarker:
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
AMDemodReport: AMDemodReport:
description: AMDemod description: AMDemod

2
sdrbase/resources/webapi/doc/swagger/include/APTDemod.yaml
View File

@ -63,6 +63,8 @@ APTDemodSettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
channelMarker:
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
APTDemodActions: APTDemodActions:
description: APTDemod description: APTDemod

2
sdrbase/resources/webapi/doc/swagger/include/BFMDemod.yaml
View File

@ -46,6 +46,8 @@ BFMDemodSettings:
type: integer type: integer
spectrumConfig: spectrumConfig:
$ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum" $ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum"
channelMarker:
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
BFMDemodReport: BFMDemodReport:
description: BFMDemod description: BFMDemod

2
sdrbase/resources/webapi/doc/swagger/include/ChirpChatDemod.yaml
View File

@ -120,6 +120,8 @@ ChirpChatDemodSettings:
type: integer type: integer
spectrumConfig: spectrumConfig:
$ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum" $ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum"
channelMarker:
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
ChirpChatDemodReport: ChirpChatDemodReport:
description: ChirpChatDemod description: ChirpChatDemod

2
sdrbase/resources/webapi/doc/swagger/include/DABDemod.yaml
View File

@ -34,3 +34,5 @@ DABDemodSettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
channelMarker:
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"

2
sdrbase/resources/webapi/doc/swagger/include/DATVDemod.yaml
View File

@ -121,6 +121,8 @@ DATVDemodSettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
channelMarker:
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
DATVDemodReport: DATVDemodReport:
description: DATVDemod description: DATVDemod

2
sdrbase/resources/webapi/doc/swagger/include/DSDDemod.yaml
View File

@ -68,6 +68,8 @@ DSDDemodSettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
channelMarker:
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
DSDDemodReport: DSDDemodReport:
description: DSDDemod description: DSDDemod

2
sdrbase/resources/webapi/doc/swagger/include/FileSink.yaml
View File

@ -50,6 +50,8 @@ FileSinkSettings:
type: integer type: integer
spectrumConfig: spectrumConfig:
$ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum" $ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum"
channelMarker:
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
FileSinkReport: FileSinkReport:
description: FileSink description: FileSink

2
sdrbase/resources/webapi/doc/swagger/include/FreeDVDemod.yaml
View File

@ -44,6 +44,8 @@ FreeDVDemodSettings:
type: integer type: integer
spectrumConfig: spectrumConfig:
$ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum" $ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum"
channelMarker:
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
FreeDVDemodReport: FreeDVDemodReport:
description: FreeDVDemod description: FreeDVDemod

2
sdrbase/resources/webapi/doc/swagger/include/FreqTracker.yaml
View File

@ -59,6 +59,8 @@ FreqTrackerSettings:
type: integer type: integer
spectrumConfig: spectrumConfig:
$ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum" $ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum"
channelMarker:
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
FreqTrackerReport: FreqTrackerReport:
description: FreqTracker description: FreqTracker

2
sdrbase/resources/webapi/doc/swagger/include/LocalSink.yaml
View File

@ -29,3 +29,5 @@ LocalSinkSettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
channelMarker:
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"

2
sdrbase/resources/webapi/doc/swagger/include/NFMDemod.yaml
View File

@ -55,6 +55,8 @@ NFMDemodSettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
channelMarker:
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
NFMDemodReport: NFMDemodReport:
description: NFMDemod description: NFMDemod

2
sdrbase/resources/webapi/doc/swagger/include/NoiseFigure.yaml
View File

@ -58,6 +58,8 @@ NoiseFigureSettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
channelMarker:
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
NoiseFigureReport: NoiseFigureReport:
description: NoiseFigure description: NoiseFigure

2
sdrbase/resources/webapi/doc/swagger/include/PacketDemod.yaml
View File

@ -46,6 +46,8 @@ PacketDemodSettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
channelMarker:
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
PacketDemodReport: PacketDemodReport:
description: AMDemod description: AMDemod

4
sdrbase/resources/webapi/doc/swagger/include/PagerDemod.yaml
View File

@ -65,6 +65,10 @@ PagerDemodSettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
scopeConfig:
$ref: "/doc/swagger/include/GLScope.yaml#/GLScope"
channelMarker:
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
PagerDemodReport: PagerDemodReport:
description: PagerDemod description: PagerDemod

2
sdrbase/resources/webapi/doc/swagger/include/RadioAstronomy.yaml
View File

@ -73,6 +73,8 @@ RadioAstronomySettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
channelMarker:
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
RadioAstronomyReport: RadioAstronomyReport:
description: RadioAstronomy description: RadioAstronomy

4
sdrbase/resources/webapi/doc/swagger/include/RadioClock.yaml
View File

@ -36,6 +36,10 @@ RadioClockSettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
scopeConfig:
$ref: "/doc/swagger/include/GLScope.yaml#/GLScope"
channelMarker:
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
RadioClockReport: RadioClockReport:
description: RadioClock description: RadioClock

2
sdrbase/resources/webapi/doc/swagger/include/RemoteSink.yaml
View File

@ -35,3 +35,5 @@ RemoteSinkSettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
channelMarker:
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"

2
sdrbase/resources/webapi/doc/swagger/include/SSBDemod.yaml
View File

@ -64,6 +64,8 @@ SSBDemodSettings:
type: integer type: integer
spectrumConfig: spectrumConfig:
$ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum" $ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum"
channelMarker:
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
SSBDemodReport: SSBDemodReport:
description: SSBDemod description: SSBDemod

2
sdrbase/resources/webapi/doc/swagger/include/SigMFFileSink.yaml
View File

@ -50,6 +50,8 @@ SigMFFileSinkSettings:
type: integer type: integer
spectrumConfig: spectrumConfig:
$ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum" $ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum"
channelMarker:
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
SigMFFileSinkReport: SigMFFileSinkReport:
description: SigMFFileSink description: SigMFFileSink

2
sdrbase/resources/webapi/doc/swagger/include/UDPSink.yaml
View File

@ -71,6 +71,8 @@ UDPSinkSettings:
type: integer type: integer
spectrumConfig: spectrumConfig:
$ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum" $ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum"
channelMarker:
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
UDPSinkReport: UDPSinkReport:
description: UDPSink description: UDPSink

2
sdrbase/resources/webapi/doc/swagger/include/VORDemod.yaml
View File

@ -36,6 +36,8 @@ VORDemodSettings:
magDecAdjust: magDecAdjust:
description: Adjust radial lines on map for magnetic declination of VOR description: Adjust radial lines on map for magnetic declination of VOR
type: integer type: integer
channelMarker:
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
VORDemodReport: VORDemodReport:
description: VORDemod description: VORDemod

2
sdrbase/resources/webapi/doc/swagger/include/VORDemodSC.yaml
View File

@ -39,6 +39,8 @@ VORDemodSCSettings:
identThreshold: identThreshold:
description: Morse code ident threshold (linear SNR) description: Morse code ident threshold (linear SNR)
type: integer type: integer
channelMarker:
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
VORDemodSCReport: VORDemodSCReport:
description: VORDemodSC description: VORDemodSC

2
sdrbase/resources/webapi/doc/swagger/include/WFMDemod.yaml
View File

@ -39,6 +39,8 @@ WFMDemodSettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
channelMarker:
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
WFMDemodReport: WFMDemodReport:
description: WFMDemod description: WFMDemod

2
swagger/sdrangel/api/swagger/include/ADSBDemod.yaml
View File

@ -73,6 +73,8 @@ ADSBDemodSettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
channelMarker:
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
ADSBDemodReport: ADSBDemodReport:
description: ADSBDemod description: ADSBDemod

4
swagger/sdrangel/api/swagger/include/AISDemod.yaml
View File

@ -50,6 +50,10 @@ AISDemodSettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
scopeConfig:
$ref: "http://swgserver:8081/api/swagger/include/GLScope.yaml#/GLScope"
channelMarker:
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
AISDemodReport: AISDemodReport:
description: AISDemod description: AISDemod

2
swagger/sdrangel/api/swagger/include/AMDemod.yaml
View File

@ -47,6 +47,8 @@ AMDemodSettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
channelMarker:
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
AMDemodReport: AMDemodReport:
description: AMDemod description: AMDemod

2
swagger/sdrangel/api/swagger/include/APTDemod.yaml
View File

@ -63,6 +63,8 @@ APTDemodSettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
channelMarker:
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
APTDemodActions: APTDemodActions:
description: APTDemod description: APTDemod

2
swagger/sdrangel/api/swagger/include/BFMDemod.yaml
View File

@ -46,6 +46,8 @@ BFMDemodSettings:
type: integer type: integer
spectrumConfig: spectrumConfig:
$ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum" $ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum"
channelMarker:
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
BFMDemodReport: BFMDemodReport:
description: BFMDemod description: BFMDemod

2
swagger/sdrangel/api/swagger/include/ChirpChatDemod.yaml
View File

@ -120,6 +120,8 @@ ChirpChatDemodSettings:
type: integer type: integer
spectrumConfig: spectrumConfig:
$ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum" $ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum"
channelMarker:
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
ChirpChatDemodReport: ChirpChatDemodReport:
description: ChirpChatDemod description: ChirpChatDemod

2
swagger/sdrangel/api/swagger/include/DABDemod.yaml
View File

@ -34,3 +34,5 @@ DABDemodSettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
channelMarker:
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"

2
swagger/sdrangel/api/swagger/include/DATVDemod.yaml
View File

@ -121,6 +121,8 @@ DATVDemodSettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
channelMarker:
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
DATVDemodReport: DATVDemodReport:
description: DATVDemod description: DATVDemod

2
swagger/sdrangel/api/swagger/include/DSDDemod.yaml
View File

@ -68,6 +68,8 @@ DSDDemodSettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
channelMarker:
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
DSDDemodReport: DSDDemodReport:
description: DSDDemod description: DSDDemod

2
swagger/sdrangel/api/swagger/include/FileSink.yaml
View File

@ -50,6 +50,8 @@ FileSinkSettings:
type: integer type: integer
spectrumConfig: spectrumConfig:
$ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum" $ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum"
channelMarker:
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
FileSinkReport: FileSinkReport:
description: FileSink description: FileSink

2
swagger/sdrangel/api/swagger/include/FreeDVDemod.yaml
View File

@ -44,6 +44,8 @@ FreeDVDemodSettings:
type: integer type: integer
spectrumConfig: spectrumConfig:
$ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum" $ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum"
channelMarker:
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
FreeDVDemodReport: FreeDVDemodReport:
description: FreeDVDemod description: FreeDVDemod

2
swagger/sdrangel/api/swagger/include/FreqTracker.yaml
View File

@ -59,6 +59,8 @@ FreqTrackerSettings:
type: integer type: integer
spectrumConfig: spectrumConfig:
$ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum" $ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum"
channelMarker:
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
FreqTrackerReport: FreqTrackerReport:
description: FreqTracker description: FreqTracker

2
swagger/sdrangel/api/swagger/include/LocalSink.yaml
View File

@ -29,3 +29,5 @@ LocalSinkSettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
channelMarker:
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"

2
swagger/sdrangel/api/swagger/include/NFMDemod.yaml
View File

@ -55,6 +55,8 @@ NFMDemodSettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
channelMarker:
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
NFMDemodReport: NFMDemodReport:
description: NFMDemod description: NFMDemod

2
swagger/sdrangel/api/swagger/include/NoiseFigure.yaml
View File

@ -58,6 +58,8 @@ NoiseFigureSettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
channelMarker:
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
NoiseFigureReport: NoiseFigureReport:
description: NoiseFigure description: NoiseFigure

2
swagger/sdrangel/api/swagger/include/PacketDemod.yaml
View File

@ -46,6 +46,8 @@ PacketDemodSettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
channelMarker:
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
PacketDemodReport: PacketDemodReport:
description: AMDemod description: AMDemod

4
swagger/sdrangel/api/swagger/include/PagerDemod.yaml
View File

@ -65,6 +65,10 @@ PagerDemodSettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
scopeConfig:
$ref: "http://swgserver:8081/api/swagger/include/GLScope.yaml#/GLScope"
channelMarker:
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
PagerDemodReport: PagerDemodReport:
description: PagerDemod description: PagerDemod

2
swagger/sdrangel/api/swagger/include/RadioAstronomy.yaml
View File

@ -73,6 +73,8 @@ RadioAstronomySettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
channelMarker:
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
RadioAstronomyReport: RadioAstronomyReport:
description: RadioAstronomy description: RadioAstronomy

4
swagger/sdrangel/api/swagger/include/RadioClock.yaml
View File

@ -36,6 +36,10 @@ RadioClockSettings:
type: integer type: integer
reverseAPIChannelIndex: reverseAPIChannelIndex:
type: integer type: integer
scopeConfig:
$ref: "http://swgserver:8081/api/swagger/include/GLScope.yaml#/GLScope"
channelMarker:
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
RadioClockReport: RadioClockReport:
description: RadioClock description: RadioClock

Some files were not shown because too many files have changed in this diff Show More