From 8a438a94c1f383166eca2ac21d3388a657bd74a0 Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 2 Dec 2021 23:54:39 +0100 Subject: [PATCH] API: implemented Channel Marker in Rx channels and complete serializable objects for some --- plugins/channelrx/chanalyzer/chanalyzer.cpp | 26 +++++- .../channelrx/chanalyzer/chanalyzergui.cpp | 1 + plugins/channelrx/demodadsb/adsbdemod.cpp | 18 ++++ plugins/channelrx/demodadsb/adsbdemodgui.cpp | 1 + plugins/channelrx/demodais/aisdemod.cpp | 48 ++++++++++ plugins/channelrx/demodais/aisdemodgui.cpp | 2 + plugins/channelrx/demodam/amdemod.cpp | 25 ++++++ plugins/channelrx/demodam/amdemodgui.cpp | 1 + plugins/channelrx/demodapt/aptdemod.cpp | 25 ++++++ plugins/channelrx/demodapt/aptdemodgui.cpp | 1 + plugins/channelrx/demodbfm/bfmdemod.cpp | 25 ++++++ plugins/channelrx/demodbfm/bfmdemodgui.cpp | 1 + .../demodchirpchat/chirpchatdemod.cpp | 25 ++++++ .../demodchirpchat/chirpchatdemodgui.cpp | 1 + plugins/channelrx/demoddab/dabdemod.cpp | 25 ++++++ plugins/channelrx/demoddab/dabdemodgui.cpp | 1 + plugins/channelrx/demoddatv/datvdemod.cpp | 25 ++++++ plugins/channelrx/demoddatv/datvdemodgui.cpp | 3 + plugins/channelrx/demoddsd/dsddemod.cpp | 24 +++++ plugins/channelrx/demoddsd/dsddemodgui.cpp | 1 + .../channelrx/demoddsd/dsddemodsettings.cpp | 14 +-- plugins/channelrx/demoddsd/dsddemodsettings.h | 2 - plugins/channelrx/demodfreedv/freedvdemod.cpp | 25 ++++++ .../channelrx/demodfreedv/freedvdemodgui.cpp | 1 + plugins/channelrx/demodnfm/nfmdemod.cpp | 25 ++++++ plugins/channelrx/demodnfm/nfmdemodgui.cpp | 1 + plugins/channelrx/demodpacket/packetdemod.cpp | 25 ++++++ .../channelrx/demodpacket/packetdemodgui.cpp | 1 + plugins/channelrx/demodpager/pagerdemod.cpp | 49 ++++++++++ .../channelrx/demodpager/pagerdemodgui.cpp | 2 + plugins/channelrx/demodssb/ssbdemod.cpp | 25 ++++++ plugins/channelrx/demodssb/ssbdemodgui.cpp | 1 + plugins/channelrx/filesink/filesink.cpp | 25 ++++++ plugins/channelrx/filesink/filesinkgui.cpp | 2 + plugins/channelrx/filesink/filesinksettings.h | 2 + plugins/channelrx/freqtracker/freqtracker.cpp | 25 ++++++ .../channelrx/freqtracker/freqtrackergui.cpp | 1 + plugins/channelrx/localsink/localsink.cpp | 25 ++++++ plugins/channelrx/localsink/localsinkgui.cpp | 1 + plugins/channelrx/noisefigure/noisefigure.cpp | 24 +++++ .../channelrx/noisefigure/noisefiguregui.cpp | 1 + .../radioastronomy/radioastronomy.cpp | 24 +++++ .../radioastronomy/radioastronomygui.cpp | 1 + plugins/channelrx/radioclock/radioclock.cpp | 48 ++++++++++ .../channelrx/radioclock/radioclockgui.cpp | 2 + plugins/channelrx/remotesink/remotesink.cpp | 25 ++++++ .../channelrx/remotesink/remotesinkgui.cpp | 1 + .../channelrx/sigmffilesink/sigmffilesink.cpp | 25 ++++++ .../sigmffilesink/sigmffilesinkgui.cpp | 2 + .../sigmffilesink/sigmffilesinksettings.h | 2 + plugins/channelrx/udpsink/udpsink.cpp | 25 ++++++ plugins/channelrx/udpsink/udpsinkgui.cpp | 1 + sdrbase/dsp/channelmarker.cpp | 5 ++ sdrbase/dsp/channelmarker.h | 1 + sdrbase/resources/webapi/doc/html2/index.html | 89 ++++++++++++++++++- .../webapi/doc/swagger/include/ADSBDemod.yaml | 2 + .../webapi/doc/swagger/include/AISDemod.yaml | 4 + .../webapi/doc/swagger/include/AMDemod.yaml | 2 + .../webapi/doc/swagger/include/APTDemod.yaml | 6 +- .../webapi/doc/swagger/include/BFMDemod.yaml | 2 + .../doc/swagger/include/ChirpChatDemod.yaml | 2 + .../webapi/doc/swagger/include/DABDemod.yaml | 2 + .../webapi/doc/swagger/include/DATVDemod.yaml | 2 + .../webapi/doc/swagger/include/DSDDemod.yaml | 2 + .../webapi/doc/swagger/include/FileSink.yaml | 2 + .../doc/swagger/include/FreeDVDemod.yaml | 2 + .../doc/swagger/include/FreqTracker.yaml | 2 + .../webapi/doc/swagger/include/LocalSink.yaml | 2 + .../webapi/doc/swagger/include/NFMDemod.yaml | 2 + .../doc/swagger/include/NoiseFigure.yaml | 2 + .../doc/swagger/include/PacketDemod.yaml | 2 + .../doc/swagger/include/PagerDemod.yaml | 4 + .../doc/swagger/include/RadioAstronomy.yaml | 2 + .../doc/swagger/include/RadioClock.yaml | 4 + .../doc/swagger/include/RemoteSink.yaml | 2 + .../webapi/doc/swagger/include/SSBDemod.yaml | 2 + .../doc/swagger/include/SigMFFileSink.yaml | 2 + .../webapi/doc/swagger/include/UDPSink.yaml | 2 + .../webapi/doc/swagger/include/VORDemod.yaml | 2 + .../doc/swagger/include/VORDemodSC.yaml | 2 + .../webapi/doc/swagger/include/WFMDemod.yaml | 2 + .../api/swagger/include/ADSBDemod.yaml | 2 + .../api/swagger/include/AISDemod.yaml | 4 + .../sdrangel/api/swagger/include/AMDemod.yaml | 2 + .../api/swagger/include/APTDemod.yaml | 6 +- .../api/swagger/include/BFMDemod.yaml | 2 + .../api/swagger/include/ChirpChatDemod.yaml | 2 + .../api/swagger/include/DABDemod.yaml | 2 + .../api/swagger/include/DATVDemod.yaml | 2 + .../api/swagger/include/DSDDemod.yaml | 2 + .../api/swagger/include/FileSink.yaml | 2 + .../api/swagger/include/FreeDVDemod.yaml | 2 + .../api/swagger/include/FreqTracker.yaml | 2 + .../api/swagger/include/LocalSink.yaml | 2 + .../api/swagger/include/NFMDemod.yaml | 2 + .../api/swagger/include/NoiseFigure.yaml | 2 + .../api/swagger/include/PacketDemod.yaml | 2 + .../api/swagger/include/PagerDemod.yaml | 4 + .../api/swagger/include/RadioAstronomy.yaml | 2 + .../api/swagger/include/RadioClock.yaml | 4 + .../api/swagger/include/RemoteSink.yaml | 2 + .../api/swagger/include/SSBDemod.yaml | 2 + .../api/swagger/include/SigMFFileSink.yaml | 2 + .../sdrangel/api/swagger/include/UDPSink.yaml | 2 + .../api/swagger/include/VORDemod.yaml | 2 + .../api/swagger/include/VORDemodSC.yaml | 2 + .../api/swagger/include/WFMDemod.yaml | 2 + swagger/sdrangel/code/html2/index.html | 89 ++++++++++++++++++- .../code/qt5/client/SWGADSBDemodSettings.cpp | 25 ++++++ .../code/qt5/client/SWGADSBDemodSettings.h | 7 ++ .../code/qt5/client/SWGAISDemodSettings.cpp | 50 +++++++++++ .../code/qt5/client/SWGAISDemodSettings.h | 14 +++ .../code/qt5/client/SWGAMDemodSettings.cpp | 25 ++++++ .../code/qt5/client/SWGAMDemodSettings.h | 7 ++ .../code/qt5/client/SWGAPTDemodSettings.cpp | 25 ++++++ .../code/qt5/client/SWGAPTDemodSettings.h | 7 ++ .../code/qt5/client/SWGBFMDemodSettings.cpp | 25 ++++++ .../code/qt5/client/SWGBFMDemodSettings.h | 7 ++ .../qt5/client/SWGChirpChatDemodSettings.cpp | 25 ++++++ .../qt5/client/SWGChirpChatDemodSettings.h | 7 ++ .../code/qt5/client/SWGDABDemodSettings.cpp | 25 ++++++ .../code/qt5/client/SWGDABDemodSettings.h | 7 ++ .../code/qt5/client/SWGDATVDemodSettings.cpp | 25 ++++++ .../code/qt5/client/SWGDATVDemodSettings.h | 7 ++ .../code/qt5/client/SWGDSDDemodSettings.cpp | 25 ++++++ .../code/qt5/client/SWGDSDDemodSettings.h | 7 ++ .../code/qt5/client/SWGFileSinkSettings.cpp | 25 ++++++ .../code/qt5/client/SWGFileSinkSettings.h | 7 ++ .../qt5/client/SWGFreeDVDemodSettings.cpp | 25 ++++++ .../code/qt5/client/SWGFreeDVDemodSettings.h | 7 ++ .../qt5/client/SWGFreqTrackerSettings.cpp | 25 ++++++ .../code/qt5/client/SWGFreqTrackerSettings.h | 7 ++ .../code/qt5/client/SWGLocalSinkSettings.cpp | 25 ++++++ .../code/qt5/client/SWGLocalSinkSettings.h | 7 ++ .../code/qt5/client/SWGNFMDemodSettings.cpp | 25 ++++++ .../code/qt5/client/SWGNFMDemodSettings.h | 7 ++ .../qt5/client/SWGNoiseFigureSettings.cpp | 25 ++++++ .../code/qt5/client/SWGNoiseFigureSettings.h | 7 ++ .../qt5/client/SWGPacketDemodSettings.cpp | 25 ++++++ .../code/qt5/client/SWGPacketDemodSettings.h | 7 ++ .../code/qt5/client/SWGPagerDemodSettings.cpp | 50 +++++++++++ .../code/qt5/client/SWGPagerDemodSettings.h | 14 +++ .../qt5/client/SWGRadioAstronomySettings.cpp | 25 ++++++ .../qt5/client/SWGRadioAstronomySettings.h | 7 ++ .../code/qt5/client/SWGRadioClockSettings.cpp | 50 +++++++++++ .../code/qt5/client/SWGRadioClockSettings.h | 14 +++ .../code/qt5/client/SWGRemoteSinkSettings.cpp | 25 ++++++ .../code/qt5/client/SWGRemoteSinkSettings.h | 7 ++ .../code/qt5/client/SWGSSBDemodSettings.cpp | 25 ++++++ .../code/qt5/client/SWGSSBDemodSettings.h | 7 ++ .../qt5/client/SWGSigMFFileSinkSettings.cpp | 25 ++++++ .../qt5/client/SWGSigMFFileSinkSettings.h | 7 ++ .../code/qt5/client/SWGUDPSinkSettings.cpp | 25 ++++++ .../code/qt5/client/SWGUDPSinkSettings.h | 7 ++ .../code/qt5/client/SWGVORDemodSCSettings.cpp | 25 ++++++ .../code/qt5/client/SWGVORDemodSCSettings.h | 7 ++ .../code/qt5/client/SWGVORDemodSettings.cpp | 25 ++++++ .../code/qt5/client/SWGVORDemodSettings.h | 7 ++ .../code/qt5/client/SWGWFMDemodSettings.cpp | 25 ++++++ .../code/qt5/client/SWGWFMDemodSettings.h | 7 ++ 160 files changed, 1926 insertions(+), 22 deletions(-) diff --git a/plugins/channelrx/chanalyzer/chanalyzer.cpp b/plugins/channelrx/chanalyzer/chanalyzer.cpp index 1b5e8a565..342c91ae2 100644 --- a/plugins/channelrx/chanalyzer/chanalyzer.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzer.cpp @@ -298,9 +298,12 @@ void ChannelAnalyzer::webapiUpdateChannelSettings( if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) { 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()); } + if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) { + settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getChannelAnalyzerSettings()->getChannelMarker()); + } } void ChannelAnalyzer::webapiFormatChannelSettings( @@ -373,6 +376,20 @@ void ChannelAnalyzer::webapiFormatChannelSettings( 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( @@ -531,6 +548,13 @@ void ChannelAnalyzer::webapiFormatChannelSettings( settings.m_scopeGUI->formatTo(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) diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.cpp b/plugins/channelrx/chanalyzer/chanalyzergui.cpp index b3ebd0e4f..0ecf4ff0c 100644 --- a/plugins/channelrx/chanalyzer/chanalyzergui.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzergui.cpp @@ -245,6 +245,7 @@ bool ChannelAnalyzerGUI::handleMessage(const Message& message) blockApplySettings(true); ui->spectrumGUI->updateSettings(); ui->scopeGUI->updateSettings(); + m_channelMarker.updateSettings(static_cast(m_settings.m_channelMarker)); displaySettings(); blockApplySettings(false); diff --git a/plugins/channelrx/demodadsb/adsbdemod.cpp b/plugins/channelrx/demodadsb/adsbdemod.cpp index 72393dff2..959e7b1bb 100644 --- a/plugins/channelrx/demodadsb/adsbdemod.cpp +++ b/plugins/channelrx/demodadsb/adsbdemod.cpp @@ -40,6 +40,7 @@ #include "dsp/dspcommands.h" #include "dsp/devicesamplemimo.h" #include "device/deviceapi.h" +#include "settings/serializable.h" #include "util/db.h" #include "maincore.h" @@ -387,6 +388,9 @@ void ADSBDemod::webapiUpdateChannelSettings( if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { settings.m_reverseAPIChannelIndex = response.getAdsbDemodSettings()->getReverseApiChannelIndex(); } + if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) { + settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getAdsbDemodSettings()->getChannelMarker()); + } } int ADSBDemod::webapiReportGet( @@ -437,6 +441,20 @@ void ADSBDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& res response.getAdsbDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort); response.getAdsbDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); 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) diff --git a/plugins/channelrx/demodadsb/adsbdemodgui.cpp b/plugins/channelrx/demodadsb/adsbdemodgui.cpp index 006a6ed52..a8ea98695 100644 --- a/plugins/channelrx/demodadsb/adsbdemodgui.cpp +++ b/plugins/channelrx/demodadsb/adsbdemodgui.cpp @@ -1561,6 +1561,7 @@ bool ADSBDemodGUI::handleMessage(const Message& message) const ADSBDemod::MsgConfigureADSBDemod& cfg = (ADSBDemod::MsgConfigureADSBDemod&) message; m_settings = cfg.getSettings(); blockApplySettings(true); + m_channelMarker.updateSettings(static_cast(m_settings.m_channelMarker)); displaySettings(); blockApplySettings(false); return true; diff --git a/plugins/channelrx/demodais/aisdemod.cpp b/plugins/channelrx/demodais/aisdemod.cpp index 7d340eff6..2c6552d1e 100644 --- a/plugins/channelrx/demodais/aisdemod.cpp +++ b/plugins/channelrx/demodais/aisdemod.cpp @@ -464,6 +464,12 @@ void AISDemod::webapiUpdateChannelSettings( if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { 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) @@ -499,6 +505,34 @@ void AISDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& resp response.getAisDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort); response.getAisDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); 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& channelSettingsKeys, const AISDemodSettings& settings, bool force) @@ -584,6 +618,20 @@ void AISDemod::webapiFormatChannelSettings( if (channelSettingsKeys.contains("streamIndex") || force) { 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) diff --git a/plugins/channelrx/demodais/aisdemodgui.cpp b/plugins/channelrx/demodais/aisdemodgui.cpp index 877443eff..b6ec721ce 100644 --- a/plugins/channelrx/demodais/aisdemodgui.cpp +++ b/plugins/channelrx/demodais/aisdemodgui.cpp @@ -198,6 +198,8 @@ bool AISDemodGUI::handleMessage(const Message& message) const AISDemod::MsgConfigureAISDemod& cfg = (AISDemod::MsgConfigureAISDemod&) message; m_settings = cfg.getSettings(); blockApplySettings(true); + ui->scopeGUI->updateSettings(); + m_channelMarker.updateSettings(static_cast(m_settings.m_channelMarker)); displaySettings(); blockApplySettings(false); return true; diff --git a/plugins/channelrx/demodam/amdemod.cpp b/plugins/channelrx/demodam/amdemod.cpp index 9f612260b..c3a10d7da 100644 --- a/plugins/channelrx/demodam/amdemod.cpp +++ b/plugins/channelrx/demodam/amdemod.cpp @@ -36,6 +36,7 @@ #include "dsp/dspcommands.h" #include "device/deviceapi.h" #include "feature/feature.h" +#include "settings/serializable.h" #include "util/db.h" #include "maincore.h" @@ -383,6 +384,9 @@ void AMDemod::webapiUpdateChannelSettings( if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { settings.m_reverseAPIChannelIndex = response.getAmDemodSettings()->getReverseApiChannelIndex(); } + if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) { + settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getAmDemodSettings()->getChannelMarker()); + } } int AMDemod::webapiReportGet( @@ -432,6 +436,20 @@ void AMDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respo response.getAmDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort); response.getAmDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); 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) @@ -545,6 +563,13 @@ void AMDemod::webapiFormatChannelSettings( if (channelSettingsKeys.contains("streamIndex") || force) { 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) diff --git a/plugins/channelrx/demodam/amdemodgui.cpp b/plugins/channelrx/demodam/amdemodgui.cpp index 091d4eaf2..127d5f3d5 100644 --- a/plugins/channelrx/demodam/amdemodgui.cpp +++ b/plugins/channelrx/demodam/amdemodgui.cpp @@ -80,6 +80,7 @@ bool AMDemodGUI::handleMessage(const Message& message) const AMDemod::MsgConfigureAMDemod& cfg = (AMDemod::MsgConfigureAMDemod&) message; m_settings = cfg.getSettings(); blockApplySettings(true); + m_channelMarker.updateSettings(static_cast(m_settings.m_channelMarker)); displaySettings(); blockApplySettings(false); return true; diff --git a/plugins/channelrx/demodapt/aptdemod.cpp b/plugins/channelrx/demodapt/aptdemod.cpp index 76a5a0a08..1e4763521 100644 --- a/plugins/channelrx/demodapt/aptdemod.cpp +++ b/plugins/channelrx/demodapt/aptdemod.cpp @@ -39,6 +39,7 @@ #include "dsp/dspcommands.h" #include "device/deviceapi.h" #include "feature/feature.h" +#include "settings/serializable.h" #include "util/db.h" #include "maincore.h" @@ -436,6 +437,9 @@ void APTDemod::webapiUpdateChannelSettings( if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { 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) @@ -475,6 +479,20 @@ void APTDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& resp response.getAptDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort); response.getAptDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); 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& channelSettingsKeys, const APTDemodSettings& settings, bool force) @@ -569,6 +587,13 @@ void APTDemod::webapiFormatChannelSettings( if (channelSettingsKeys.contains("streamIndex") || force) { 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( diff --git a/plugins/channelrx/demodapt/aptdemodgui.cpp b/plugins/channelrx/demodapt/aptdemodgui.cpp index 544b6943b..bca1bcaaf 100644 --- a/plugins/channelrx/demodapt/aptdemodgui.cpp +++ b/plugins/channelrx/demodapt/aptdemodgui.cpp @@ -94,6 +94,7 @@ bool APTDemodGUI::handleMessage(const Message& message) const APTDemod::MsgConfigureAPTDemod& cfg = (APTDemod::MsgConfigureAPTDemod&) message; m_settings = cfg.getSettings(); blockApplySettings(true); + m_channelMarker.updateSettings(static_cast(m_settings.m_channelMarker)); displaySettings(); blockApplySettings(false); return true; diff --git a/plugins/channelrx/demodbfm/bfmdemod.cpp b/plugins/channelrx/demodbfm/bfmdemod.cpp index 5720a9a68..abafc0a9d 100644 --- a/plugins/channelrx/demodbfm/bfmdemod.cpp +++ b/plugins/channelrx/demodbfm/bfmdemod.cpp @@ -348,6 +348,9 @@ void BFMDemod::webapiUpdateChannelSettings( if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) { 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( @@ -412,6 +415,20 @@ void BFMDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& resp 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) @@ -568,12 +585,20 @@ void BFMDemod::webapiFormatChannelSettings( if (channelSettingsKeys.contains("streamIndex") || force) { swgBFMDemodSettings->setStreamIndex(settings.m_streamIndex); } + if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force)) { SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum(); settings.m_spectrumGUI->formatTo(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) diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.cpp b/plugins/channelrx/demodbfm/bfmdemodgui.cpp index b9c64986f..77a27df24 100644 --- a/plugins/channelrx/demodbfm/bfmdemodgui.cpp +++ b/plugins/channelrx/demodbfm/bfmdemodgui.cpp @@ -105,6 +105,7 @@ bool BFMDemodGUI::handleMessage(const Message& message) m_settings = cfg.getSettings(); blockApplySettings(true); ui->spectrumGUI->updateSettings(); + m_channelMarker.updateSettings(static_cast(m_settings.m_channelMarker)); displaySettings(); blockApplySettings(false); return true; diff --git a/plugins/channelrx/demodchirpchat/chirpchatdemod.cpp b/plugins/channelrx/demodchirpchat/chirpchatdemod.cpp index 718a8d910..7b93abe54 100644 --- a/plugins/channelrx/demodchirpchat/chirpchatdemod.cpp +++ b/plugins/channelrx/demodchirpchat/chirpchatdemod.cpp @@ -593,6 +593,9 @@ void ChirpChatDemod::webapiUpdateChannelSettings( if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) { 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( @@ -664,6 +667,20 @@ void ChirpChatDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings 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) @@ -816,12 +833,20 @@ void ChirpChatDemod::webapiFormatChannelSettings( if (channelSettingsKeys.contains("title") || force) { swgChirpChatDemodSettings->setTitle(new QString(settings.m_title)); } + if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force)) { SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum(); settings.m_spectrumGUI->formatTo(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) diff --git a/plugins/channelrx/demodchirpchat/chirpchatdemodgui.cpp b/plugins/channelrx/demodchirpchat/chirpchatdemodgui.cpp index 89e9f6ee1..b9a206012 100644 --- a/plugins/channelrx/demodchirpchat/chirpchatdemodgui.cpp +++ b/plugins/channelrx/demodchirpchat/chirpchatdemodgui.cpp @@ -116,6 +116,7 @@ bool ChirpChatDemodGUI::handleMessage(const Message& message) m_settings = cfg.getSettings(); blockApplySettings(true); ui->spectrumGUI->updateSettings(); + m_channelMarker.updateSettings(static_cast(m_settings.m_channelMarker)); displaySettings(); blockApplySettings(false); diff --git a/plugins/channelrx/demoddab/dabdemod.cpp b/plugins/channelrx/demoddab/dabdemod.cpp index e0bb1e4c7..44bca107d 100644 --- a/plugins/channelrx/demoddab/dabdemod.cpp +++ b/plugins/channelrx/demoddab/dabdemod.cpp @@ -36,6 +36,7 @@ #include "dsp/dspcommands.h" #include "device/deviceapi.h" #include "feature/feature.h" +#include "settings/serializable.h" #include "util/db.h" #include "maincore.h" @@ -455,6 +456,9 @@ void DABDemod::webapiUpdateChannelSettings( if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { 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) @@ -485,6 +489,20 @@ void DABDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& resp response.getDabDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort); response.getDabDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); 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& channelSettingsKeys, const DABDemodSettings& settings, bool force) @@ -555,6 +573,13 @@ void DABDemod::webapiFormatChannelSettings( if (channelSettingsKeys.contains("streamIndex") || force) { 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) diff --git a/plugins/channelrx/demoddab/dabdemodgui.cpp b/plugins/channelrx/demoddab/dabdemodgui.cpp index 2edc94c8d..975b23ec7 100644 --- a/plugins/channelrx/demoddab/dabdemodgui.cpp +++ b/plugins/channelrx/demoddab/dabdemodgui.cpp @@ -193,6 +193,7 @@ bool DABDemodGUI::handleMessage(const Message& message) const DABDemod::MsgConfigureDABDemod& cfg = (DABDemod::MsgConfigureDABDemod&) message; m_settings = cfg.getSettings(); blockApplySettings(true); + m_channelMarker.updateSettings(static_cast(m_settings.m_channelMarker)); displaySettings(); blockApplySettings(false); return true; diff --git a/plugins/channelrx/demoddatv/datvdemod.cpp b/plugins/channelrx/demoddatv/datvdemod.cpp index c1c458139..8c5f0917b 100644 --- a/plugins/channelrx/demoddatv/datvdemod.cpp +++ b/plugins/channelrx/demoddatv/datvdemod.cpp @@ -27,6 +27,7 @@ #include "SWGChannelReport.h" #include "device/deviceapi.h" +#include "settings/serializable.h" #include "datvdemod.h" #include "maincore.h" @@ -397,6 +398,9 @@ void DATVDemod::webapiUpdateChannelSettings( if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { 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) @@ -465,6 +469,20 @@ void DATVDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& res response.getDatvDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort); response.getDatvDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); 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) @@ -608,6 +626,13 @@ void DATVDemod::webapiFormatChannelSettings( if (channelSettingsKeys.contains("streamIndex") || force) { 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& channelSettingsKeys, const DATVDemodSettings& settings, bool force) diff --git a/plugins/channelrx/demoddatv/datvdemodgui.cpp b/plugins/channelrx/demoddatv/datvdemodgui.cpp index a6fa33b37..d403fb91d 100644 --- a/plugins/channelrx/demoddatv/datvdemodgui.cpp +++ b/plugins/channelrx/demoddatv/datvdemodgui.cpp @@ -96,6 +96,7 @@ bool DATVDemodGUI::handleMessage(const Message& message) { DATVDemod::MsgConfigureDATVDemod& cfg = (DATVDemod::MsgConfigureDATVDemod&) message; m_settings = cfg.getSettings(); + m_objChannelMarker.updateSettings(static_cast(m_settings.m_channelMarker)); displaySettings(); return true; } @@ -226,6 +227,8 @@ DATVDemodGUI::DATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Ba 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); m_intPreviousDecodedData=0; diff --git a/plugins/channelrx/demoddsd/dsddemod.cpp b/plugins/channelrx/demoddsd/dsddemod.cpp index 915eb33f9..5b97618ba 100644 --- a/plugins/channelrx/demoddsd/dsddemod.cpp +++ b/plugins/channelrx/demoddsd/dsddemod.cpp @@ -38,6 +38,7 @@ #include "dsp/dspcommands.h" #include "device/deviceapi.h" #include "feature/feature.h" +#include "settings/serializable.h" #include "util/db.h" #include "maincore.h" @@ -436,6 +437,9 @@ void DSDDemod::webapiUpdateChannelSettings( if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { settings.m_reverseAPIChannelIndex = response.getDsdDemodSettings()->getReverseApiChannelIndex(); } + if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) { + settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getDsdDemodSettings()->getChannelMarker()); + } } int DSDDemod::webapiReportGet( @@ -497,6 +501,19 @@ void DSDDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& resp response.getDsdDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); 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) @@ -652,6 +669,13 @@ void DSDDemod::webapiFormatChannelSettings( if (channelSettingsKeys.contains("streamIndex") || force) { 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) diff --git a/plugins/channelrx/demoddsd/dsddemodgui.cpp b/plugins/channelrx/demoddsd/dsddemodgui.cpp index 34d966cf7..8a25c9803 100644 --- a/plugins/channelrx/demoddsd/dsddemodgui.cpp +++ b/plugins/channelrx/demoddsd/dsddemodgui.cpp @@ -89,6 +89,7 @@ bool DSDDemodGUI::handleMessage(const Message& message) const DSDDemod::MsgConfigureDSDDemod& cfg = (DSDDemod::MsgConfigureDSDDemod&) message; m_settings = cfg.getSettings(); blockApplySettings(true); + m_channelMarker.updateSettings(static_cast(m_settings.m_channelMarker)); displaySettings(); blockApplySettings(false); return true; diff --git a/plugins/channelrx/demoddsd/dsddemodsettings.cpp b/plugins/channelrx/demoddsd/dsddemodsettings.cpp index 2c99fd717..be27306dd 100644 --- a/plugins/channelrx/demoddsd/dsddemodsettings.cpp +++ b/plugins/channelrx/demoddsd/dsddemodsettings.cpp @@ -23,8 +23,7 @@ #include "dsddemodsettings.h" DSDDemodSettings::DSDDemodSettings() : - m_channelMarker(0), - m_scopeGUI(0) + m_channelMarker(nullptr) { resetToDefaults(); } @@ -73,11 +72,6 @@ QByteArray DSDDemodSettings::serialize() const s.writeU32(7, m_rgbColor); s.writeS32(8, m_squelchGate); s.writeS32(9, m_volume*10.0); - - if (m_scopeGUI) { - s.writeBlob(10, m_scopeGUI->serialize()); - } - s.writeS32(11, m_baudRate); s.writeBool(12, m_enableCosineFiltering); s.writeBool(13, m_syncOrConstellation); @@ -144,12 +138,6 @@ bool DSDDemodSettings::deserialize(const QByteArray& data) d.readS32(8, &m_squelchGate, 5); d.readS32(9, &tmp, 20); m_volume = tmp / 10.0; - - if (m_scopeGUI) { - d.readBlob(10, &bytetmp); - m_scopeGUI->deserialize(bytetmp); - } - d.readS32(11, &m_baudRate, 4800); d.readBool(12, &m_enableCosineFiltering, false); d.readBool(13, &m_syncOrConstellation, false); diff --git a/plugins/channelrx/demoddsd/dsddemodsettings.h b/plugins/channelrx/demoddsd/dsddemodsettings.h index 487b03223..12c907978 100644 --- a/plugins/channelrx/demoddsd/dsddemodsettings.h +++ b/plugins/channelrx/demoddsd/dsddemodsettings.h @@ -54,13 +54,11 @@ struct DSDDemodSettings uint16_t m_reverseAPIChannelIndex; Serializable *m_channelMarker; - Serializable *m_scopeGUI; QByteArray m_rollupState; DSDDemodSettings(); void resetToDefaults(); void setChannelMarker(Serializable *channelMarker) { m_channelMarker = channelMarker; } - void setScopeGUI(Serializable *scopeGUI) { m_scopeGUI = scopeGUI; } QByteArray serialize() const; bool deserialize(const QByteArray& data); }; diff --git a/plugins/channelrx/demodfreedv/freedvdemod.cpp b/plugins/channelrx/demodfreedv/freedvdemod.cpp index dbe5d3f2a..418d5afc2 100644 --- a/plugins/channelrx/demodfreedv/freedvdemod.cpp +++ b/plugins/channelrx/demodfreedv/freedvdemod.cpp @@ -345,6 +345,9 @@ void FreeDVDemod::webapiUpdateChannelSettings( if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) { 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( @@ -408,6 +411,20 @@ void FreeDVDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& r 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) @@ -518,12 +535,20 @@ void FreeDVDemod::webapiFormatChannelSettings( if (channelSettingsKeys.contains("streamIndex") || force) { swgFreeDVDemodSettings->setStreamIndex(settings.m_streamIndex); } + if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force)) { SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum(); settings.m_spectrumGUI->formatTo(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) diff --git a/plugins/channelrx/demodfreedv/freedvdemodgui.cpp b/plugins/channelrx/demodfreedv/freedvdemodgui.cpp index f835c7134..0dd72b933 100644 --- a/plugins/channelrx/demodfreedv/freedvdemodgui.cpp +++ b/plugins/channelrx/demodfreedv/freedvdemodgui.cpp @@ -84,6 +84,7 @@ bool FreeDVDemodGUI::handleMessage(const Message& message) m_settings = cfg.getSettings(); blockApplySettings(true); ui->spectrumGUI->updateSettings(); + m_channelMarker.updateSettings(static_cast(m_settings.m_channelMarker)); displaySettings(); blockApplySettings(false); return true; diff --git a/plugins/channelrx/demodnfm/nfmdemod.cpp b/plugins/channelrx/demodnfm/nfmdemod.cpp index 5658f60d9..96b3eaf61 100644 --- a/plugins/channelrx/demodnfm/nfmdemod.cpp +++ b/plugins/channelrx/demodnfm/nfmdemod.cpp @@ -36,6 +36,7 @@ #include "dsp/devicesamplemimo.h" #include "device/deviceapi.h" #include "feature/feature.h" +#include "settings/serializable.h" #include "util/db.h" #include "maincore.h" @@ -399,6 +400,9 @@ void NFMDemod::webapiUpdateChannelSettings( if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { settings.m_reverseAPIChannelIndex = response.getNfmDemodSettings()->getReverseApiChannelIndex(); } + if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) { + settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getNfmDemodSettings()->getChannelMarker()); + } } int NFMDemod::webapiReportGet( @@ -452,6 +456,20 @@ void NFMDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& resp response.getNfmDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort); response.getNfmDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); 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) @@ -588,6 +606,13 @@ void NFMDemod::webapiFormatChannelSettings( if (channelSettingsKeys.contains("streamIndex") || force) { 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) diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.cpp b/plugins/channelrx/demodnfm/nfmdemodgui.cpp index 47d669173..4759a1914 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.cpp +++ b/plugins/channelrx/demodnfm/nfmdemodgui.cpp @@ -75,6 +75,7 @@ bool NFMDemodGUI::handleMessage(const Message& message) const NFMDemod::MsgConfigureNFMDemod& cfg = (NFMDemod::MsgConfigureNFMDemod&) message; m_settings = cfg.getSettings(); blockApplySettings(true); + m_channelMarker.updateSettings(static_cast(m_settings.m_channelMarker)); displaySettings(); blockApplySettings(false); return true; diff --git a/plugins/channelrx/demodpacket/packetdemod.cpp b/plugins/channelrx/demodpacket/packetdemod.cpp index bbb2689a1..abe2164b9 100644 --- a/plugins/channelrx/demodpacket/packetdemod.cpp +++ b/plugins/channelrx/demodpacket/packetdemod.cpp @@ -37,6 +37,7 @@ #include "dsp/dspcommands.h" #include "device/deviceapi.h" #include "feature/feature.h" +#include "settings/serializable.h" #include "util/ax25.h" #include "util/db.h" #include "maincore.h" @@ -463,6 +464,9 @@ void PacketDemod::webapiUpdateChannelSettings( if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { 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) @@ -496,6 +500,20 @@ void PacketDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& r response.getPacketDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort); response.getPacketDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); 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) @@ -585,6 +603,13 @@ void PacketDemod::webapiFormatChannelSettings( if (channelSettingsKeys.contains("streamIndex") || force) { 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) diff --git a/plugins/channelrx/demodpacket/packetdemodgui.cpp b/plugins/channelrx/demodpacket/packetdemodgui.cpp index 5ea53ecc1..de4d2e1a8 100644 --- a/plugins/channelrx/demodpacket/packetdemodgui.cpp +++ b/plugins/channelrx/demodpacket/packetdemodgui.cpp @@ -203,6 +203,7 @@ bool PacketDemodGUI::handleMessage(const Message& message) const PacketDemod::MsgConfigurePacketDemod& cfg = (PacketDemod::MsgConfigurePacketDemod&) message; m_settings = cfg.getSettings(); blockApplySettings(true); + m_channelMarker.updateSettings(static_cast(m_settings.m_channelMarker)); displaySettings(); blockApplySettings(false); return true; diff --git a/plugins/channelrx/demodpager/pagerdemod.cpp b/plugins/channelrx/demodpager/pagerdemod.cpp index aad6f12ff..90d40fe87 100644 --- a/plugins/channelrx/demodpager/pagerdemod.cpp +++ b/plugins/channelrx/demodpager/pagerdemod.cpp @@ -446,6 +446,12 @@ void PagerDemod::webapiUpdateChannelSettings( if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { 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) @@ -481,6 +487,35 @@ void PagerDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& re response.getPagerDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort); response.getPagerDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); 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) @@ -576,6 +611,20 @@ void PagerDemod::webapiFormatChannelSettings( if (channelSettingsKeys.contains("streamIndex") || force) { 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) diff --git a/plugins/channelrx/demodpager/pagerdemodgui.cpp b/plugins/channelrx/demodpager/pagerdemodgui.cpp index 08dedfec0..e6488e83e 100644 --- a/plugins/channelrx/demodpager/pagerdemodgui.cpp +++ b/plugins/channelrx/demodpager/pagerdemodgui.cpp @@ -256,6 +256,8 @@ bool PagerDemodGUI::handleMessage(const Message& message) const PagerDemod::MsgConfigurePagerDemod& cfg = (PagerDemod::MsgConfigurePagerDemod&) message; m_settings = cfg.getSettings(); blockApplySettings(true); + ui->scopeGUI->updateSettings(); + m_channelMarker.updateSettings(static_cast(m_settings.m_channelMarker)); displaySettings(); blockApplySettings(false); return true; diff --git a/plugins/channelrx/demodssb/ssbdemod.cpp b/plugins/channelrx/demodssb/ssbdemod.cpp index 3a843ee1a..c9871ff30 100644 --- a/plugins/channelrx/demodssb/ssbdemod.cpp +++ b/plugins/channelrx/demodssb/ssbdemod.cpp @@ -420,6 +420,9 @@ void SSBDemod::webapiUpdateChannelSettings( if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) { 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( @@ -490,6 +493,20 @@ void SSBDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& resp 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) @@ -621,12 +638,20 @@ void SSBDemod::webapiFormatChannelSettings( if (channelSettingsKeys.contains("streamIndex") || force) { swgSSBDemodSettings->setStreamIndex(settings.m_streamIndex); } + if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force)) { SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum(); settings.m_spectrumGUI->formatTo(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) diff --git a/plugins/channelrx/demodssb/ssbdemodgui.cpp b/plugins/channelrx/demodssb/ssbdemodgui.cpp index 98501153b..422c75ef8 100644 --- a/plugins/channelrx/demodssb/ssbdemodgui.cpp +++ b/plugins/channelrx/demodssb/ssbdemodgui.cpp @@ -70,6 +70,7 @@ bool SSBDemodGUI::handleMessage(const Message& message) m_settings = cfg.getSettings(); blockApplySettings(true); ui->spectrumGUI->updateSettings(); + m_channelMarker.updateSettings(static_cast(m_settings.m_channelMarker)); displaySettings(); blockApplySettings(false); return true; diff --git a/plugins/channelrx/filesink/filesink.cpp b/plugins/channelrx/filesink/filesink.cpp index 06f1127ef..3017bc05e 100644 --- a/plugins/channelrx/filesink/filesink.cpp +++ b/plugins/channelrx/filesink/filesink.cpp @@ -497,6 +497,9 @@ void FileSink::webapiUpdateChannelSettings( if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) { 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) @@ -549,6 +552,20 @@ void FileSink::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& resp 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) @@ -659,12 +676,20 @@ void FileSink::webapiFormatChannelSettings( if (channelSettingsKeys.contains("streamIndex")) { swgFileSinkSettings->setStreamIndex(settings.m_streamIndex); } + if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force)) { SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum(); settings.m_spectrumGUI->formatTo(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) diff --git a/plugins/channelrx/filesink/filesinkgui.cpp b/plugins/channelrx/filesink/filesinkgui.cpp index 5fe8071b9..d7319a40c 100644 --- a/plugins/channelrx/filesink/filesinkgui.cpp +++ b/plugins/channelrx/filesink/filesinkgui.cpp @@ -97,6 +97,7 @@ bool FileSinkGUI::handleMessage(const Message& message) m_settings = cfg.getSettings(); blockApplySettings(true); ui->glSpectrumGUI->updateSettings(); + m_channelMarker.updateSettings(static_cast(m_settings.m_channelMarker)); displaySettings(); blockApplySettings(false); return true; @@ -208,6 +209,7 @@ FileSinkGUI::FileSinkGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban m_channelMarker.blockSignals(false); m_channelMarker.setVisible(true); // activate signal on the last setting only + m_settings.setChannelMarker(&m_channelMarker); m_settings.setSpectrumGUI(ui->glSpectrumGUI); m_deviceUISet->addChannelMarker(&m_channelMarker); diff --git a/plugins/channelrx/filesink/filesinksettings.h b/plugins/channelrx/filesink/filesinksettings.h index ee628c608..2e3c33647 100644 --- a/plugins/channelrx/filesink/filesinksettings.h +++ b/plugins/channelrx/filesink/filesinksettings.h @@ -43,11 +43,13 @@ struct FileSinkSettings uint16_t m_reverseAPIChannelIndex; Serializable *m_spectrumGUI; + Serializable *m_channelMarker; QByteArray m_rollupState; FileSinkSettings(); void resetToDefaults(); void setSpectrumGUI(Serializable *spectrumGUI) { m_spectrumGUI = spectrumGUI; } + void setChannelMarker(Serializable *channelMarker) { m_channelMarker = channelMarker; } QByteArray serialize() const; bool deserialize(const QByteArray& data); diff --git a/plugins/channelrx/freqtracker/freqtracker.cpp b/plugins/channelrx/freqtracker/freqtracker.cpp index 3cc4d979c..d9b77ba75 100644 --- a/plugins/channelrx/freqtracker/freqtracker.cpp +++ b/plugins/channelrx/freqtracker/freqtracker.cpp @@ -402,6 +402,9 @@ void FreqTracker::webapiUpdateChannelSettings( if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) { 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( @@ -463,6 +466,20 @@ void FreqTracker::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& r 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) @@ -585,12 +602,20 @@ void FreqTracker::webapiFormatChannelSettings( if (channelSettingsKeys.contains("streamIndex") || force) { swgFreqTrackerSettings->setStreamIndex(settings.m_streamIndex); } + if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force)) { SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum(); settings.m_spectrumGUI->formatTo(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) diff --git a/plugins/channelrx/freqtracker/freqtrackergui.cpp b/plugins/channelrx/freqtracker/freqtrackergui.cpp index b15248d3b..b65904173 100644 --- a/plugins/channelrx/freqtracker/freqtrackergui.cpp +++ b/plugins/channelrx/freqtracker/freqtrackergui.cpp @@ -82,6 +82,7 @@ bool FreqTrackerGUI::handleMessage(const Message& message) m_settings = cfg.getSettings(); blockApplySettings(true); ui->spectrumGUI->updateSettings(); + m_channelMarker.updateSettings(static_cast(m_settings.m_channelMarker)); displaySettings(); blockApplySettings(false); return true; diff --git a/plugins/channelrx/localsink/localsink.cpp b/plugins/channelrx/localsink/localsink.cpp index ba2a453c1..5e8b3a10a 100644 --- a/plugins/channelrx/localsink/localsink.cpp +++ b/plugins/channelrx/localsink/localsink.cpp @@ -34,6 +34,7 @@ #include "dsp/devicesamplemimo.h" #include "device/deviceapi.h" #include "feature/feature.h" +#include "settings/serializable.h" #include "maincore.h" #include "localsinkbaseband.h" @@ -411,6 +412,9 @@ void LocalSink::webapiUpdateChannelSettings( if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { 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) @@ -439,6 +443,20 @@ void LocalSink::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& res response.getLocalSinkSettings()->setReverseApiPort(settings.m_reverseAPIPort); response.getLocalSinkSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); 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& channelSettingsKeys, const LocalSinkSettings& settings, bool force) @@ -525,6 +543,13 @@ void LocalSink::webapiFormatChannelSettings( if (channelSettingsKeys.contains("streamIndex") || force) { 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) diff --git a/plugins/channelrx/localsink/localsinkgui.cpp b/plugins/channelrx/localsink/localsinkgui.cpp index 1b0d30312..531048768 100644 --- a/plugins/channelrx/localsink/localsinkgui.cpp +++ b/plugins/channelrx/localsink/localsinkgui.cpp @@ -82,6 +82,7 @@ bool LocalSinkGUI::handleMessage(const Message& message) const LocalSink::MsgConfigureLocalSink& cfg = (LocalSink::MsgConfigureLocalSink&) message; m_settings = cfg.getSettings(); blockApplySettings(true); + m_channelMarker.updateSettings(static_cast(m_settings.m_channelMarker)); displaySettings(); blockApplySettings(false); return true; diff --git a/plugins/channelrx/noisefigure/noisefigure.cpp b/plugins/channelrx/noisefigure/noisefigure.cpp index bbb07c2af..1ea956b6e 100644 --- a/plugins/channelrx/noisefigure/noisefigure.cpp +++ b/plugins/channelrx/noisefigure/noisefigure.cpp @@ -643,6 +643,9 @@ void NoiseFigure::webapiUpdateChannelSettings( if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { 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) @@ -668,6 +671,20 @@ void NoiseFigure::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& r response.getNoiseFigureSettings()->setReverseApiPort(settings.m_reverseAPIPort); response.getNoiseFigureSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); 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& channelSettingsKeys, const NoiseFigureSettings& settings, bool force) @@ -768,6 +785,13 @@ void NoiseFigure::webapiFormatChannelSettings( if (channelSettingsKeys.contains("streamIndex") || force) { 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) diff --git a/plugins/channelrx/noisefigure/noisefiguregui.cpp b/plugins/channelrx/noisefigure/noisefiguregui.cpp index 2815524fd..8daea300f 100644 --- a/plugins/channelrx/noisefigure/noisefiguregui.cpp +++ b/plugins/channelrx/noisefigure/noisefiguregui.cpp @@ -280,6 +280,7 @@ bool NoiseFigureGUI::handleMessage(const Message& message) const NoiseFigure::MsgConfigureNoiseFigure& cfg = (NoiseFigure::MsgConfigureNoiseFigure&) message; m_settings = cfg.getSettings(); blockApplySettings(true); + m_channelMarker.updateSettings(static_cast(m_settings.m_channelMarker)); displaySettings(); blockApplySettings(false); return true; diff --git a/plugins/channelrx/radioastronomy/radioastronomy.cpp b/plugins/channelrx/radioastronomy/radioastronomy.cpp index 788b4fe6c..f90d8ffc9 100644 --- a/plugins/channelrx/radioastronomy/radioastronomy.cpp +++ b/plugins/channelrx/radioastronomy/radioastronomy.cpp @@ -908,6 +908,9 @@ void RadioAstronomy::webapiUpdateChannelSettings( if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { 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) @@ -955,6 +958,20 @@ void RadioAstronomy::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings response.getRadioAstronomySettings()->setReverseApiPort(settings.m_reverseAPIPort); response.getRadioAstronomySettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); 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& channelSettingsKeys, const RadioAstronomySettings& settings, bool force) @@ -1073,6 +1090,13 @@ void RadioAstronomy::webapiFormatChannelSettings( if (channelSettingsKeys.contains("streamIndex") || force) { 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) diff --git a/plugins/channelrx/radioastronomy/radioastronomygui.cpp b/plugins/channelrx/radioastronomy/radioastronomygui.cpp index 177e95c35..c1e3eb634 100644 --- a/plugins/channelrx/radioastronomy/radioastronomygui.cpp +++ b/plugins/channelrx/radioastronomy/radioastronomygui.cpp @@ -1022,6 +1022,7 @@ bool RadioAstronomyGUI::handleMessage(const Message& message) const RadioAstronomy::MsgConfigureRadioAstronomy& cfg = (RadioAstronomy::MsgConfigureRadioAstronomy&) message; m_settings = cfg.getSettings(); blockApplySettings(true); + m_channelMarker.updateSettings(static_cast(m_settings.m_channelMarker)); displaySettings(); blockApplySettings(false); return true; diff --git a/plugins/channelrx/radioclock/radioclock.cpp b/plugins/channelrx/radioclock/radioclock.cpp index 20786da93..c8941c9f2 100644 --- a/plugins/channelrx/radioclock/radioclock.cpp +++ b/plugins/channelrx/radioclock/radioclock.cpp @@ -333,6 +333,12 @@ void RadioClock::webapiUpdateChannelSettings( if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { 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) @@ -362,6 +368,34 @@ void RadioClock::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& re response.getRadioClockSettings()->setReverseApiPort(settings.m_reverseAPIPort); response.getRadioClockSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); 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) @@ -452,6 +486,20 @@ void RadioClock::webapiFormatChannelSettings( if (channelSettingsKeys.contains("streamIndex") || force) { 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) diff --git a/plugins/channelrx/radioclock/radioclockgui.cpp b/plugins/channelrx/radioclock/radioclockgui.cpp index 25a18dbf9..dc26c2cd4 100644 --- a/plugins/channelrx/radioclock/radioclockgui.cpp +++ b/plugins/channelrx/radioclock/radioclockgui.cpp @@ -95,6 +95,8 @@ bool RadioClockGUI::handleMessage(const Message& message) const RadioClock::MsgConfigureRadioClock& cfg = (RadioClock::MsgConfigureRadioClock&) message; m_settings = cfg.getSettings(); blockApplySettings(true); + ui->scopeGUI->updateSettings(); + m_channelMarker.updateSettings(static_cast(m_settings.m_channelMarker)); displaySettings(); blockApplySettings(false); return true; diff --git a/plugins/channelrx/remotesink/remotesink.cpp b/plugins/channelrx/remotesink/remotesink.cpp index 46c6e6886..4dc1fba00 100644 --- a/plugins/channelrx/remotesink/remotesink.cpp +++ b/plugins/channelrx/remotesink/remotesink.cpp @@ -37,6 +37,7 @@ #include "dsp/dspdevicesourceengine.h" #include "device/deviceapi.h" #include "feature/feature.h" +#include "settings/serializable.h" #include "maincore.h" #include "remotesinkbaseband.h" @@ -382,6 +383,9 @@ void RemoteSink::webapiUpdateChannelSettings( if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { 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) @@ -418,6 +422,20 @@ void RemoteSink::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& re response.getRemoteSinkSettings()->setReverseApiPort(settings.m_reverseAPIPort); response.getRemoteSinkSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); 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& channelSettingsKeys, const RemoteSinkSettings& settings, bool force) @@ -511,6 +529,13 @@ void RemoteSink::webapiFormatChannelSettings( if (channelSettingsKeys.contains("streamIndex") || force) { 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) diff --git a/plugins/channelrx/remotesink/remotesinkgui.cpp b/plugins/channelrx/remotesink/remotesinkgui.cpp index e55c43a90..b48804d52 100644 --- a/plugins/channelrx/remotesink/remotesinkgui.cpp +++ b/plugins/channelrx/remotesink/remotesinkgui.cpp @@ -70,6 +70,7 @@ bool RemoteSinkGUI::handleMessage(const Message& message) const RemoteSink::MsgConfigureRemoteSink& cfg = (RemoteSink::MsgConfigureRemoteSink&) message; m_settings = cfg.getSettings(); blockApplySettings(true); + m_channelMarker.updateSettings(static_cast(m_settings.m_channelMarker)); displaySettings(); blockApplySettings(false); diff --git a/plugins/channelrx/sigmffilesink/sigmffilesink.cpp b/plugins/channelrx/sigmffilesink/sigmffilesink.cpp index 5b0eb566a..582c97a8f 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesink.cpp +++ b/plugins/channelrx/sigmffilesink/sigmffilesink.cpp @@ -497,6 +497,9 @@ void SigMFFileSink::webapiUpdateChannelSettings( if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) { 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) @@ -549,6 +552,20 @@ void SigMFFileSink::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& 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) @@ -659,12 +676,20 @@ void SigMFFileSink::webapiFormatChannelSettings( if (channelSettingsKeys.contains("streamIndex")) { swgSigMFFileSinkSettings->setStreamIndex(settings.m_streamIndex); } + if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force)) { SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum(); settings.m_spectrumGUI->formatTo(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) diff --git a/plugins/channelrx/sigmffilesink/sigmffilesinkgui.cpp b/plugins/channelrx/sigmffilesink/sigmffilesinkgui.cpp index ae0fd726e..d0c29c4c0 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesinkgui.cpp +++ b/plugins/channelrx/sigmffilesink/sigmffilesinkgui.cpp @@ -96,6 +96,7 @@ bool SigMFFileSinkGUI::handleMessage(const Message& message) m_settings = cfg.getSettings(); blockApplySettings(true); ui->glSpectrumGUI->updateSettings(); + m_channelMarker.updateSettings(static_cast(m_settings.m_channelMarker)); displaySettings(); blockApplySettings(false); return true; @@ -196,6 +197,7 @@ SigMFFileSinkGUI::SigMFFileSinkGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISe m_channelMarker.setVisible(true); // activate signal on the last setting only m_settings.setSpectrumGUI(ui->glSpectrumGUI); + m_settings.setChannelMarker(&m_channelMarker); m_deviceUISet->addChannelMarker(&m_channelMarker); m_deviceUISet->addRollupWidget(this); diff --git a/plugins/channelrx/sigmffilesink/sigmffilesinksettings.h b/plugins/channelrx/sigmffilesink/sigmffilesinksettings.h index f50063cc2..02a8172e0 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesinksettings.h +++ b/plugins/channelrx/sigmffilesink/sigmffilesinksettings.h @@ -44,11 +44,13 @@ struct SigMFFileSinkSettings uint16_t m_reverseAPIChannelIndex; Serializable *m_spectrumGUI; + Serializable *m_channelMarker; QByteArray m_rollupState; SigMFFileSinkSettings(); void resetToDefaults(); void setSpectrumGUI(Serializable *spectrumGUI) { m_spectrumGUI = spectrumGUI; } + void setChannelMarker(Serializable *channelMarker) { m_channelMarker = channelMarker; } QByteArray serialize() const; bool deserialize(const QByteArray& data); diff --git a/plugins/channelrx/udpsink/udpsink.cpp b/plugins/channelrx/udpsink/udpsink.cpp index 94c5dc5c3..aeec2253c 100644 --- a/plugins/channelrx/udpsink/udpsink.cpp +++ b/plugins/channelrx/udpsink/udpsink.cpp @@ -388,6 +388,9 @@ void UDPSink::webapiUpdateChannelSettings( if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) { 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( @@ -460,6 +463,20 @@ void UDPSink::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respo 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) @@ -593,12 +610,20 @@ void UDPSink::webapiFormatChannelSettings( if (channelSettingsKeys.contains("streamIndex") || force) { swgUDPSinkSettings->setStreamIndex(settings.m_streamIndex); } + if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force)) { SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum(); settings.m_spectrumGUI->formatTo(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) diff --git a/plugins/channelrx/udpsink/udpsinkgui.cpp b/plugins/channelrx/udpsink/udpsinkgui.cpp index 62a1cc4e6..ec11e5907 100644 --- a/plugins/channelrx/udpsink/udpsinkgui.cpp +++ b/plugins/channelrx/udpsink/udpsinkgui.cpp @@ -76,6 +76,7 @@ bool UDPSinkGUI::handleMessage(const Message& message ) m_settings = cfg.getSettings(); blockApplySettings(true); ui->spectrumGUI->updateSettings(); + m_channelMarker.updateSettings(static_cast(m_settings.m_channelMarker)); displaySettings(); blockApplySettings(false); return true; diff --git a/sdrbase/dsp/channelmarker.cpp b/sdrbase/dsp/channelmarker.cpp index a66aed5d3..e9d74e0bf 100644 --- a/sdrbase/dsp/channelmarker.cpp +++ b/sdrbase/dsp/channelmarker.cpp @@ -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) { m_enabledStreamsBits |= (1<
- Generated 2021-12-01T01:10:25.279+01:00 + Generated 2021-12-02T23:38:15.455+01:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/ADSBDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/ADSBDemod.yaml index 70a53f15a..32fff1cf7 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/ADSBDemod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/ADSBDemod.yaml @@ -73,6 +73,8 @@ ADSBDemodSettings: type: integer reverseAPIChannelIndex: type: integer + channelMarker: + $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" ADSBDemodReport: description: ADSBDemod diff --git a/sdrbase/resources/webapi/doc/swagger/include/AISDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/AISDemod.yaml index ec4c32bfd..acb5930e5 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/AISDemod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/AISDemod.yaml @@ -50,6 +50,10 @@ AISDemodSettings: type: integer reverseAPIChannelIndex: type: integer + scopeConfig: + $ref: "/doc/swagger/include/GLScope.yaml#/GLScope" + channelMarker: + $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" AISDemodReport: description: AISDemod diff --git a/sdrbase/resources/webapi/doc/swagger/include/AMDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/AMDemod.yaml index 506b9a28f..8fb64d17d 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/AMDemod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/AMDemod.yaml @@ -47,6 +47,8 @@ AMDemodSettings: type: integer reverseAPIChannelIndex: type: integer + channelMarker: + $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" AMDemodReport: description: AMDemod diff --git a/sdrbase/resources/webapi/doc/swagger/include/APTDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/APTDemod.yaml index 01a7a4059..5ef2c8795 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/APTDemod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/APTDemod.yaml @@ -16,7 +16,7 @@ APTDemodSettings: description: crop noise from top and bottom of image type: integer denoise: - description: apply denoise filter to image + description: apply denoise filter to image type: integer linearEqualise: description: apply linear equalisation to image @@ -44,7 +44,7 @@ APTDemodSettings: type: string autoSaveMinScanLines: desciption: minimum number of scanlines (after cropping) for an image to be automatically saved - type: integer + type: integer rgbColor: type: integer title: @@ -63,6 +63,8 @@ APTDemodSettings: type: integer reverseAPIChannelIndex: type: integer + channelMarker: + $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" APTDemodActions: description: APTDemod diff --git a/sdrbase/resources/webapi/doc/swagger/include/BFMDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/BFMDemod.yaml index e250b84c7..ee2da80a7 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/BFMDemod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/BFMDemod.yaml @@ -46,6 +46,8 @@ BFMDemodSettings: type: integer spectrumConfig: $ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum" + channelMarker: + $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" BFMDemodReport: description: BFMDemod diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChirpChatDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChirpChatDemod.yaml index 4d1dcd50a..c3d2c7ec9 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/ChirpChatDemod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/ChirpChatDemod.yaml @@ -120,6 +120,8 @@ ChirpChatDemodSettings: type: integer spectrumConfig: $ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum" + channelMarker: + $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" ChirpChatDemodReport: description: ChirpChatDemod diff --git a/sdrbase/resources/webapi/doc/swagger/include/DABDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/DABDemod.yaml index 90e1ed840..98cdfbc19 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/DABDemod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/DABDemod.yaml @@ -34,3 +34,5 @@ DABDemodSettings: type: integer reverseAPIChannelIndex: type: integer + channelMarker: + $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" diff --git a/sdrbase/resources/webapi/doc/swagger/include/DATVDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/DATVDemod.yaml index 1d4dbd076..af5b0a38c 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/DATVDemod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/DATVDemod.yaml @@ -121,6 +121,8 @@ DATVDemodSettings: type: integer reverseAPIChannelIndex: type: integer + channelMarker: + $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" DATVDemodReport: description: DATVDemod diff --git a/sdrbase/resources/webapi/doc/swagger/include/DSDDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/DSDDemod.yaml index c98268263..1b19c0f86 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/DSDDemod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/DSDDemod.yaml @@ -68,6 +68,8 @@ DSDDemodSettings: type: integer reverseAPIChannelIndex: type: integer + channelMarker: + $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" DSDDemodReport: description: DSDDemod diff --git a/sdrbase/resources/webapi/doc/swagger/include/FileSink.yaml b/sdrbase/resources/webapi/doc/swagger/include/FileSink.yaml index d25f62bde..1f67d0a38 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/FileSink.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/FileSink.yaml @@ -50,6 +50,8 @@ FileSinkSettings: type: integer spectrumConfig: $ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum" + channelMarker: + $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" FileSinkReport: description: FileSink diff --git a/sdrbase/resources/webapi/doc/swagger/include/FreeDVDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/FreeDVDemod.yaml index 70e5ab594..0b1c6b49a 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/FreeDVDemod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/FreeDVDemod.yaml @@ -44,6 +44,8 @@ FreeDVDemodSettings: type: integer spectrumConfig: $ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum" + channelMarker: + $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" FreeDVDemodReport: description: FreeDVDemod diff --git a/sdrbase/resources/webapi/doc/swagger/include/FreqTracker.yaml b/sdrbase/resources/webapi/doc/swagger/include/FreqTracker.yaml index 2607619bd..684e69943 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/FreqTracker.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/FreqTracker.yaml @@ -59,6 +59,8 @@ FreqTrackerSettings: type: integer spectrumConfig: $ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum" + channelMarker: + $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" FreqTrackerReport: description: FreqTracker diff --git a/sdrbase/resources/webapi/doc/swagger/include/LocalSink.yaml b/sdrbase/resources/webapi/doc/swagger/include/LocalSink.yaml index 63896856a..6eddee8de 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/LocalSink.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/LocalSink.yaml @@ -29,3 +29,5 @@ LocalSinkSettings: type: integer reverseAPIChannelIndex: type: integer + channelMarker: + $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" diff --git a/sdrbase/resources/webapi/doc/swagger/include/NFMDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/NFMDemod.yaml index 1bed5f16f..5a501c7b0 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/NFMDemod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/NFMDemod.yaml @@ -55,6 +55,8 @@ NFMDemodSettings: type: integer reverseAPIChannelIndex: type: integer + channelMarker: + $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" NFMDemodReport: description: NFMDemod diff --git a/sdrbase/resources/webapi/doc/swagger/include/NoiseFigure.yaml b/sdrbase/resources/webapi/doc/swagger/include/NoiseFigure.yaml index fa5c1c27e..cc48b3502 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/NoiseFigure.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/NoiseFigure.yaml @@ -58,6 +58,8 @@ NoiseFigureSettings: type: integer reverseAPIChannelIndex: type: integer + channelMarker: + $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" NoiseFigureReport: description: NoiseFigure diff --git a/sdrbase/resources/webapi/doc/swagger/include/PacketDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/PacketDemod.yaml index be5d00308..cb27f8324 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/PacketDemod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/PacketDemod.yaml @@ -46,6 +46,8 @@ PacketDemodSettings: type: integer reverseAPIChannelIndex: type: integer + channelMarker: + $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" PacketDemodReport: description: AMDemod diff --git a/sdrbase/resources/webapi/doc/swagger/include/PagerDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/PagerDemod.yaml index d38b98bee..6975df164 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/PagerDemod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/PagerDemod.yaml @@ -65,6 +65,10 @@ PagerDemodSettings: type: integer reverseAPIChannelIndex: type: integer + scopeConfig: + $ref: "/doc/swagger/include/GLScope.yaml#/GLScope" + channelMarker: + $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" PagerDemodReport: description: PagerDemod diff --git a/sdrbase/resources/webapi/doc/swagger/include/RadioAstronomy.yaml b/sdrbase/resources/webapi/doc/swagger/include/RadioAstronomy.yaml index 4362bc140..ea352db22 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/RadioAstronomy.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/RadioAstronomy.yaml @@ -73,6 +73,8 @@ RadioAstronomySettings: type: integer reverseAPIChannelIndex: type: integer + channelMarker: + $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" RadioAstronomyReport: description: RadioAstronomy diff --git a/sdrbase/resources/webapi/doc/swagger/include/RadioClock.yaml b/sdrbase/resources/webapi/doc/swagger/include/RadioClock.yaml index c7dcc78ec..2da1ccf59 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/RadioClock.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/RadioClock.yaml @@ -36,6 +36,10 @@ RadioClockSettings: type: integer reverseAPIChannelIndex: type: integer + scopeConfig: + $ref: "/doc/swagger/include/GLScope.yaml#/GLScope" + channelMarker: + $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" RadioClockReport: description: RadioClock diff --git a/sdrbase/resources/webapi/doc/swagger/include/RemoteSink.yaml b/sdrbase/resources/webapi/doc/swagger/include/RemoteSink.yaml index 806add23c..89d2e2a29 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/RemoteSink.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/RemoteSink.yaml @@ -35,3 +35,5 @@ RemoteSinkSettings: type: integer reverseAPIChannelIndex: type: integer + channelMarker: + $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" diff --git a/sdrbase/resources/webapi/doc/swagger/include/SSBDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/SSBDemod.yaml index 0c4bca4a2..39c2e09ba 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/SSBDemod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/SSBDemod.yaml @@ -64,6 +64,8 @@ SSBDemodSettings: type: integer spectrumConfig: $ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum" + channelMarker: + $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" SSBDemodReport: description: SSBDemod diff --git a/sdrbase/resources/webapi/doc/swagger/include/SigMFFileSink.yaml b/sdrbase/resources/webapi/doc/swagger/include/SigMFFileSink.yaml index 8fa12e57e..40e040376 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/SigMFFileSink.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/SigMFFileSink.yaml @@ -50,6 +50,8 @@ SigMFFileSinkSettings: type: integer spectrumConfig: $ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum" + channelMarker: + $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" SigMFFileSinkReport: description: SigMFFileSink diff --git a/sdrbase/resources/webapi/doc/swagger/include/UDPSink.yaml b/sdrbase/resources/webapi/doc/swagger/include/UDPSink.yaml index ceb1dd0d0..204c89526 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/UDPSink.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/UDPSink.yaml @@ -71,6 +71,8 @@ UDPSinkSettings: type: integer spectrumConfig: $ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum" + channelMarker: + $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" UDPSinkReport: description: UDPSink diff --git a/sdrbase/resources/webapi/doc/swagger/include/VORDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/VORDemod.yaml index 475979a9d..57a151ff3 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/VORDemod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/VORDemod.yaml @@ -36,6 +36,8 @@ VORDemodSettings: magDecAdjust: description: Adjust radial lines on map for magnetic declination of VOR type: integer + channelMarker: + $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" VORDemodReport: description: VORDemod diff --git a/sdrbase/resources/webapi/doc/swagger/include/VORDemodSC.yaml b/sdrbase/resources/webapi/doc/swagger/include/VORDemodSC.yaml index 2d7b1a9aa..812968d11 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/VORDemodSC.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/VORDemodSC.yaml @@ -39,6 +39,8 @@ VORDemodSCSettings: identThreshold: description: Morse code ident threshold (linear SNR) type: integer + channelMarker: + $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" VORDemodSCReport: description: VORDemodSC diff --git a/sdrbase/resources/webapi/doc/swagger/include/WFMDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/WFMDemod.yaml index 2c01c4cec..0d4d25df0 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/WFMDemod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/WFMDemod.yaml @@ -39,6 +39,8 @@ WFMDemodSettings: type: integer reverseAPIChannelIndex: type: integer + channelMarker: + $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" WFMDemodReport: description: WFMDemod diff --git a/swagger/sdrangel/api/swagger/include/ADSBDemod.yaml b/swagger/sdrangel/api/swagger/include/ADSBDemod.yaml index 70a53f15a..7ba2d42df 100644 --- a/swagger/sdrangel/api/swagger/include/ADSBDemod.yaml +++ b/swagger/sdrangel/api/swagger/include/ADSBDemod.yaml @@ -73,6 +73,8 @@ ADSBDemodSettings: type: integer reverseAPIChannelIndex: type: integer + channelMarker: + $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker" ADSBDemodReport: description: ADSBDemod diff --git a/swagger/sdrangel/api/swagger/include/AISDemod.yaml b/swagger/sdrangel/api/swagger/include/AISDemod.yaml index ec4c32bfd..2b4e72358 100644 --- a/swagger/sdrangel/api/swagger/include/AISDemod.yaml +++ b/swagger/sdrangel/api/swagger/include/AISDemod.yaml @@ -50,6 +50,10 @@ AISDemodSettings: type: integer reverseAPIChannelIndex: 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: description: AISDemod diff --git a/swagger/sdrangel/api/swagger/include/AMDemod.yaml b/swagger/sdrangel/api/swagger/include/AMDemod.yaml index 506b9a28f..6e0977af5 100644 --- a/swagger/sdrangel/api/swagger/include/AMDemod.yaml +++ b/swagger/sdrangel/api/swagger/include/AMDemod.yaml @@ -47,6 +47,8 @@ AMDemodSettings: type: integer reverseAPIChannelIndex: type: integer + channelMarker: + $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker" AMDemodReport: description: AMDemod diff --git a/swagger/sdrangel/api/swagger/include/APTDemod.yaml b/swagger/sdrangel/api/swagger/include/APTDemod.yaml index 01a7a4059..8e7dd6383 100644 --- a/swagger/sdrangel/api/swagger/include/APTDemod.yaml +++ b/swagger/sdrangel/api/swagger/include/APTDemod.yaml @@ -16,7 +16,7 @@ APTDemodSettings: description: crop noise from top and bottom of image type: integer denoise: - description: apply denoise filter to image + description: apply denoise filter to image type: integer linearEqualise: description: apply linear equalisation to image @@ -44,7 +44,7 @@ APTDemodSettings: type: string autoSaveMinScanLines: desciption: minimum number of scanlines (after cropping) for an image to be automatically saved - type: integer + type: integer rgbColor: type: integer title: @@ -63,6 +63,8 @@ APTDemodSettings: type: integer reverseAPIChannelIndex: type: integer + channelMarker: + $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker" APTDemodActions: description: APTDemod diff --git a/swagger/sdrangel/api/swagger/include/BFMDemod.yaml b/swagger/sdrangel/api/swagger/include/BFMDemod.yaml index a9fdc7707..1d6fbf29b 100644 --- a/swagger/sdrangel/api/swagger/include/BFMDemod.yaml +++ b/swagger/sdrangel/api/swagger/include/BFMDemod.yaml @@ -46,6 +46,8 @@ BFMDemodSettings: type: integer spectrumConfig: $ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum" + channelMarker: + $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker" BFMDemodReport: description: BFMDemod diff --git a/swagger/sdrangel/api/swagger/include/ChirpChatDemod.yaml b/swagger/sdrangel/api/swagger/include/ChirpChatDemod.yaml index bf2829ff4..89e64053a 100644 --- a/swagger/sdrangel/api/swagger/include/ChirpChatDemod.yaml +++ b/swagger/sdrangel/api/swagger/include/ChirpChatDemod.yaml @@ -120,6 +120,8 @@ ChirpChatDemodSettings: type: integer spectrumConfig: $ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum" + channelMarker: + $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker" ChirpChatDemodReport: description: ChirpChatDemod diff --git a/swagger/sdrangel/api/swagger/include/DABDemod.yaml b/swagger/sdrangel/api/swagger/include/DABDemod.yaml index 90e1ed840..bb958bce0 100644 --- a/swagger/sdrangel/api/swagger/include/DABDemod.yaml +++ b/swagger/sdrangel/api/swagger/include/DABDemod.yaml @@ -34,3 +34,5 @@ DABDemodSettings: type: integer reverseAPIChannelIndex: type: integer + channelMarker: + $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker" diff --git a/swagger/sdrangel/api/swagger/include/DATVDemod.yaml b/swagger/sdrangel/api/swagger/include/DATVDemod.yaml index 1d4dbd076..38b23e1c0 100644 --- a/swagger/sdrangel/api/swagger/include/DATVDemod.yaml +++ b/swagger/sdrangel/api/swagger/include/DATVDemod.yaml @@ -121,6 +121,8 @@ DATVDemodSettings: type: integer reverseAPIChannelIndex: type: integer + channelMarker: + $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker" DATVDemodReport: description: DATVDemod diff --git a/swagger/sdrangel/api/swagger/include/DSDDemod.yaml b/swagger/sdrangel/api/swagger/include/DSDDemod.yaml index c98268263..3dce7ed4a 100644 --- a/swagger/sdrangel/api/swagger/include/DSDDemod.yaml +++ b/swagger/sdrangel/api/swagger/include/DSDDemod.yaml @@ -68,6 +68,8 @@ DSDDemodSettings: type: integer reverseAPIChannelIndex: type: integer + channelMarker: + $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker" DSDDemodReport: description: DSDDemod diff --git a/swagger/sdrangel/api/swagger/include/FileSink.yaml b/swagger/sdrangel/api/swagger/include/FileSink.yaml index d154b3564..04edfffe2 100644 --- a/swagger/sdrangel/api/swagger/include/FileSink.yaml +++ b/swagger/sdrangel/api/swagger/include/FileSink.yaml @@ -50,6 +50,8 @@ FileSinkSettings: type: integer spectrumConfig: $ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum" + channelMarker: + $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker" FileSinkReport: description: FileSink diff --git a/swagger/sdrangel/api/swagger/include/FreeDVDemod.yaml b/swagger/sdrangel/api/swagger/include/FreeDVDemod.yaml index 0dd230583..9ebd83c43 100644 --- a/swagger/sdrangel/api/swagger/include/FreeDVDemod.yaml +++ b/swagger/sdrangel/api/swagger/include/FreeDVDemod.yaml @@ -44,6 +44,8 @@ FreeDVDemodSettings: type: integer spectrumConfig: $ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum" + channelMarker: + $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker" FreeDVDemodReport: description: FreeDVDemod diff --git a/swagger/sdrangel/api/swagger/include/FreqTracker.yaml b/swagger/sdrangel/api/swagger/include/FreqTracker.yaml index 51309fab3..b1c197e58 100644 --- a/swagger/sdrangel/api/swagger/include/FreqTracker.yaml +++ b/swagger/sdrangel/api/swagger/include/FreqTracker.yaml @@ -59,6 +59,8 @@ FreqTrackerSettings: type: integer spectrumConfig: $ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum" + channelMarker: + $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker" FreqTrackerReport: description: FreqTracker diff --git a/swagger/sdrangel/api/swagger/include/LocalSink.yaml b/swagger/sdrangel/api/swagger/include/LocalSink.yaml index 63896856a..9a4e9ddb9 100644 --- a/swagger/sdrangel/api/swagger/include/LocalSink.yaml +++ b/swagger/sdrangel/api/swagger/include/LocalSink.yaml @@ -29,3 +29,5 @@ LocalSinkSettings: type: integer reverseAPIChannelIndex: type: integer + channelMarker: + $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker" diff --git a/swagger/sdrangel/api/swagger/include/NFMDemod.yaml b/swagger/sdrangel/api/swagger/include/NFMDemod.yaml index 1bed5f16f..68545eb08 100644 --- a/swagger/sdrangel/api/swagger/include/NFMDemod.yaml +++ b/swagger/sdrangel/api/swagger/include/NFMDemod.yaml @@ -55,6 +55,8 @@ NFMDemodSettings: type: integer reverseAPIChannelIndex: type: integer + channelMarker: + $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker" NFMDemodReport: description: NFMDemod diff --git a/swagger/sdrangel/api/swagger/include/NoiseFigure.yaml b/swagger/sdrangel/api/swagger/include/NoiseFigure.yaml index fa5c1c27e..6aa82b98e 100644 --- a/swagger/sdrangel/api/swagger/include/NoiseFigure.yaml +++ b/swagger/sdrangel/api/swagger/include/NoiseFigure.yaml @@ -58,6 +58,8 @@ NoiseFigureSettings: type: integer reverseAPIChannelIndex: type: integer + channelMarker: + $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker" NoiseFigureReport: description: NoiseFigure diff --git a/swagger/sdrangel/api/swagger/include/PacketDemod.yaml b/swagger/sdrangel/api/swagger/include/PacketDemod.yaml index be5d00308..8d23b4a77 100644 --- a/swagger/sdrangel/api/swagger/include/PacketDemod.yaml +++ b/swagger/sdrangel/api/swagger/include/PacketDemod.yaml @@ -46,6 +46,8 @@ PacketDemodSettings: type: integer reverseAPIChannelIndex: type: integer + channelMarker: + $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker" PacketDemodReport: description: AMDemod diff --git a/swagger/sdrangel/api/swagger/include/PagerDemod.yaml b/swagger/sdrangel/api/swagger/include/PagerDemod.yaml index d38b98bee..6e787b57e 100644 --- a/swagger/sdrangel/api/swagger/include/PagerDemod.yaml +++ b/swagger/sdrangel/api/swagger/include/PagerDemod.yaml @@ -65,6 +65,10 @@ PagerDemodSettings: type: integer reverseAPIChannelIndex: 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: description: PagerDemod diff --git a/swagger/sdrangel/api/swagger/include/RadioAstronomy.yaml b/swagger/sdrangel/api/swagger/include/RadioAstronomy.yaml index 4362bc140..2a0bbe6cd 100644 --- a/swagger/sdrangel/api/swagger/include/RadioAstronomy.yaml +++ b/swagger/sdrangel/api/swagger/include/RadioAstronomy.yaml @@ -73,6 +73,8 @@ RadioAstronomySettings: type: integer reverseAPIChannelIndex: type: integer + channelMarker: + $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker" RadioAstronomyReport: description: RadioAstronomy diff --git a/swagger/sdrangel/api/swagger/include/RadioClock.yaml b/swagger/sdrangel/api/swagger/include/RadioClock.yaml index c7dcc78ec..74c8c188c 100644 --- a/swagger/sdrangel/api/swagger/include/RadioClock.yaml +++ b/swagger/sdrangel/api/swagger/include/RadioClock.yaml @@ -36,6 +36,10 @@ RadioClockSettings: type: integer reverseAPIChannelIndex: 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: description: RadioClock diff --git a/swagger/sdrangel/api/swagger/include/RemoteSink.yaml b/swagger/sdrangel/api/swagger/include/RemoteSink.yaml index 806add23c..a7a946818 100644 --- a/swagger/sdrangel/api/swagger/include/RemoteSink.yaml +++ b/swagger/sdrangel/api/swagger/include/RemoteSink.yaml @@ -35,3 +35,5 @@ RemoteSinkSettings: type: integer reverseAPIChannelIndex: type: integer + channelMarker: + $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker" diff --git a/swagger/sdrangel/api/swagger/include/SSBDemod.yaml b/swagger/sdrangel/api/swagger/include/SSBDemod.yaml index 4f6712e8e..d15c76bb9 100644 --- a/swagger/sdrangel/api/swagger/include/SSBDemod.yaml +++ b/swagger/sdrangel/api/swagger/include/SSBDemod.yaml @@ -64,6 +64,8 @@ SSBDemodSettings: type: integer spectrumConfig: $ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum" + channelMarker: + $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker" SSBDemodReport: description: SSBDemod diff --git a/swagger/sdrangel/api/swagger/include/SigMFFileSink.yaml b/swagger/sdrangel/api/swagger/include/SigMFFileSink.yaml index 6d8a822a4..914820784 100644 --- a/swagger/sdrangel/api/swagger/include/SigMFFileSink.yaml +++ b/swagger/sdrangel/api/swagger/include/SigMFFileSink.yaml @@ -50,6 +50,8 @@ SigMFFileSinkSettings: type: integer spectrumConfig: $ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum" + channelMarker: + $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker" SigMFFileSinkReport: description: SigMFFileSink diff --git a/swagger/sdrangel/api/swagger/include/UDPSink.yaml b/swagger/sdrangel/api/swagger/include/UDPSink.yaml index 2b2b2d245..177519476 100644 --- a/swagger/sdrangel/api/swagger/include/UDPSink.yaml +++ b/swagger/sdrangel/api/swagger/include/UDPSink.yaml @@ -71,6 +71,8 @@ UDPSinkSettings: type: integer spectrumConfig: $ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum" + channelMarker: + $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker" UDPSinkReport: description: UDPSink diff --git a/swagger/sdrangel/api/swagger/include/VORDemod.yaml b/swagger/sdrangel/api/swagger/include/VORDemod.yaml index 475979a9d..9f9ee972a 100644 --- a/swagger/sdrangel/api/swagger/include/VORDemod.yaml +++ b/swagger/sdrangel/api/swagger/include/VORDemod.yaml @@ -36,6 +36,8 @@ VORDemodSettings: magDecAdjust: description: Adjust radial lines on map for magnetic declination of VOR type: integer + channelMarker: + $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker" VORDemodReport: description: VORDemod diff --git a/swagger/sdrangel/api/swagger/include/VORDemodSC.yaml b/swagger/sdrangel/api/swagger/include/VORDemodSC.yaml index 2d7b1a9aa..fb335cf0c 100644 --- a/swagger/sdrangel/api/swagger/include/VORDemodSC.yaml +++ b/swagger/sdrangel/api/swagger/include/VORDemodSC.yaml @@ -39,6 +39,8 @@ VORDemodSCSettings: identThreshold: description: Morse code ident threshold (linear SNR) type: integer + channelMarker: + $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker" VORDemodSCReport: description: VORDemodSC diff --git a/swagger/sdrangel/api/swagger/include/WFMDemod.yaml b/swagger/sdrangel/api/swagger/include/WFMDemod.yaml index 2c01c4cec..a560ab5d7 100644 --- a/swagger/sdrangel/api/swagger/include/WFMDemod.yaml +++ b/swagger/sdrangel/api/swagger/include/WFMDemod.yaml @@ -39,6 +39,8 @@ WFMDemodSettings: type: integer reverseAPIChannelIndex: type: integer + channelMarker: + $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker" WFMDemodReport: description: WFMDemod diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index f4abc9db3..c125149b8 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -808,6 +808,9 @@ margin-bottom: 20px; }, "reverseAPIChannelIndex" : { "type" : "integer" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" } }, "description" : "ADSBDemod" @@ -987,6 +990,12 @@ margin-bottom: 20px; }, "reverseAPIChannelIndex" : { "type" : "integer" + }, + "scopeConfig" : { + "$ref" : "#/definitions/GLScope" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" } }, "description" : "AISDemod" @@ -1295,6 +1304,9 @@ margin-bottom: 20px; }, "reverseAPIChannelIndex" : { "type" : "integer" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" } }, "description" : "AMDemod" @@ -1544,6 +1556,9 @@ margin-bottom: 20px; }, "reverseAPIChannelIndex" : { "type" : "integer" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" } }, "description" : "APTDemod" @@ -2328,6 +2343,9 @@ margin-bottom: 20px; }, "spectrumConfig" : { "$ref" : "#/definitions/GLSpectrum" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" } }, "description" : "BFMDemod" @@ -3584,6 +3602,9 @@ margin-bottom: 20px; }, "spectrumConfig" : { "$ref" : "#/definitions/GLSpectrum" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" } }, "description" : "ChirpChatDemod" @@ -3870,6 +3891,9 @@ margin-bottom: 20px; }, "reverseAPIChannelIndex" : { "type" : "integer" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" } }, "description" : "DABDemod" @@ -4048,6 +4072,9 @@ margin-bottom: 20px; }, "reverseAPIChannelIndex" : { "type" : "integer" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" } }, "description" : "DATVDemod" @@ -4314,6 +4341,9 @@ margin-bottom: 20px; }, "reverseAPIChannelIndex" : { "type" : "integer" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" } }, "description" : "DSDDemod" @@ -5446,6 +5476,9 @@ margin-bottom: 20px; }, "spectrumConfig" : { "$ref" : "#/definitions/GLSpectrum" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" } }, "description" : "FileSink" @@ -5629,6 +5662,9 @@ margin-bottom: 20px; }, "spectrumConfig" : { "$ref" : "#/definitions/GLSpectrum" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" } }, "description" : "FreeDVDemod" @@ -5823,6 +5859,9 @@ margin-bottom: 20px; }, "spectrumConfig" : { "$ref" : "#/definitions/GLSpectrum" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" } }, "description" : "FreqTracker" @@ -7449,6 +7488,9 @@ margin-bottom: 20px; }, "reverseAPIChannelIndex" : { "type" : "integer" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" } }, "description" : "Local channel sink settings" @@ -7961,6 +8003,9 @@ margin-bottom: 20px; }, "reverseAPIChannelIndex" : { "type" : "integer" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" } }, "description" : "NFMDemod" @@ -8175,6 +8220,9 @@ margin-bottom: 20px; }, "reverseAPIChannelIndex" : { "type" : "integer" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" } }, "description" : "NoiseFigure" @@ -8362,6 +8410,9 @@ margin-bottom: 20px; }, "reverseAPIChannelIndex" : { "type" : "integer" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" } }, "description" : "PacketDemod" @@ -8684,6 +8735,12 @@ margin-bottom: 20px; }, "reverseAPIChannelIndex" : { "type" : "integer" + }, + "scopeConfig" : { + "$ref" : "#/definitions/GLScope" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" } }, "description" : "PagerDemod" @@ -9531,6 +9588,9 @@ margin-bottom: 20px; }, "reverseAPIChannelIndex" : { "type" : "integer" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" } }, "description" : "RadioAstronomy" @@ -9603,6 +9663,12 @@ margin-bottom: 20px; }, "reverseAPIChannelIndex" : { "type" : "integer" + }, + "scopeConfig" : { + "$ref" : "#/definitions/GLScope" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" } }, "description" : "RadioClock" @@ -9827,6 +9893,9 @@ margin-bottom: 20px; }, "reverseAPIChannelIndex" : { "type" : "integer" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" } }, "description" : "Remote channel sink settings" @@ -10372,6 +10441,9 @@ margin-bottom: 20px; }, "spectrumConfig" : { "$ref" : "#/definitions/GLSpectrum" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" } }, "description" : "SSBDemod" @@ -11028,6 +11100,9 @@ margin-bottom: 20px; }, "spectrumConfig" : { "$ref" : "#/definitions/GLSpectrum" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" } }, "description" : "SigMFFileSink" @@ -12278,6 +12353,9 @@ margin-bottom: 20px; }, "spectrumConfig" : { "$ref" : "#/definitions/GLSpectrum" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" } }, "description" : "UDPSink" @@ -12685,6 +12763,9 @@ margin-bottom: 20px; "identThreshold" : { "type" : "integer", "description" : "Morse code ident threshold (linear SNR)" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" } }, "description" : "VORDemodSC" @@ -12739,6 +12820,9 @@ margin-bottom: 20px; "magDecAdjust" : { "type" : "integer", "description" : "Adjust radial lines on map for magnetic declination of VOR" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" } }, "description" : "VORDemod" @@ -12878,6 +12962,9 @@ margin-bottom: 20px; }, "reverseAPIChannelIndex" : { "type" : "integer" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" } }, "description" : "WFMDemod" @@ -51467,7 +51554,7 @@ except ApiException as e:
- Generated 2021-12-01T01:10:25.279+01:00 + Generated 2021-12-02T23:38:15.455+01:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGADSBDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGADSBDemodSettings.cpp index 652532a2d..7841898a8 100644 --- a/swagger/sdrangel/code/qt5/client/SWGADSBDemodSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGADSBDemodSettings.cpp @@ -74,6 +74,8 @@ SWGADSBDemodSettings::SWGADSBDemodSettings() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + channel_marker = nullptr; + m_channel_marker_isSet = false; } SWGADSBDemodSettings::~SWGADSBDemodSettings() { @@ -128,6 +130,8 @@ SWGADSBDemodSettings::init() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + channel_marker = new SWGChannelMarker(); + m_channel_marker_isSet = false; } void @@ -163,6 +167,9 @@ SWGADSBDemodSettings::cleanup() { + if(channel_marker != nullptr) { + delete channel_marker; + } } SWGADSBDemodSettings* @@ -222,6 +229,8 @@ SWGADSBDemodSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", ""); + ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); + } QString @@ -307,6 +316,9 @@ SWGADSBDemodSettings::asJsonObject() { if(m_reverse_api_channel_index_isSet){ obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index)); } + if((channel_marker != nullptr) && (channel_marker->isSet())){ + toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker")); + } return obj; } @@ -541,6 +553,16 @@ SWGADSBDemodSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index this->m_reverse_api_channel_index_isSet = true; } +SWGChannelMarker* +SWGADSBDemodSettings::getChannelMarker() { + return channel_marker; +} +void +SWGADSBDemodSettings::setChannelMarker(SWGChannelMarker* channel_marker) { + this->channel_marker = channel_marker; + this->m_channel_marker_isSet = true; +} + bool SWGADSBDemodSettings::isSet(){ @@ -615,6 +637,9 @@ SWGADSBDemodSettings::isSet(){ if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break; } + if(channel_marker && channel_marker->isSet()){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGADSBDemodSettings.h b/swagger/sdrangel/code/qt5/client/SWGADSBDemodSettings.h index 014b06372..6a6c051d7 100644 --- a/swagger/sdrangel/code/qt5/client/SWGADSBDemodSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGADSBDemodSettings.h @@ -22,6 +22,7 @@ #include +#include "SWGChannelMarker.h" #include #include "SWGObject.h" @@ -111,6 +112,9 @@ public: qint32 getReverseApiChannelIndex(); void setReverseApiChannelIndex(qint32 reverse_api_channel_index); + SWGChannelMarker* getChannelMarker(); + void setChannelMarker(SWGChannelMarker* channel_marker); + virtual bool isSet() override; @@ -184,6 +188,9 @@ private: qint32 reverse_api_channel_index; bool m_reverse_api_channel_index_isSet; + SWGChannelMarker* channel_marker; + bool m_channel_marker_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGAISDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGAISDemodSettings.cpp index 8a32c8fe1..46fac3373 100644 --- a/swagger/sdrangel/code/qt5/client/SWGAISDemodSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGAISDemodSettings.cpp @@ -66,6 +66,10 @@ SWGAISDemodSettings::SWGAISDemodSettings() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + scope_config = nullptr; + m_scope_config_isSet = false; + channel_marker = nullptr; + m_channel_marker_isSet = false; } SWGAISDemodSettings::~SWGAISDemodSettings() { @@ -112,6 +116,10 @@ SWGAISDemodSettings::init() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + scope_config = new SWGGLScope(); + m_scope_config_isSet = false; + channel_marker = new SWGChannelMarker(); + m_channel_marker_isSet = false; } void @@ -143,6 +151,12 @@ SWGAISDemodSettings::cleanup() { + if(scope_config != nullptr) { + delete scope_config; + } + if(channel_marker != nullptr) { + delete channel_marker; + } } SWGAISDemodSettings* @@ -194,6 +208,10 @@ SWGAISDemodSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", ""); + ::SWGSDRangel::setValue(&scope_config, pJson["scopeConfig"], "SWGGLScope", "SWGGLScope"); + + ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); + } QString @@ -267,6 +285,12 @@ SWGAISDemodSettings::asJsonObject() { if(m_reverse_api_channel_index_isSet){ obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index)); } + if((scope_config != nullptr) && (scope_config->isSet())){ + toJsonValue(QString("scopeConfig"), scope_config, obj, QString("SWGGLScope")); + } + if((channel_marker != nullptr) && (channel_marker->isSet())){ + toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker")); + } return obj; } @@ -461,6 +485,26 @@ SWGAISDemodSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index) this->m_reverse_api_channel_index_isSet = true; } +SWGGLScope* +SWGAISDemodSettings::getScopeConfig() { + return scope_config; +} +void +SWGAISDemodSettings::setScopeConfig(SWGGLScope* scope_config) { + this->scope_config = scope_config; + this->m_scope_config_isSet = true; +} + +SWGChannelMarker* +SWGAISDemodSettings::getChannelMarker() { + return channel_marker; +} +void +SWGAISDemodSettings::setChannelMarker(SWGChannelMarker* channel_marker) { + this->channel_marker = channel_marker; + this->m_channel_marker_isSet = true; +} + bool SWGAISDemodSettings::isSet(){ @@ -523,6 +567,12 @@ SWGAISDemodSettings::isSet(){ if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break; } + if(scope_config && scope_config->isSet()){ + isObjectUpdated = true; break; + } + if(channel_marker && channel_marker->isSet()){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGAISDemodSettings.h b/swagger/sdrangel/code/qt5/client/SWGAISDemodSettings.h index d4ddffb9b..29a6e82a4 100644 --- a/swagger/sdrangel/code/qt5/client/SWGAISDemodSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGAISDemodSettings.h @@ -22,6 +22,8 @@ #include +#include "SWGChannelMarker.h" +#include "SWGGLScope.h" #include #include "SWGObject.h" @@ -99,6 +101,12 @@ public: qint32 getReverseApiChannelIndex(); void setReverseApiChannelIndex(qint32 reverse_api_channel_index); + SWGGLScope* getScopeConfig(); + void setScopeConfig(SWGGLScope* scope_config); + + SWGChannelMarker* getChannelMarker(); + void setChannelMarker(SWGChannelMarker* channel_marker); + virtual bool isSet() override; @@ -160,6 +168,12 @@ private: qint32 reverse_api_channel_index; bool m_reverse_api_channel_index_isSet; + SWGGLScope* scope_config; + bool m_scope_config_isSet; + + SWGChannelMarker* channel_marker; + bool m_channel_marker_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGAMDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGAMDemodSettings.cpp index f2e6c729d..5ed3f25ac 100644 --- a/swagger/sdrangel/code/qt5/client/SWGAMDemodSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGAMDemodSettings.cpp @@ -62,6 +62,8 @@ SWGAMDemodSettings::SWGAMDemodSettings() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + channel_marker = nullptr; + m_channel_marker_isSet = false; } SWGAMDemodSettings::~SWGAMDemodSettings() { @@ -104,6 +106,8 @@ SWGAMDemodSettings::init() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + channel_marker = new SWGChannelMarker(); + m_channel_marker_isSet = false; } void @@ -131,6 +135,9 @@ SWGAMDemodSettings::cleanup() { + if(channel_marker != nullptr) { + delete channel_marker; + } } SWGAMDemodSettings* @@ -178,6 +185,8 @@ SWGAMDemodSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", ""); + ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); + } QString @@ -245,6 +254,9 @@ SWGAMDemodSettings::asJsonObject() { if(m_reverse_api_channel_index_isSet){ obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index)); } + if((channel_marker != nullptr) && (channel_marker->isSet())){ + toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker")); + } return obj; } @@ -419,6 +431,16 @@ SWGAMDemodSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index) this->m_reverse_api_channel_index_isSet = true; } +SWGChannelMarker* +SWGAMDemodSettings::getChannelMarker() { + return channel_marker; +} +void +SWGAMDemodSettings::setChannelMarker(SWGChannelMarker* channel_marker) { + this->channel_marker = channel_marker; + this->m_channel_marker_isSet = true; +} + bool SWGAMDemodSettings::isSet(){ @@ -475,6 +497,9 @@ SWGAMDemodSettings::isSet(){ if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break; } + if(channel_marker && channel_marker->isSet()){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGAMDemodSettings.h b/swagger/sdrangel/code/qt5/client/SWGAMDemodSettings.h index dc5ff6204..488544f2b 100644 --- a/swagger/sdrangel/code/qt5/client/SWGAMDemodSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGAMDemodSettings.h @@ -22,6 +22,7 @@ #include +#include "SWGChannelMarker.h" #include #include "SWGObject.h" @@ -93,6 +94,9 @@ public: qint32 getReverseApiChannelIndex(); void setReverseApiChannelIndex(qint32 reverse_api_channel_index); + SWGChannelMarker* getChannelMarker(); + void setChannelMarker(SWGChannelMarker* channel_marker); + virtual bool isSet() override; @@ -148,6 +152,9 @@ private: qint32 reverse_api_channel_index; bool m_reverse_api_channel_index_isSet; + SWGChannelMarker* channel_marker; + bool m_channel_marker_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGAPTDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGAPTDemodSettings.cpp index d3b974d63..93f8ad8a2 100644 --- a/swagger/sdrangel/code/qt5/client/SWGAPTDemodSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGAPTDemodSettings.cpp @@ -72,6 +72,8 @@ SWGAPTDemodSettings::SWGAPTDemodSettings() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + channel_marker = nullptr; + m_channel_marker_isSet = false; } SWGAPTDemodSettings::~SWGAPTDemodSettings() { @@ -124,6 +126,8 @@ SWGAPTDemodSettings::init() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + channel_marker = new SWGChannelMarker(); + m_channel_marker_isSet = false; } void @@ -156,6 +160,9 @@ SWGAPTDemodSettings::cleanup() { + if(channel_marker != nullptr) { + delete channel_marker; + } } SWGAPTDemodSettings* @@ -213,6 +220,8 @@ SWGAPTDemodSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", ""); + ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); + } QString @@ -295,6 +304,9 @@ SWGAPTDemodSettings::asJsonObject() { if(m_reverse_api_channel_index_isSet){ obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index)); } + if((channel_marker != nullptr) && (channel_marker->isSet())){ + toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker")); + } return obj; } @@ -519,6 +531,16 @@ SWGAPTDemodSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index) this->m_reverse_api_channel_index_isSet = true; } +SWGChannelMarker* +SWGAPTDemodSettings::getChannelMarker() { + return channel_marker; +} +void +SWGAPTDemodSettings::setChannelMarker(SWGChannelMarker* channel_marker) { + this->channel_marker = channel_marker; + this->m_channel_marker_isSet = true; +} + bool SWGAPTDemodSettings::isSet(){ @@ -590,6 +612,9 @@ SWGAPTDemodSettings::isSet(){ if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break; } + if(channel_marker && channel_marker->isSet()){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGAPTDemodSettings.h b/swagger/sdrangel/code/qt5/client/SWGAPTDemodSettings.h index f02a14bdc..9e0426093 100644 --- a/swagger/sdrangel/code/qt5/client/SWGAPTDemodSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGAPTDemodSettings.h @@ -22,6 +22,7 @@ #include +#include "SWGChannelMarker.h" #include #include "SWGObject.h" @@ -108,6 +109,9 @@ public: qint32 getReverseApiChannelIndex(); void setReverseApiChannelIndex(qint32 reverse_api_channel_index); + SWGChannelMarker* getChannelMarker(); + void setChannelMarker(SWGChannelMarker* channel_marker); + virtual bool isSet() override; @@ -178,6 +182,9 @@ private: qint32 reverse_api_channel_index; bool m_reverse_api_channel_index_isSet; + SWGChannelMarker* channel_marker; + bool m_channel_marker_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGBFMDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGBFMDemodSettings.cpp index 71d0a28cf..8b32d2d6a 100644 --- a/swagger/sdrangel/code/qt5/client/SWGBFMDemodSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGBFMDemodSettings.cpp @@ -66,6 +66,8 @@ SWGBFMDemodSettings::SWGBFMDemodSettings() { m_reverse_api_channel_index_isSet = false; spectrum_config = nullptr; m_spectrum_config_isSet = false; + channel_marker = nullptr; + m_channel_marker_isSet = false; } SWGBFMDemodSettings::~SWGBFMDemodSettings() { @@ -112,6 +114,8 @@ SWGBFMDemodSettings::init() { m_reverse_api_channel_index_isSet = false; spectrum_config = new SWGGLSpectrum(); m_spectrum_config_isSet = false; + channel_marker = new SWGChannelMarker(); + m_channel_marker_isSet = false; } void @@ -143,6 +147,9 @@ SWGBFMDemodSettings::cleanup() { if(spectrum_config != nullptr) { delete spectrum_config; } + if(channel_marker != nullptr) { + delete channel_marker; + } } SWGBFMDemodSettings* @@ -194,6 +201,8 @@ SWGBFMDemodSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&spectrum_config, pJson["spectrumConfig"], "SWGGLSpectrum", "SWGGLSpectrum"); + ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); + } QString @@ -267,6 +276,9 @@ SWGBFMDemodSettings::asJsonObject() { if((spectrum_config != nullptr) && (spectrum_config->isSet())){ toJsonValue(QString("spectrumConfig"), spectrum_config, obj, QString("SWGGLSpectrum")); } + if((channel_marker != nullptr) && (channel_marker->isSet())){ + toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker")); + } return obj; } @@ -461,6 +473,16 @@ SWGBFMDemodSettings::setSpectrumConfig(SWGGLSpectrum* spectrum_config) { this->m_spectrum_config_isSet = true; } +SWGChannelMarker* +SWGBFMDemodSettings::getChannelMarker() { + return channel_marker; +} +void +SWGBFMDemodSettings::setChannelMarker(SWGChannelMarker* channel_marker) { + this->channel_marker = channel_marker; + this->m_channel_marker_isSet = true; +} + bool SWGBFMDemodSettings::isSet(){ @@ -523,6 +545,9 @@ SWGBFMDemodSettings::isSet(){ if(spectrum_config && spectrum_config->isSet()){ isObjectUpdated = true; break; } + if(channel_marker && channel_marker->isSet()){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGBFMDemodSettings.h b/swagger/sdrangel/code/qt5/client/SWGBFMDemodSettings.h index 1b754baee..75f67a447 100644 --- a/swagger/sdrangel/code/qt5/client/SWGBFMDemodSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGBFMDemodSettings.h @@ -22,6 +22,7 @@ #include +#include "SWGChannelMarker.h" #include "SWGGLSpectrum.h" #include @@ -100,6 +101,9 @@ public: SWGGLSpectrum* getSpectrumConfig(); void setSpectrumConfig(SWGGLSpectrum* spectrum_config); + SWGChannelMarker* getChannelMarker(); + void setChannelMarker(SWGChannelMarker* channel_marker); + virtual bool isSet() override; @@ -161,6 +165,9 @@ private: SWGGLSpectrum* spectrum_config; bool m_spectrum_config_isSet; + SWGChannelMarker* channel_marker; + bool m_channel_marker_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGChirpChatDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGChirpChatDemodSettings.cpp index 55d566cdd..7108a3939 100644 --- a/swagger/sdrangel/code/qt5/client/SWGChirpChatDemodSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGChirpChatDemodSettings.cpp @@ -84,6 +84,8 @@ SWGChirpChatDemodSettings::SWGChirpChatDemodSettings() { m_reverse_api_channel_index_isSet = false; spectrum_config = nullptr; m_spectrum_config_isSet = false; + channel_marker = nullptr; + m_channel_marker_isSet = false; } SWGChirpChatDemodSettings::~SWGChirpChatDemodSettings() { @@ -148,6 +150,8 @@ SWGChirpChatDemodSettings::init() { m_reverse_api_channel_index_isSet = false; spectrum_config = new SWGGLSpectrum(); m_spectrum_config_isSet = false; + channel_marker = new SWGChannelMarker(); + m_channel_marker_isSet = false; } void @@ -188,6 +192,9 @@ SWGChirpChatDemodSettings::cleanup() { if(spectrum_config != nullptr) { delete spectrum_config; } + if(channel_marker != nullptr) { + delete channel_marker; + } } SWGChirpChatDemodSettings* @@ -257,6 +264,8 @@ SWGChirpChatDemodSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&spectrum_config, pJson["spectrumConfig"], "SWGGLSpectrum", "SWGGLSpectrum"); + ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); + } QString @@ -357,6 +366,9 @@ SWGChirpChatDemodSettings::asJsonObject() { if((spectrum_config != nullptr) && (spectrum_config->isSet())){ toJsonValue(QString("spectrumConfig"), spectrum_config, obj, QString("SWGGLSpectrum")); } + if((channel_marker != nullptr) && (channel_marker->isSet())){ + toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker")); + } return obj; } @@ -641,6 +653,16 @@ SWGChirpChatDemodSettings::setSpectrumConfig(SWGGLSpectrum* spectrum_config) { this->m_spectrum_config_isSet = true; } +SWGChannelMarker* +SWGChirpChatDemodSettings::getChannelMarker() { + return channel_marker; +} +void +SWGChirpChatDemodSettings::setChannelMarker(SWGChannelMarker* channel_marker) { + this->channel_marker = channel_marker; + this->m_channel_marker_isSet = true; +} + bool SWGChirpChatDemodSettings::isSet(){ @@ -730,6 +752,9 @@ SWGChirpChatDemodSettings::isSet(){ if(spectrum_config && spectrum_config->isSet()){ isObjectUpdated = true; break; } + if(channel_marker && channel_marker->isSet()){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGChirpChatDemodSettings.h b/swagger/sdrangel/code/qt5/client/SWGChirpChatDemodSettings.h index 728d61640..eed7686b1 100644 --- a/swagger/sdrangel/code/qt5/client/SWGChirpChatDemodSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGChirpChatDemodSettings.h @@ -22,6 +22,7 @@ #include +#include "SWGChannelMarker.h" #include "SWGGLSpectrum.h" #include @@ -127,6 +128,9 @@ public: SWGGLSpectrum* getSpectrumConfig(); void setSpectrumConfig(SWGGLSpectrum* spectrum_config); + SWGChannelMarker* getChannelMarker(); + void setChannelMarker(SWGChannelMarker* channel_marker); + virtual bool isSet() override; @@ -215,6 +219,9 @@ private: SWGGLSpectrum* spectrum_config; bool m_spectrum_config_isSet; + SWGChannelMarker* channel_marker; + bool m_channel_marker_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGDABDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGDABDemodSettings.cpp index 61d7fe1e8..87a868def 100644 --- a/swagger/sdrangel/code/qt5/client/SWGDABDemodSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGDABDemodSettings.cpp @@ -56,6 +56,8 @@ SWGDABDemodSettings::SWGDABDemodSettings() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + channel_marker = nullptr; + m_channel_marker_isSet = false; } SWGDABDemodSettings::~SWGDABDemodSettings() { @@ -92,6 +94,8 @@ SWGDABDemodSettings::init() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + channel_marker = new SWGChannelMarker(); + m_channel_marker_isSet = false; } void @@ -118,6 +122,9 @@ SWGDABDemodSettings::cleanup() { + if(channel_marker != nullptr) { + delete channel_marker; + } } SWGDABDemodSettings* @@ -159,6 +166,8 @@ SWGDABDemodSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", ""); + ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); + } QString @@ -217,6 +226,9 @@ SWGDABDemodSettings::asJsonObject() { if(m_reverse_api_channel_index_isSet){ obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index)); } + if((channel_marker != nullptr) && (channel_marker->isSet())){ + toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker")); + } return obj; } @@ -361,6 +373,16 @@ SWGDABDemodSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index) this->m_reverse_api_channel_index_isSet = true; } +SWGChannelMarker* +SWGDABDemodSettings::getChannelMarker() { + return channel_marker; +} +void +SWGDABDemodSettings::setChannelMarker(SWGChannelMarker* channel_marker) { + this->channel_marker = channel_marker; + this->m_channel_marker_isSet = true; +} + bool SWGDABDemodSettings::isSet(){ @@ -408,6 +430,9 @@ SWGDABDemodSettings::isSet(){ if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break; } + if(channel_marker && channel_marker->isSet()){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGDABDemodSettings.h b/swagger/sdrangel/code/qt5/client/SWGDABDemodSettings.h index 42cee2212..3eeaa8f43 100644 --- a/swagger/sdrangel/code/qt5/client/SWGDABDemodSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGDABDemodSettings.h @@ -22,6 +22,7 @@ #include +#include "SWGChannelMarker.h" #include #include "SWGObject.h" @@ -84,6 +85,9 @@ public: qint32 getReverseApiChannelIndex(); void setReverseApiChannelIndex(qint32 reverse_api_channel_index); + SWGChannelMarker* getChannelMarker(); + void setChannelMarker(SWGChannelMarker* channel_marker); + virtual bool isSet() override; @@ -130,6 +134,9 @@ private: qint32 reverse_api_channel_index; bool m_reverse_api_channel_index_isSet; + SWGChannelMarker* channel_marker; + bool m_channel_marker_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGDATVDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGDATVDemodSettings.cpp index ca35f5791..fc3e5fa67 100644 --- a/swagger/sdrangel/code/qt5/client/SWGDATVDemodSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGDATVDemodSettings.cpp @@ -96,6 +96,8 @@ SWGDATVDemodSettings::SWGDATVDemodSettings() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + channel_marker = nullptr; + m_channel_marker_isSet = false; } SWGDATVDemodSettings::~SWGDATVDemodSettings() { @@ -172,6 +174,8 @@ SWGDATVDemodSettings::init() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + channel_marker = new SWGChannelMarker(); + m_channel_marker_isSet = false; } void @@ -220,6 +224,9 @@ SWGDATVDemodSettings::cleanup() { + if(channel_marker != nullptr) { + delete channel_marker; + } } SWGDATVDemodSettings* @@ -301,6 +308,8 @@ SWGDATVDemodSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", ""); + ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); + } QString @@ -419,6 +428,9 @@ SWGDATVDemodSettings::asJsonObject() { if(m_reverse_api_channel_index_isSet){ obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index)); } + if((channel_marker != nullptr) && (channel_marker->isSet())){ + toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker")); + } return obj; } @@ -763,6 +775,16 @@ SWGDATVDemodSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index this->m_reverse_api_channel_index_isSet = true; } +SWGChannelMarker* +SWGDATVDemodSettings::getChannelMarker() { + return channel_marker; +} +void +SWGDATVDemodSettings::setChannelMarker(SWGChannelMarker* channel_marker) { + this->channel_marker = channel_marker; + this->m_channel_marker_isSet = true; +} + bool SWGDATVDemodSettings::isSet(){ @@ -870,6 +892,9 @@ SWGDATVDemodSettings::isSet(){ if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break; } + if(channel_marker && channel_marker->isSet()){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGDATVDemodSettings.h b/swagger/sdrangel/code/qt5/client/SWGDATVDemodSettings.h index 7c2f0598a..85cbb6384 100644 --- a/swagger/sdrangel/code/qt5/client/SWGDATVDemodSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGDATVDemodSettings.h @@ -22,6 +22,7 @@ #include +#include "SWGChannelMarker.h" #include #include "SWGObject.h" @@ -144,6 +145,9 @@ public: qint32 getReverseApiChannelIndex(); void setReverseApiChannelIndex(qint32 reverse_api_channel_index); + SWGChannelMarker* getChannelMarker(); + void setChannelMarker(SWGChannelMarker* channel_marker); + virtual bool isSet() override; @@ -250,6 +254,9 @@ private: qint32 reverse_api_channel_index; bool m_reverse_api_channel_index_isSet; + SWGChannelMarker* channel_marker; + bool m_channel_marker_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGDSDDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGDSDDemodSettings.cpp index 51fe70a9b..a0821d351 100644 --- a/swagger/sdrangel/code/qt5/client/SWGDSDDemodSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGDSDDemodSettings.cpp @@ -84,6 +84,8 @@ SWGDSDDemodSettings::SWGDSDDemodSettings() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + channel_marker = nullptr; + m_channel_marker_isSet = false; } SWGDSDDemodSettings::~SWGDSDDemodSettings() { @@ -148,6 +150,8 @@ SWGDSDDemodSettings::init() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + channel_marker = new SWGChannelMarker(); + m_channel_marker_isSet = false; } void @@ -186,6 +190,9 @@ SWGDSDDemodSettings::cleanup() { + if(channel_marker != nullptr) { + delete channel_marker; + } } SWGDSDDemodSettings* @@ -255,6 +262,8 @@ SWGDSDDemodSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", ""); + ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); + } QString @@ -355,6 +364,9 @@ SWGDSDDemodSettings::asJsonObject() { if(m_reverse_api_channel_index_isSet){ obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index)); } + if((channel_marker != nullptr) && (channel_marker->isSet())){ + toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker")); + } return obj; } @@ -639,6 +651,16 @@ SWGDSDDemodSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index) this->m_reverse_api_channel_index_isSet = true; } +SWGChannelMarker* +SWGDSDDemodSettings::getChannelMarker() { + return channel_marker; +} +void +SWGDSDDemodSettings::setChannelMarker(SWGChannelMarker* channel_marker) { + this->channel_marker = channel_marker; + this->m_channel_marker_isSet = true; +} + bool SWGDSDDemodSettings::isSet(){ @@ -728,6 +750,9 @@ SWGDSDDemodSettings::isSet(){ if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break; } + if(channel_marker && channel_marker->isSet()){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGDSDDemodSettings.h b/swagger/sdrangel/code/qt5/client/SWGDSDDemodSettings.h index 119449cfa..017010b66 100644 --- a/swagger/sdrangel/code/qt5/client/SWGDSDDemodSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGDSDDemodSettings.h @@ -22,6 +22,7 @@ #include +#include "SWGChannelMarker.h" #include #include "SWGObject.h" @@ -126,6 +127,9 @@ public: qint32 getReverseApiChannelIndex(); void setReverseApiChannelIndex(qint32 reverse_api_channel_index); + SWGChannelMarker* getChannelMarker(); + void setChannelMarker(SWGChannelMarker* channel_marker); + virtual bool isSet() override; @@ -214,6 +218,9 @@ private: qint32 reverse_api_channel_index; bool m_reverse_api_channel_index_isSet; + SWGChannelMarker* channel_marker; + bool m_channel_marker_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGFileSinkSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGFileSinkSettings.cpp index 780d65d2c..5d9671f4d 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFileSinkSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGFileSinkSettings.cpp @@ -62,6 +62,8 @@ SWGFileSinkSettings::SWGFileSinkSettings() { m_reverse_api_channel_index_isSet = false; spectrum_config = nullptr; m_spectrum_config_isSet = false; + channel_marker = nullptr; + m_channel_marker_isSet = false; } SWGFileSinkSettings::~SWGFileSinkSettings() { @@ -104,6 +106,8 @@ SWGFileSinkSettings::init() { m_reverse_api_channel_index_isSet = false; spectrum_config = new SWGGLSpectrum(); m_spectrum_config_isSet = false; + channel_marker = new SWGChannelMarker(); + m_channel_marker_isSet = false; } void @@ -133,6 +137,9 @@ SWGFileSinkSettings::cleanup() { if(spectrum_config != nullptr) { delete spectrum_config; } + if(channel_marker != nullptr) { + delete channel_marker; + } } SWGFileSinkSettings* @@ -180,6 +187,8 @@ SWGFileSinkSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&spectrum_config, pJson["spectrumConfig"], "SWGGLSpectrum", "SWGGLSpectrum"); + ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); + } QString @@ -247,6 +256,9 @@ SWGFileSinkSettings::asJsonObject() { if((spectrum_config != nullptr) && (spectrum_config->isSet())){ toJsonValue(QString("spectrumConfig"), spectrum_config, obj, QString("SWGGLSpectrum")); } + if((channel_marker != nullptr) && (channel_marker->isSet())){ + toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker")); + } return obj; } @@ -421,6 +433,16 @@ SWGFileSinkSettings::setSpectrumConfig(SWGGLSpectrum* spectrum_config) { this->m_spectrum_config_isSet = true; } +SWGChannelMarker* +SWGFileSinkSettings::getChannelMarker() { + return channel_marker; +} +void +SWGFileSinkSettings::setChannelMarker(SWGChannelMarker* channel_marker) { + this->channel_marker = channel_marker; + this->m_channel_marker_isSet = true; +} + bool SWGFileSinkSettings::isSet(){ @@ -477,6 +499,9 @@ SWGFileSinkSettings::isSet(){ if(spectrum_config && spectrum_config->isSet()){ isObjectUpdated = true; break; } + if(channel_marker && channel_marker->isSet()){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGFileSinkSettings.h b/swagger/sdrangel/code/qt5/client/SWGFileSinkSettings.h index 320c5c6cd..9e0e0ec84 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFileSinkSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGFileSinkSettings.h @@ -22,6 +22,7 @@ #include +#include "SWGChannelMarker.h" #include "SWGGLSpectrum.h" #include @@ -94,6 +95,9 @@ public: SWGGLSpectrum* getSpectrumConfig(); void setSpectrumConfig(SWGGLSpectrum* spectrum_config); + SWGChannelMarker* getChannelMarker(); + void setChannelMarker(SWGChannelMarker* channel_marker); + virtual bool isSet() override; @@ -149,6 +153,9 @@ private: SWGGLSpectrum* spectrum_config; bool m_spectrum_config_isSet; + SWGChannelMarker* channel_marker; + bool m_channel_marker_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGFreeDVDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGFreeDVDemodSettings.cpp index e424ea34a..7c5af5451 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFreeDVDemodSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGFreeDVDemodSettings.cpp @@ -62,6 +62,8 @@ SWGFreeDVDemodSettings::SWGFreeDVDemodSettings() { m_reverse_api_channel_index_isSet = false; spectrum_config = nullptr; m_spectrum_config_isSet = false; + channel_marker = nullptr; + m_channel_marker_isSet = false; } SWGFreeDVDemodSettings::~SWGFreeDVDemodSettings() { @@ -104,6 +106,8 @@ SWGFreeDVDemodSettings::init() { m_reverse_api_channel_index_isSet = false; spectrum_config = new SWGGLSpectrum(); m_spectrum_config_isSet = false; + channel_marker = new SWGChannelMarker(); + m_channel_marker_isSet = false; } void @@ -133,6 +137,9 @@ SWGFreeDVDemodSettings::cleanup() { if(spectrum_config != nullptr) { delete spectrum_config; } + if(channel_marker != nullptr) { + delete channel_marker; + } } SWGFreeDVDemodSettings* @@ -180,6 +187,8 @@ SWGFreeDVDemodSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&spectrum_config, pJson["spectrumConfig"], "SWGGLSpectrum", "SWGGLSpectrum"); + ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); + } QString @@ -247,6 +256,9 @@ SWGFreeDVDemodSettings::asJsonObject() { if((spectrum_config != nullptr) && (spectrum_config->isSet())){ toJsonValue(QString("spectrumConfig"), spectrum_config, obj, QString("SWGGLSpectrum")); } + if((channel_marker != nullptr) && (channel_marker->isSet())){ + toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker")); + } return obj; } @@ -421,6 +433,16 @@ SWGFreeDVDemodSettings::setSpectrumConfig(SWGGLSpectrum* spectrum_config) { this->m_spectrum_config_isSet = true; } +SWGChannelMarker* +SWGFreeDVDemodSettings::getChannelMarker() { + return channel_marker; +} +void +SWGFreeDVDemodSettings::setChannelMarker(SWGChannelMarker* channel_marker) { + this->channel_marker = channel_marker; + this->m_channel_marker_isSet = true; +} + bool SWGFreeDVDemodSettings::isSet(){ @@ -477,6 +499,9 @@ SWGFreeDVDemodSettings::isSet(){ if(spectrum_config && spectrum_config->isSet()){ isObjectUpdated = true; break; } + if(channel_marker && channel_marker->isSet()){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGFreeDVDemodSettings.h b/swagger/sdrangel/code/qt5/client/SWGFreeDVDemodSettings.h index 4cc829b46..1a07ea223 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFreeDVDemodSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGFreeDVDemodSettings.h @@ -22,6 +22,7 @@ #include +#include "SWGChannelMarker.h" #include "SWGGLSpectrum.h" #include @@ -94,6 +95,9 @@ public: SWGGLSpectrum* getSpectrumConfig(); void setSpectrumConfig(SWGGLSpectrum* spectrum_config); + SWGChannelMarker* getChannelMarker(); + void setChannelMarker(SWGChannelMarker* channel_marker); + virtual bool isSet() override; @@ -149,6 +153,9 @@ private: SWGGLSpectrum* spectrum_config; bool m_spectrum_config_isSet; + SWGChannelMarker* channel_marker; + bool m_channel_marker_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGFreqTrackerSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGFreqTrackerSettings.cpp index d022fc010..fa9dad8ec 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFreqTrackerSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGFreqTrackerSettings.cpp @@ -70,6 +70,8 @@ SWGFreqTrackerSettings::SWGFreqTrackerSettings() { m_reverse_api_channel_index_isSet = false; spectrum_config = nullptr; m_spectrum_config_isSet = false; + channel_marker = nullptr; + m_channel_marker_isSet = false; } SWGFreqTrackerSettings::~SWGFreqTrackerSettings() { @@ -120,6 +122,8 @@ SWGFreqTrackerSettings::init() { m_reverse_api_channel_index_isSet = false; spectrum_config = new SWGGLSpectrum(); m_spectrum_config_isSet = false; + channel_marker = new SWGChannelMarker(); + m_channel_marker_isSet = false; } void @@ -151,6 +155,9 @@ SWGFreqTrackerSettings::cleanup() { if(spectrum_config != nullptr) { delete spectrum_config; } + if(channel_marker != nullptr) { + delete channel_marker; + } } SWGFreqTrackerSettings* @@ -206,6 +213,8 @@ SWGFreqTrackerSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&spectrum_config, pJson["spectrumConfig"], "SWGGLSpectrum", "SWGGLSpectrum"); + ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); + } QString @@ -285,6 +294,9 @@ SWGFreqTrackerSettings::asJsonObject() { if((spectrum_config != nullptr) && (spectrum_config->isSet())){ toJsonValue(QString("spectrumConfig"), spectrum_config, obj, QString("SWGGLSpectrum")); } + if((channel_marker != nullptr) && (channel_marker->isSet())){ + toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker")); + } return obj; } @@ -499,6 +511,16 @@ SWGFreqTrackerSettings::setSpectrumConfig(SWGGLSpectrum* spectrum_config) { this->m_spectrum_config_isSet = true; } +SWGChannelMarker* +SWGFreqTrackerSettings::getChannelMarker() { + return channel_marker; +} +void +SWGFreqTrackerSettings::setChannelMarker(SWGChannelMarker* channel_marker) { + this->channel_marker = channel_marker; + this->m_channel_marker_isSet = true; +} + bool SWGFreqTrackerSettings::isSet(){ @@ -567,6 +589,9 @@ SWGFreqTrackerSettings::isSet(){ if(spectrum_config && spectrum_config->isSet()){ isObjectUpdated = true; break; } + if(channel_marker && channel_marker->isSet()){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGFreqTrackerSettings.h b/swagger/sdrangel/code/qt5/client/SWGFreqTrackerSettings.h index 9ab2a0019..87965c3c4 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFreqTrackerSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGFreqTrackerSettings.h @@ -22,6 +22,7 @@ #include +#include "SWGChannelMarker.h" #include "SWGGLSpectrum.h" #include @@ -106,6 +107,9 @@ public: SWGGLSpectrum* getSpectrumConfig(); void setSpectrumConfig(SWGGLSpectrum* spectrum_config); + SWGChannelMarker* getChannelMarker(); + void setChannelMarker(SWGChannelMarker* channel_marker); + virtual bool isSet() override; @@ -173,6 +177,9 @@ private: SWGGLSpectrum* spectrum_config; bool m_spectrum_config_isSet; + SWGChannelMarker* channel_marker; + bool m_channel_marker_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGLocalSinkSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGLocalSinkSettings.cpp index cb5f4f4c4..37751290d 100644 --- a/swagger/sdrangel/code/qt5/client/SWGLocalSinkSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGLocalSinkSettings.cpp @@ -52,6 +52,8 @@ SWGLocalSinkSettings::SWGLocalSinkSettings() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + channel_marker = nullptr; + m_channel_marker_isSet = false; } SWGLocalSinkSettings::~SWGLocalSinkSettings() { @@ -84,6 +86,8 @@ SWGLocalSinkSettings::init() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + channel_marker = new SWGChannelMarker(); + m_channel_marker_isSet = false; } void @@ -104,6 +108,9 @@ SWGLocalSinkSettings::cleanup() { + if(channel_marker != nullptr) { + delete channel_marker; + } } SWGLocalSinkSettings* @@ -141,6 +148,8 @@ SWGLocalSinkSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", ""); + ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); + } QString @@ -193,6 +202,9 @@ SWGLocalSinkSettings::asJsonObject() { if(m_reverse_api_channel_index_isSet){ obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index)); } + if((channel_marker != nullptr) && (channel_marker->isSet())){ + toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker")); + } return obj; } @@ -317,6 +329,16 @@ SWGLocalSinkSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index this->m_reverse_api_channel_index_isSet = true; } +SWGChannelMarker* +SWGLocalSinkSettings::getChannelMarker() { + return channel_marker; +} +void +SWGLocalSinkSettings::setChannelMarker(SWGChannelMarker* channel_marker) { + this->channel_marker = channel_marker; + this->m_channel_marker_isSet = true; +} + bool SWGLocalSinkSettings::isSet(){ @@ -358,6 +380,9 @@ SWGLocalSinkSettings::isSet(){ if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break; } + if(channel_marker && channel_marker->isSet()){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGLocalSinkSettings.h b/swagger/sdrangel/code/qt5/client/SWGLocalSinkSettings.h index 4a31451eb..cf9eb92de 100644 --- a/swagger/sdrangel/code/qt5/client/SWGLocalSinkSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGLocalSinkSettings.h @@ -22,6 +22,7 @@ #include +#include "SWGChannelMarker.h" #include #include "SWGObject.h" @@ -78,6 +79,9 @@ public: qint32 getReverseApiChannelIndex(); void setReverseApiChannelIndex(qint32 reverse_api_channel_index); + SWGChannelMarker* getChannelMarker(); + void setChannelMarker(SWGChannelMarker* channel_marker); + virtual bool isSet() override; @@ -118,6 +122,9 @@ private: qint32 reverse_api_channel_index; bool m_reverse_api_channel_index_isSet; + SWGChannelMarker* channel_marker; + bool m_channel_marker_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGNFMDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGNFMDemodSettings.cpp index 1ec06ac62..4cc634740 100644 --- a/swagger/sdrangel/code/qt5/client/SWGNFMDemodSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGNFMDemodSettings.cpp @@ -70,6 +70,8 @@ SWGNFMDemodSettings::SWGNFMDemodSettings() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + channel_marker = nullptr; + m_channel_marker_isSet = false; } SWGNFMDemodSettings::~SWGNFMDemodSettings() { @@ -120,6 +122,8 @@ SWGNFMDemodSettings::init() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + channel_marker = new SWGChannelMarker(); + m_channel_marker_isSet = false; } void @@ -151,6 +155,9 @@ SWGNFMDemodSettings::cleanup() { + if(channel_marker != nullptr) { + delete channel_marker; + } } SWGNFMDemodSettings* @@ -206,6 +213,8 @@ SWGNFMDemodSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", ""); + ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); + } QString @@ -285,6 +294,9 @@ SWGNFMDemodSettings::asJsonObject() { if(m_reverse_api_channel_index_isSet){ obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index)); } + if((channel_marker != nullptr) && (channel_marker->isSet())){ + toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker")); + } return obj; } @@ -499,6 +511,16 @@ SWGNFMDemodSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index) this->m_reverse_api_channel_index_isSet = true; } +SWGChannelMarker* +SWGNFMDemodSettings::getChannelMarker() { + return channel_marker; +} +void +SWGNFMDemodSettings::setChannelMarker(SWGChannelMarker* channel_marker) { + this->channel_marker = channel_marker; + this->m_channel_marker_isSet = true; +} + bool SWGNFMDemodSettings::isSet(){ @@ -567,6 +589,9 @@ SWGNFMDemodSettings::isSet(){ if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break; } + if(channel_marker && channel_marker->isSet()){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGNFMDemodSettings.h b/swagger/sdrangel/code/qt5/client/SWGNFMDemodSettings.h index 9705182bd..b0dbef317 100644 --- a/swagger/sdrangel/code/qt5/client/SWGNFMDemodSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGNFMDemodSettings.h @@ -22,6 +22,7 @@ #include +#include "SWGChannelMarker.h" #include #include "SWGObject.h" @@ -105,6 +106,9 @@ public: qint32 getReverseApiChannelIndex(); void setReverseApiChannelIndex(qint32 reverse_api_channel_index); + SWGChannelMarker* getChannelMarker(); + void setChannelMarker(SWGChannelMarker* channel_marker); + virtual bool isSet() override; @@ -172,6 +176,9 @@ private: qint32 reverse_api_channel_index; bool m_reverse_api_channel_index_isSet; + SWGChannelMarker* channel_marker; + bool m_channel_marker_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGNoiseFigureSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGNoiseFigureSettings.cpp index 5ed2c9bb5..1f9118c05 100644 --- a/swagger/sdrangel/code/qt5/client/SWGNoiseFigureSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGNoiseFigureSettings.cpp @@ -76,6 +76,8 @@ SWGNoiseFigureSettings::SWGNoiseFigureSettings() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + channel_marker = nullptr; + m_channel_marker_isSet = false; } SWGNoiseFigureSettings::~SWGNoiseFigureSettings() { @@ -132,6 +134,8 @@ SWGNoiseFigureSettings::init() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + channel_marker = new SWGChannelMarker(); + m_channel_marker_isSet = false; } void @@ -178,6 +182,9 @@ SWGNoiseFigureSettings::cleanup() { + if(channel_marker != nullptr) { + delete channel_marker; + } } SWGNoiseFigureSettings* @@ -239,6 +246,8 @@ SWGNoiseFigureSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", ""); + ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); + } QString @@ -327,6 +336,9 @@ SWGNoiseFigureSettings::asJsonObject() { if(m_reverse_api_channel_index_isSet){ obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index)); } + if((channel_marker != nullptr) && (channel_marker->isSet())){ + toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker")); + } return obj; } @@ -571,6 +583,16 @@ SWGNoiseFigureSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_ind this->m_reverse_api_channel_index_isSet = true; } +SWGChannelMarker* +SWGNoiseFigureSettings::getChannelMarker() { + return channel_marker; +} +void +SWGNoiseFigureSettings::setChannelMarker(SWGChannelMarker* channel_marker) { + this->channel_marker = channel_marker; + this->m_channel_marker_isSet = true; +} + bool SWGNoiseFigureSettings::isSet(){ @@ -648,6 +670,9 @@ SWGNoiseFigureSettings::isSet(){ if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break; } + if(channel_marker && channel_marker->isSet()){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGNoiseFigureSettings.h b/swagger/sdrangel/code/qt5/client/SWGNoiseFigureSettings.h index f25269d4a..e40abaefd 100644 --- a/swagger/sdrangel/code/qt5/client/SWGNoiseFigureSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGNoiseFigureSettings.h @@ -22,6 +22,7 @@ #include +#include "SWGChannelMarker.h" #include #include "SWGObject.h" @@ -114,6 +115,9 @@ public: qint32 getReverseApiChannelIndex(); void setReverseApiChannelIndex(qint32 reverse_api_channel_index); + SWGChannelMarker* getChannelMarker(); + void setChannelMarker(SWGChannelMarker* channel_marker); + virtual bool isSet() override; @@ -190,6 +194,9 @@ private: qint32 reverse_api_channel_index; bool m_reverse_api_channel_index_isSet; + SWGChannelMarker* channel_marker; + bool m_channel_marker_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGPacketDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGPacketDemodSettings.cpp index 59f5829ba..9ffce147f 100644 --- a/swagger/sdrangel/code/qt5/client/SWGPacketDemodSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGPacketDemodSettings.cpp @@ -62,6 +62,8 @@ SWGPacketDemodSettings::SWGPacketDemodSettings() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + channel_marker = nullptr; + m_channel_marker_isSet = false; } SWGPacketDemodSettings::~SWGPacketDemodSettings() { @@ -104,6 +106,8 @@ SWGPacketDemodSettings::init() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + channel_marker = new SWGChannelMarker(); + m_channel_marker_isSet = false; } void @@ -133,6 +137,9 @@ SWGPacketDemodSettings::cleanup() { + if(channel_marker != nullptr) { + delete channel_marker; + } } SWGPacketDemodSettings* @@ -180,6 +187,8 @@ SWGPacketDemodSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", ""); + ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); + } QString @@ -247,6 +256,9 @@ SWGPacketDemodSettings::asJsonObject() { if(m_reverse_api_channel_index_isSet){ obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index)); } + if((channel_marker != nullptr) && (channel_marker->isSet())){ + toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker")); + } return obj; } @@ -421,6 +433,16 @@ SWGPacketDemodSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_ind this->m_reverse_api_channel_index_isSet = true; } +SWGChannelMarker* +SWGPacketDemodSettings::getChannelMarker() { + return channel_marker; +} +void +SWGPacketDemodSettings::setChannelMarker(SWGChannelMarker* channel_marker) { + this->channel_marker = channel_marker; + this->m_channel_marker_isSet = true; +} + bool SWGPacketDemodSettings::isSet(){ @@ -477,6 +499,9 @@ SWGPacketDemodSettings::isSet(){ if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break; } + if(channel_marker && channel_marker->isSet()){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGPacketDemodSettings.h b/swagger/sdrangel/code/qt5/client/SWGPacketDemodSettings.h index 301fb9d94..25af4353b 100644 --- a/swagger/sdrangel/code/qt5/client/SWGPacketDemodSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGPacketDemodSettings.h @@ -22,6 +22,7 @@ #include +#include "SWGChannelMarker.h" #include #include "SWGObject.h" @@ -93,6 +94,9 @@ public: qint32 getReverseApiChannelIndex(); void setReverseApiChannelIndex(qint32 reverse_api_channel_index); + SWGChannelMarker* getChannelMarker(); + void setChannelMarker(SWGChannelMarker* channel_marker); + virtual bool isSet() override; @@ -148,6 +152,9 @@ private: qint32 reverse_api_channel_index; bool m_reverse_api_channel_index_isSet; + SWGChannelMarker* channel_marker; + bool m_channel_marker_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGPagerDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGPagerDemodSettings.cpp index 2e3b90c7c..b492c0e13 100644 --- a/swagger/sdrangel/code/qt5/client/SWGPagerDemodSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGPagerDemodSettings.cpp @@ -70,6 +70,10 @@ SWGPagerDemodSettings::SWGPagerDemodSettings() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + scope_config = nullptr; + m_scope_config_isSet = false; + channel_marker = nullptr; + m_channel_marker_isSet = false; } SWGPagerDemodSettings::~SWGPagerDemodSettings() { @@ -120,6 +124,10 @@ SWGPagerDemodSettings::init() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + scope_config = new SWGGLScope(); + m_scope_config_isSet = false; + channel_marker = new SWGChannelMarker(); + m_channel_marker_isSet = false; } void @@ -153,6 +161,12 @@ SWGPagerDemodSettings::cleanup() { + if(scope_config != nullptr) { + delete scope_config; + } + if(channel_marker != nullptr) { + delete channel_marker; + } } SWGPagerDemodSettings* @@ -208,6 +222,10 @@ SWGPagerDemodSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", ""); + ::SWGSDRangel::setValue(&scope_config, pJson["scopeConfig"], "SWGGLScope", "SWGGLScope"); + + ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); + } QString @@ -287,6 +305,12 @@ SWGPagerDemodSettings::asJsonObject() { if(m_reverse_api_channel_index_isSet){ obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index)); } + if((scope_config != nullptr) && (scope_config->isSet())){ + toJsonValue(QString("scopeConfig"), scope_config, obj, QString("SWGGLScope")); + } + if((channel_marker != nullptr) && (channel_marker->isSet())){ + toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker")); + } return obj; } @@ -501,6 +525,26 @@ SWGPagerDemodSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_inde this->m_reverse_api_channel_index_isSet = true; } +SWGGLScope* +SWGPagerDemodSettings::getScopeConfig() { + return scope_config; +} +void +SWGPagerDemodSettings::setScopeConfig(SWGGLScope* scope_config) { + this->scope_config = scope_config; + this->m_scope_config_isSet = true; +} + +SWGChannelMarker* +SWGPagerDemodSettings::getChannelMarker() { + return channel_marker; +} +void +SWGPagerDemodSettings::setChannelMarker(SWGChannelMarker* channel_marker) { + this->channel_marker = channel_marker; + this->m_channel_marker_isSet = true; +} + bool SWGPagerDemodSettings::isSet(){ @@ -569,6 +613,12 @@ SWGPagerDemodSettings::isSet(){ if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break; } + if(scope_config && scope_config->isSet()){ + isObjectUpdated = true; break; + } + if(channel_marker && channel_marker->isSet()){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGPagerDemodSettings.h b/swagger/sdrangel/code/qt5/client/SWGPagerDemodSettings.h index a11198d59..4ae189f71 100644 --- a/swagger/sdrangel/code/qt5/client/SWGPagerDemodSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGPagerDemodSettings.h @@ -22,6 +22,8 @@ #include +#include "SWGChannelMarker.h" +#include "SWGGLScope.h" #include #include "SWGObject.h" @@ -105,6 +107,12 @@ public: qint32 getReverseApiChannelIndex(); void setReverseApiChannelIndex(qint32 reverse_api_channel_index); + SWGGLScope* getScopeConfig(); + void setScopeConfig(SWGGLScope* scope_config); + + SWGChannelMarker* getChannelMarker(); + void setChannelMarker(SWGChannelMarker* channel_marker); + virtual bool isSet() override; @@ -172,6 +180,12 @@ private: qint32 reverse_api_channel_index; bool m_reverse_api_channel_index_isSet; + SWGGLScope* scope_config; + bool m_scope_config_isSet; + + SWGChannelMarker* channel_marker; + bool m_channel_marker_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGRadioAstronomySettings.cpp b/swagger/sdrangel/code/qt5/client/SWGRadioAstronomySettings.cpp index 38c9f77c1..77b76b47e 100644 --- a/swagger/sdrangel/code/qt5/client/SWGRadioAstronomySettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGRadioAstronomySettings.cpp @@ -86,6 +86,8 @@ SWGRadioAstronomySettings::SWGRadioAstronomySettings() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + channel_marker = nullptr; + m_channel_marker_isSet = false; } SWGRadioAstronomySettings::~SWGRadioAstronomySettings() { @@ -152,6 +154,8 @@ SWGRadioAstronomySettings::init() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + channel_marker = new SWGChannelMarker(); + m_channel_marker_isSet = false; } void @@ -197,6 +201,9 @@ SWGRadioAstronomySettings::cleanup() { + if(channel_marker != nullptr) { + delete channel_marker; + } } SWGRadioAstronomySettings* @@ -268,6 +275,8 @@ SWGRadioAstronomySettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", ""); + ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); + } QString @@ -371,6 +380,9 @@ SWGRadioAstronomySettings::asJsonObject() { if(m_reverse_api_channel_index_isSet){ obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index)); } + if((channel_marker != nullptr) && (channel_marker->isSet())){ + toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker")); + } return obj; } @@ -665,6 +677,16 @@ SWGRadioAstronomySettings::setReverseApiChannelIndex(qint32 reverse_api_channel_ this->m_reverse_api_channel_index_isSet = true; } +SWGChannelMarker* +SWGRadioAstronomySettings::getChannelMarker() { + return channel_marker; +} +void +SWGRadioAstronomySettings::setChannelMarker(SWGChannelMarker* channel_marker) { + this->channel_marker = channel_marker; + this->m_channel_marker_isSet = true; +} + bool SWGRadioAstronomySettings::isSet(){ @@ -757,6 +779,9 @@ SWGRadioAstronomySettings::isSet(){ if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break; } + if(channel_marker && channel_marker->isSet()){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGRadioAstronomySettings.h b/swagger/sdrangel/code/qt5/client/SWGRadioAstronomySettings.h index 432e4767f..3da3aab2f 100644 --- a/swagger/sdrangel/code/qt5/client/SWGRadioAstronomySettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGRadioAstronomySettings.h @@ -22,6 +22,7 @@ #include +#include "SWGChannelMarker.h" #include #include "SWGObject.h" @@ -129,6 +130,9 @@ public: qint32 getReverseApiChannelIndex(); void setReverseApiChannelIndex(qint32 reverse_api_channel_index); + SWGChannelMarker* getChannelMarker(); + void setChannelMarker(SWGChannelMarker* channel_marker); + virtual bool isSet() override; @@ -220,6 +224,9 @@ private: qint32 reverse_api_channel_index; bool m_reverse_api_channel_index_isSet; + SWGChannelMarker* channel_marker; + bool m_channel_marker_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGRadioClockSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGRadioClockSettings.cpp index e388ea83b..8f511af8b 100644 --- a/swagger/sdrangel/code/qt5/client/SWGRadioClockSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGRadioClockSettings.cpp @@ -54,6 +54,10 @@ SWGRadioClockSettings::SWGRadioClockSettings() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + scope_config = nullptr; + m_scope_config_isSet = false; + channel_marker = nullptr; + m_channel_marker_isSet = false; } SWGRadioClockSettings::~SWGRadioClockSettings() { @@ -88,6 +92,10 @@ SWGRadioClockSettings::init() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + scope_config = new SWGGLScope(); + m_scope_config_isSet = false; + channel_marker = new SWGChannelMarker(); + m_channel_marker_isSet = false; } void @@ -109,6 +117,12 @@ SWGRadioClockSettings::cleanup() { + if(scope_config != nullptr) { + delete scope_config; + } + if(channel_marker != nullptr) { + delete channel_marker; + } } SWGRadioClockSettings* @@ -148,6 +162,10 @@ SWGRadioClockSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", ""); + ::SWGSDRangel::setValue(&scope_config, pJson["scopeConfig"], "SWGGLScope", "SWGGLScope"); + + ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); + } QString @@ -203,6 +221,12 @@ SWGRadioClockSettings::asJsonObject() { if(m_reverse_api_channel_index_isSet){ obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index)); } + if((scope_config != nullptr) && (scope_config->isSet())){ + toJsonValue(QString("scopeConfig"), scope_config, obj, QString("SWGGLScope")); + } + if((channel_marker != nullptr) && (channel_marker->isSet())){ + toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker")); + } return obj; } @@ -337,6 +361,26 @@ SWGRadioClockSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_inde this->m_reverse_api_channel_index_isSet = true; } +SWGGLScope* +SWGRadioClockSettings::getScopeConfig() { + return scope_config; +} +void +SWGRadioClockSettings::setScopeConfig(SWGGLScope* scope_config) { + this->scope_config = scope_config; + this->m_scope_config_isSet = true; +} + +SWGChannelMarker* +SWGRadioClockSettings::getChannelMarker() { + return channel_marker; +} +void +SWGRadioClockSettings::setChannelMarker(SWGChannelMarker* channel_marker) { + this->channel_marker = channel_marker; + this->m_channel_marker_isSet = true; +} + bool SWGRadioClockSettings::isSet(){ @@ -381,6 +425,12 @@ SWGRadioClockSettings::isSet(){ if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break; } + if(scope_config && scope_config->isSet()){ + isObjectUpdated = true; break; + } + if(channel_marker && channel_marker->isSet()){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGRadioClockSettings.h b/swagger/sdrangel/code/qt5/client/SWGRadioClockSettings.h index db17188eb..ed8f5da7f 100644 --- a/swagger/sdrangel/code/qt5/client/SWGRadioClockSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGRadioClockSettings.h @@ -22,6 +22,8 @@ #include +#include "SWGChannelMarker.h" +#include "SWGGLScope.h" #include #include "SWGObject.h" @@ -81,6 +83,12 @@ public: qint32 getReverseApiChannelIndex(); void setReverseApiChannelIndex(qint32 reverse_api_channel_index); + SWGGLScope* getScopeConfig(); + void setScopeConfig(SWGGLScope* scope_config); + + SWGChannelMarker* getChannelMarker(); + void setChannelMarker(SWGChannelMarker* channel_marker); + virtual bool isSet() override; @@ -124,6 +132,12 @@ private: qint32 reverse_api_channel_index; bool m_reverse_api_channel_index_isSet; + SWGGLScope* scope_config; + bool m_scope_config_isSet; + + SWGChannelMarker* channel_marker; + bool m_channel_marker_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGRemoteSinkSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGRemoteSinkSettings.cpp index 574847e02..af2b80266 100644 --- a/swagger/sdrangel/code/qt5/client/SWGRemoteSinkSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGRemoteSinkSettings.cpp @@ -56,6 +56,8 @@ SWGRemoteSinkSettings::SWGRemoteSinkSettings() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + channel_marker = nullptr; + m_channel_marker_isSet = false; } SWGRemoteSinkSettings::~SWGRemoteSinkSettings() { @@ -92,6 +94,8 @@ SWGRemoteSinkSettings::init() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + channel_marker = new SWGChannelMarker(); + m_channel_marker_isSet = false; } void @@ -116,6 +120,9 @@ SWGRemoteSinkSettings::cleanup() { + if(channel_marker != nullptr) { + delete channel_marker; + } } SWGRemoteSinkSettings* @@ -157,6 +164,8 @@ SWGRemoteSinkSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", ""); + ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); + } QString @@ -215,6 +224,9 @@ SWGRemoteSinkSettings::asJsonObject() { if(m_reverse_api_channel_index_isSet){ obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index)); } + if((channel_marker != nullptr) && (channel_marker->isSet())){ + toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker")); + } return obj; } @@ -359,6 +371,16 @@ SWGRemoteSinkSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_inde this->m_reverse_api_channel_index_isSet = true; } +SWGChannelMarker* +SWGRemoteSinkSettings::getChannelMarker() { + return channel_marker; +} +void +SWGRemoteSinkSettings::setChannelMarker(SWGChannelMarker* channel_marker) { + this->channel_marker = channel_marker; + this->m_channel_marker_isSet = true; +} + bool SWGRemoteSinkSettings::isSet(){ @@ -406,6 +428,9 @@ SWGRemoteSinkSettings::isSet(){ if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break; } + if(channel_marker && channel_marker->isSet()){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGRemoteSinkSettings.h b/swagger/sdrangel/code/qt5/client/SWGRemoteSinkSettings.h index e32af5c70..b913f5669 100644 --- a/swagger/sdrangel/code/qt5/client/SWGRemoteSinkSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGRemoteSinkSettings.h @@ -22,6 +22,7 @@ #include +#include "SWGChannelMarker.h" #include #include "SWGObject.h" @@ -84,6 +85,9 @@ public: qint32 getReverseApiChannelIndex(); void setReverseApiChannelIndex(qint32 reverse_api_channel_index); + SWGChannelMarker* getChannelMarker(); + void setChannelMarker(SWGChannelMarker* channel_marker); + virtual bool isSet() override; @@ -130,6 +134,9 @@ private: qint32 reverse_api_channel_index; bool m_reverse_api_channel_index_isSet; + SWGChannelMarker* channel_marker; + bool m_channel_marker_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGSSBDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGSSBDemodSettings.cpp index e6aa21137..17c4a6eec 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSSBDemodSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGSSBDemodSettings.cpp @@ -76,6 +76,8 @@ SWGSSBDemodSettings::SWGSSBDemodSettings() { m_reverse_api_channel_index_isSet = false; spectrum_config = nullptr; m_spectrum_config_isSet = false; + channel_marker = nullptr; + m_channel_marker_isSet = false; } SWGSSBDemodSettings::~SWGSSBDemodSettings() { @@ -132,6 +134,8 @@ SWGSSBDemodSettings::init() { m_reverse_api_channel_index_isSet = false; spectrum_config = new SWGGLSpectrum(); m_spectrum_config_isSet = false; + channel_marker = new SWGChannelMarker(); + m_channel_marker_isSet = false; } void @@ -168,6 +172,9 @@ SWGSSBDemodSettings::cleanup() { if(spectrum_config != nullptr) { delete spectrum_config; } + if(channel_marker != nullptr) { + delete channel_marker; + } } SWGSSBDemodSettings* @@ -229,6 +236,8 @@ SWGSSBDemodSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&spectrum_config, pJson["spectrumConfig"], "SWGGLSpectrum", "SWGGLSpectrum"); + ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); + } QString @@ -317,6 +326,9 @@ SWGSSBDemodSettings::asJsonObject() { if((spectrum_config != nullptr) && (spectrum_config->isSet())){ toJsonValue(QString("spectrumConfig"), spectrum_config, obj, QString("SWGGLSpectrum")); } + if((channel_marker != nullptr) && (channel_marker->isSet())){ + toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker")); + } return obj; } @@ -561,6 +573,16 @@ SWGSSBDemodSettings::setSpectrumConfig(SWGGLSpectrum* spectrum_config) { this->m_spectrum_config_isSet = true; } +SWGChannelMarker* +SWGSSBDemodSettings::getChannelMarker() { + return channel_marker; +} +void +SWGSSBDemodSettings::setChannelMarker(SWGChannelMarker* channel_marker) { + this->channel_marker = channel_marker; + this->m_channel_marker_isSet = true; +} + bool SWGSSBDemodSettings::isSet(){ @@ -638,6 +660,9 @@ SWGSSBDemodSettings::isSet(){ if(spectrum_config && spectrum_config->isSet()){ isObjectUpdated = true; break; } + if(channel_marker && channel_marker->isSet()){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGSSBDemodSettings.h b/swagger/sdrangel/code/qt5/client/SWGSSBDemodSettings.h index 4a551b1a4..8a951b3fe 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSSBDemodSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGSSBDemodSettings.h @@ -22,6 +22,7 @@ #include +#include "SWGChannelMarker.h" #include "SWGGLSpectrum.h" #include @@ -115,6 +116,9 @@ public: SWGGLSpectrum* getSpectrumConfig(); void setSpectrumConfig(SWGGLSpectrum* spectrum_config); + SWGChannelMarker* getChannelMarker(); + void setChannelMarker(SWGChannelMarker* channel_marker); + virtual bool isSet() override; @@ -191,6 +195,9 @@ private: SWGGLSpectrum* spectrum_config; bool m_spectrum_config_isSet; + SWGChannelMarker* channel_marker; + bool m_channel_marker_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGSigMFFileSinkSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGSigMFFileSinkSettings.cpp index 350629960..d131beb16 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSigMFFileSinkSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGSigMFFileSinkSettings.cpp @@ -62,6 +62,8 @@ SWGSigMFFileSinkSettings::SWGSigMFFileSinkSettings() { m_reverse_api_channel_index_isSet = false; spectrum_config = nullptr; m_spectrum_config_isSet = false; + channel_marker = nullptr; + m_channel_marker_isSet = false; } SWGSigMFFileSinkSettings::~SWGSigMFFileSinkSettings() { @@ -104,6 +106,8 @@ SWGSigMFFileSinkSettings::init() { m_reverse_api_channel_index_isSet = false; spectrum_config = new SWGGLSpectrum(); m_spectrum_config_isSet = false; + channel_marker = new SWGChannelMarker(); + m_channel_marker_isSet = false; } void @@ -133,6 +137,9 @@ SWGSigMFFileSinkSettings::cleanup() { if(spectrum_config != nullptr) { delete spectrum_config; } + if(channel_marker != nullptr) { + delete channel_marker; + } } SWGSigMFFileSinkSettings* @@ -180,6 +187,8 @@ SWGSigMFFileSinkSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&spectrum_config, pJson["spectrumConfig"], "SWGGLSpectrum", "SWGGLSpectrum"); + ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); + } QString @@ -247,6 +256,9 @@ SWGSigMFFileSinkSettings::asJsonObject() { if((spectrum_config != nullptr) && (spectrum_config->isSet())){ toJsonValue(QString("spectrumConfig"), spectrum_config, obj, QString("SWGGLSpectrum")); } + if((channel_marker != nullptr) && (channel_marker->isSet())){ + toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker")); + } return obj; } @@ -421,6 +433,16 @@ SWGSigMFFileSinkSettings::setSpectrumConfig(SWGGLSpectrum* spectrum_config) { this->m_spectrum_config_isSet = true; } +SWGChannelMarker* +SWGSigMFFileSinkSettings::getChannelMarker() { + return channel_marker; +} +void +SWGSigMFFileSinkSettings::setChannelMarker(SWGChannelMarker* channel_marker) { + this->channel_marker = channel_marker; + this->m_channel_marker_isSet = true; +} + bool SWGSigMFFileSinkSettings::isSet(){ @@ -477,6 +499,9 @@ SWGSigMFFileSinkSettings::isSet(){ if(spectrum_config && spectrum_config->isSet()){ isObjectUpdated = true; break; } + if(channel_marker && channel_marker->isSet()){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGSigMFFileSinkSettings.h b/swagger/sdrangel/code/qt5/client/SWGSigMFFileSinkSettings.h index cc871ef98..1daaffde0 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSigMFFileSinkSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGSigMFFileSinkSettings.h @@ -22,6 +22,7 @@ #include +#include "SWGChannelMarker.h" #include "SWGGLSpectrum.h" #include @@ -94,6 +95,9 @@ public: SWGGLSpectrum* getSpectrumConfig(); void setSpectrumConfig(SWGGLSpectrum* spectrum_config); + SWGChannelMarker* getChannelMarker(); + void setChannelMarker(SWGChannelMarker* channel_marker); + virtual bool isSet() override; @@ -149,6 +153,9 @@ private: SWGGLSpectrum* spectrum_config; bool m_spectrum_config_isSet; + SWGChannelMarker* channel_marker; + bool m_channel_marker_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGUDPSinkSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGUDPSinkSettings.cpp index 58862f397..d41d205e6 100644 --- a/swagger/sdrangel/code/qt5/client/SWGUDPSinkSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGUDPSinkSettings.cpp @@ -80,6 +80,8 @@ SWGUDPSinkSettings::SWGUDPSinkSettings() { m_reverse_api_channel_index_isSet = false; spectrum_config = nullptr; m_spectrum_config_isSet = false; + channel_marker = nullptr; + m_channel_marker_isSet = false; } SWGUDPSinkSettings::~SWGUDPSinkSettings() { @@ -140,6 +142,8 @@ SWGUDPSinkSettings::init() { m_reverse_api_channel_index_isSet = false; spectrum_config = new SWGGLSpectrum(); m_spectrum_config_isSet = false; + channel_marker = new SWGChannelMarker(); + m_channel_marker_isSet = false; } void @@ -178,6 +182,9 @@ SWGUDPSinkSettings::cleanup() { if(spectrum_config != nullptr) { delete spectrum_config; } + if(channel_marker != nullptr) { + delete channel_marker; + } } SWGUDPSinkSettings* @@ -243,6 +250,8 @@ SWGUDPSinkSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&spectrum_config, pJson["spectrumConfig"], "SWGGLSpectrum", "SWGGLSpectrum"); + ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); + } QString @@ -337,6 +346,9 @@ SWGUDPSinkSettings::asJsonObject() { if((spectrum_config != nullptr) && (spectrum_config->isSet())){ toJsonValue(QString("spectrumConfig"), spectrum_config, obj, QString("SWGGLSpectrum")); } + if((channel_marker != nullptr) && (channel_marker->isSet())){ + toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker")); + } return obj; } @@ -601,6 +613,16 @@ SWGUDPSinkSettings::setSpectrumConfig(SWGGLSpectrum* spectrum_config) { this->m_spectrum_config_isSet = true; } +SWGChannelMarker* +SWGUDPSinkSettings::getChannelMarker() { + return channel_marker; +} +void +SWGUDPSinkSettings::setChannelMarker(SWGChannelMarker* channel_marker) { + this->channel_marker = channel_marker; + this->m_channel_marker_isSet = true; +} + bool SWGUDPSinkSettings::isSet(){ @@ -684,6 +706,9 @@ SWGUDPSinkSettings::isSet(){ if(spectrum_config && spectrum_config->isSet()){ isObjectUpdated = true; break; } + if(channel_marker && channel_marker->isSet()){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGUDPSinkSettings.h b/swagger/sdrangel/code/qt5/client/SWGUDPSinkSettings.h index f280b3125..af85935ad 100644 --- a/swagger/sdrangel/code/qt5/client/SWGUDPSinkSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGUDPSinkSettings.h @@ -22,6 +22,7 @@ #include +#include "SWGChannelMarker.h" #include "SWGGLSpectrum.h" #include @@ -121,6 +122,9 @@ public: SWGGLSpectrum* getSpectrumConfig(); void setSpectrumConfig(SWGGLSpectrum* spectrum_config); + SWGChannelMarker* getChannelMarker(); + void setChannelMarker(SWGChannelMarker* channel_marker); + virtual bool isSet() override; @@ -203,6 +207,9 @@ private: SWGGLSpectrum* spectrum_config; bool m_spectrum_config_isSet; + SWGChannelMarker* channel_marker; + bool m_channel_marker_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGVORDemodSCSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGVORDemodSCSettings.cpp index 7ccdfc727..681c5ead3 100644 --- a/swagger/sdrangel/code/qt5/client/SWGVORDemodSCSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGVORDemodSCSettings.cpp @@ -58,6 +58,8 @@ SWGVORDemodSCSettings::SWGVORDemodSCSettings() { m_reverse_api_channel_index_isSet = false; ident_threshold = 0; m_ident_threshold_isSet = false; + channel_marker = nullptr; + m_channel_marker_isSet = false; } SWGVORDemodSCSettings::~SWGVORDemodSCSettings() { @@ -96,6 +98,8 @@ SWGVORDemodSCSettings::init() { m_reverse_api_channel_index_isSet = false; ident_threshold = 0; m_ident_threshold_isSet = false; + channel_marker = new SWGChannelMarker(); + m_channel_marker_isSet = false; } void @@ -121,6 +125,9 @@ SWGVORDemodSCSettings::cleanup() { + if(channel_marker != nullptr) { + delete channel_marker; + } } SWGVORDemodSCSettings* @@ -164,6 +171,8 @@ SWGVORDemodSCSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&ident_threshold, pJson["identThreshold"], "qint32", ""); + ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); + } QString @@ -225,6 +234,9 @@ SWGVORDemodSCSettings::asJsonObject() { if(m_ident_threshold_isSet){ obj->insert("identThreshold", QJsonValue(ident_threshold)); } + if((channel_marker != nullptr) && (channel_marker->isSet())){ + toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker")); + } return obj; } @@ -379,6 +391,16 @@ SWGVORDemodSCSettings::setIdentThreshold(qint32 ident_threshold) { this->m_ident_threshold_isSet = true; } +SWGChannelMarker* +SWGVORDemodSCSettings::getChannelMarker() { + return channel_marker; +} +void +SWGVORDemodSCSettings::setChannelMarker(SWGChannelMarker* channel_marker) { + this->channel_marker = channel_marker; + this->m_channel_marker_isSet = true; +} + bool SWGVORDemodSCSettings::isSet(){ @@ -429,6 +451,9 @@ SWGVORDemodSCSettings::isSet(){ if(m_ident_threshold_isSet){ isObjectUpdated = true; break; } + if(channel_marker && channel_marker->isSet()){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGVORDemodSCSettings.h b/swagger/sdrangel/code/qt5/client/SWGVORDemodSCSettings.h index 2cdba534e..99d03baf7 100644 --- a/swagger/sdrangel/code/qt5/client/SWGVORDemodSCSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGVORDemodSCSettings.h @@ -22,6 +22,7 @@ #include +#include "SWGChannelMarker.h" #include #include "SWGObject.h" @@ -87,6 +88,9 @@ public: qint32 getIdentThreshold(); void setIdentThreshold(qint32 ident_threshold); + SWGChannelMarker* getChannelMarker(); + void setChannelMarker(SWGChannelMarker* channel_marker); + virtual bool isSet() override; @@ -136,6 +140,9 @@ private: qint32 ident_threshold; bool m_ident_threshold_isSet; + SWGChannelMarker* channel_marker; + bool m_channel_marker_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGVORDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGVORDemodSettings.cpp index 094a56148..8a7900243 100644 --- a/swagger/sdrangel/code/qt5/client/SWGVORDemodSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGVORDemodSettings.cpp @@ -56,6 +56,8 @@ SWGVORDemodSettings::SWGVORDemodSettings() { m_ident_threshold_isSet = false; mag_dec_adjust = 0; m_mag_dec_adjust_isSet = false; + channel_marker = nullptr; + m_channel_marker_isSet = false; } SWGVORDemodSettings::~SWGVORDemodSettings() { @@ -92,6 +94,8 @@ SWGVORDemodSettings::init() { m_ident_threshold_isSet = false; mag_dec_adjust = 0; m_mag_dec_adjust_isSet = false; + channel_marker = new SWGChannelMarker(); + m_channel_marker_isSet = false; } void @@ -116,6 +120,9 @@ SWGVORDemodSettings::cleanup() { + if(channel_marker != nullptr) { + delete channel_marker; + } } SWGVORDemodSettings* @@ -157,6 +164,8 @@ SWGVORDemodSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&mag_dec_adjust, pJson["magDecAdjust"], "qint32", ""); + ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); + } QString @@ -215,6 +224,9 @@ SWGVORDemodSettings::asJsonObject() { if(m_mag_dec_adjust_isSet){ obj->insert("magDecAdjust", QJsonValue(mag_dec_adjust)); } + if((channel_marker != nullptr) && (channel_marker->isSet())){ + toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker")); + } return obj; } @@ -359,6 +371,16 @@ SWGVORDemodSettings::setMagDecAdjust(qint32 mag_dec_adjust) { this->m_mag_dec_adjust_isSet = true; } +SWGChannelMarker* +SWGVORDemodSettings::getChannelMarker() { + return channel_marker; +} +void +SWGVORDemodSettings::setChannelMarker(SWGChannelMarker* channel_marker) { + this->channel_marker = channel_marker; + this->m_channel_marker_isSet = true; +} + bool SWGVORDemodSettings::isSet(){ @@ -406,6 +428,9 @@ SWGVORDemodSettings::isSet(){ if(m_mag_dec_adjust_isSet){ isObjectUpdated = true; break; } + if(channel_marker && channel_marker->isSet()){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGVORDemodSettings.h b/swagger/sdrangel/code/qt5/client/SWGVORDemodSettings.h index 342b4fe5d..c555e7bd1 100644 --- a/swagger/sdrangel/code/qt5/client/SWGVORDemodSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGVORDemodSettings.h @@ -22,6 +22,7 @@ #include +#include "SWGChannelMarker.h" #include #include "SWGObject.h" @@ -84,6 +85,9 @@ public: qint32 getMagDecAdjust(); void setMagDecAdjust(qint32 mag_dec_adjust); + SWGChannelMarker* getChannelMarker(); + void setChannelMarker(SWGChannelMarker* channel_marker); + virtual bool isSet() override; @@ -130,6 +134,9 @@ private: qint32 mag_dec_adjust; bool m_mag_dec_adjust_isSet; + SWGChannelMarker* channel_marker; + bool m_channel_marker_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGWFMDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGWFMDemodSettings.cpp index 6cf68b52a..349e19a77 100644 --- a/swagger/sdrangel/code/qt5/client/SWGWFMDemodSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGWFMDemodSettings.cpp @@ -58,6 +58,8 @@ SWGWFMDemodSettings::SWGWFMDemodSettings() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + channel_marker = nullptr; + m_channel_marker_isSet = false; } SWGWFMDemodSettings::~SWGWFMDemodSettings() { @@ -96,6 +98,8 @@ SWGWFMDemodSettings::init() { m_reverse_api_device_index_isSet = false; reverse_api_channel_index = 0; m_reverse_api_channel_index_isSet = false; + channel_marker = new SWGChannelMarker(); + m_channel_marker_isSet = false; } void @@ -121,6 +125,9 @@ SWGWFMDemodSettings::cleanup() { + if(channel_marker != nullptr) { + delete channel_marker; + } } SWGWFMDemodSettings* @@ -164,6 +171,8 @@ SWGWFMDemodSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", ""); + ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); + } QString @@ -225,6 +234,9 @@ SWGWFMDemodSettings::asJsonObject() { if(m_reverse_api_channel_index_isSet){ obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index)); } + if((channel_marker != nullptr) && (channel_marker->isSet())){ + toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker")); + } return obj; } @@ -379,6 +391,16 @@ SWGWFMDemodSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index) this->m_reverse_api_channel_index_isSet = true; } +SWGChannelMarker* +SWGWFMDemodSettings::getChannelMarker() { + return channel_marker; +} +void +SWGWFMDemodSettings::setChannelMarker(SWGChannelMarker* channel_marker) { + this->channel_marker = channel_marker; + this->m_channel_marker_isSet = true; +} + bool SWGWFMDemodSettings::isSet(){ @@ -429,6 +451,9 @@ SWGWFMDemodSettings::isSet(){ if(m_reverse_api_channel_index_isSet){ isObjectUpdated = true; break; } + if(channel_marker && channel_marker->isSet()){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGWFMDemodSettings.h b/swagger/sdrangel/code/qt5/client/SWGWFMDemodSettings.h index 9d1568127..1e6c2c409 100644 --- a/swagger/sdrangel/code/qt5/client/SWGWFMDemodSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGWFMDemodSettings.h @@ -22,6 +22,7 @@ #include +#include "SWGChannelMarker.h" #include #include "SWGObject.h" @@ -87,6 +88,9 @@ public: qint32 getReverseApiChannelIndex(); void setReverseApiChannelIndex(qint32 reverse_api_channel_index); + SWGChannelMarker* getChannelMarker(); + void setChannelMarker(SWGChannelMarker* channel_marker); + virtual bool isSet() override; @@ -136,6 +140,9 @@ private: qint32 reverse_api_channel_index; bool m_reverse_api_channel_index_isSet; + SWGChannelMarker* channel_marker; + bool m_channel_marker_isSet; + }; }