mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-09-28 07:46:37 -04:00
API: implemented Channel Marker in Tx channels
This commit is contained in:
parent
8a438a94c1
commit
2a3ce0e7fb
@ -34,6 +34,7 @@
|
|||||||
#include "dsp/hbfilterchainconverter.h"
|
#include "dsp/hbfilterchainconverter.h"
|
||||||
#include "dsp/filerecord.h"
|
#include "dsp/filerecord.h"
|
||||||
#include "feature/feature.h"
|
#include "feature/feature.h"
|
||||||
|
#include "settings/serializable.h"
|
||||||
#include "util/db.h"
|
#include "util/db.h"
|
||||||
#include "maincore.h"
|
#include "maincore.h"
|
||||||
|
|
||||||
@ -373,6 +374,9 @@ void FileSource::webapiUpdateChannelSettings(
|
|||||||
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
|
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
|
||||||
settings.m_reverseAPIChannelIndex = response.getFileSourceSettings()->getReverseApiChannelIndex();
|
settings.m_reverseAPIChannelIndex = response.getFileSourceSettings()->getReverseApiChannelIndex();
|
||||||
}
|
}
|
||||||
|
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
|
||||||
|
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getFileSourceSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int FileSource::webapiReportGet(
|
int FileSource::webapiReportGet(
|
||||||
@ -463,6 +467,20 @@ void FileSource::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& re
|
|||||||
response.getFileSourceSettings()->setReverseApiPort(settings.m_reverseAPIPort);
|
response.getFileSourceSettings()->setReverseApiPort(settings.m_reverseAPIPort);
|
||||||
response.getFileSourceSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
|
response.getFileSourceSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
|
||||||
response.getFileSourceSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
|
response.getFileSourceSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
|
||||||
|
|
||||||
|
if (settings.m_channelMarker)
|
||||||
|
{
|
||||||
|
if (response.getFileSourceSettings()->getChannelMarker())
|
||||||
|
{
|
||||||
|
settings.m_channelMarker->formatTo(response.getFileSourceSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
response.getFileSourceSettings()->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void FileSource::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
|
void FileSource::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
|
||||||
@ -584,6 +602,13 @@ void FileSource::webapiFormatChannelSettings(
|
|||||||
if (channelSettingsKeys.contains("streamIndex") || force) {
|
if (channelSettingsKeys.contains("streamIndex") || force) {
|
||||||
swgFileSourceSettings->setStreamIndex(settings.m_streamIndex);
|
swgFileSourceSettings->setStreamIndex(settings.m_streamIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
swgFileSourceSettings->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void FileSource::networkManagerFinished(QNetworkReply *reply)
|
void FileSource::networkManagerFinished(QNetworkReply *reply)
|
||||||
|
@ -82,6 +82,7 @@ bool FileSourceGUI::handleMessage(const Message& message)
|
|||||||
const FileSource::MsgConfigureFileSource& cfg = (FileSource::MsgConfigureFileSource&) message;
|
const FileSource::MsgConfigureFileSource& cfg = (FileSource::MsgConfigureFileSource&) message;
|
||||||
m_settings = cfg.getSettings();
|
m_settings = cfg.getSettings();
|
||||||
blockApplySettings(true);
|
blockApplySettings(true);
|
||||||
|
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
|
||||||
displaySettings();
|
displaySettings();
|
||||||
blockApplySettings(false);
|
blockApplySettings(false);
|
||||||
return true;
|
return true;
|
||||||
|
@ -32,6 +32,7 @@
|
|||||||
#include "dsp/hbfilterchainconverter.h"
|
#include "dsp/hbfilterchainconverter.h"
|
||||||
#include "device/deviceapi.h"
|
#include "device/deviceapi.h"
|
||||||
#include "feature/feature.h"
|
#include "feature/feature.h"
|
||||||
|
#include "settings/serializable.h"
|
||||||
#include "maincore.h"
|
#include "maincore.h"
|
||||||
|
|
||||||
#include "localsourcebaseband.h"
|
#include "localsourcebaseband.h"
|
||||||
@ -414,6 +415,9 @@ void LocalSource::webapiUpdateChannelSettings(
|
|||||||
if (channelSettingsKeys.contains("streamIndex")) {
|
if (channelSettingsKeys.contains("streamIndex")) {
|
||||||
settings.m_streamIndex = response.getLocalSourceSettings()->getStreamIndex();
|
settings.m_streamIndex = response.getLocalSourceSettings()->getStreamIndex();
|
||||||
}
|
}
|
||||||
|
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
|
||||||
|
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getLocalSourceSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void LocalSource::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const LocalSourceSettings& settings)
|
void LocalSource::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const LocalSourceSettings& settings)
|
||||||
@ -441,6 +445,20 @@ void LocalSource::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& r
|
|||||||
response.getLocalSourceSettings()->setReverseApiPort(settings.m_reverseAPIPort);
|
response.getLocalSourceSettings()->setReverseApiPort(settings.m_reverseAPIPort);
|
||||||
response.getLocalSourceSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
|
response.getLocalSourceSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
|
||||||
response.getLocalSourceSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
|
response.getLocalSourceSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
|
||||||
|
|
||||||
|
if (settings.m_channelMarker)
|
||||||
|
{
|
||||||
|
if (response.getLocalSourceSettings()->getChannelMarker())
|
||||||
|
{
|
||||||
|
settings.m_channelMarker->formatTo(response.getLocalSourceSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
response.getLocalSourceSettings()->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void LocalSource::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const LocalSourceSettings& settings, bool force)
|
void LocalSource::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const LocalSourceSettings& settings, bool force)
|
||||||
@ -527,6 +545,13 @@ void LocalSource::webapiFormatChannelSettings(
|
|||||||
if (channelSettingsKeys.contains("streamIndex") || force) {
|
if (channelSettingsKeys.contains("streamIndex") || force) {
|
||||||
swgLocalSourceSettings->setRgbColor(settings.m_streamIndex);
|
swgLocalSourceSettings->setRgbColor(settings.m_streamIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
swgLocalSourceSettings->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void LocalSource::networkManagerFinished(QNetworkReply *reply)
|
void LocalSource::networkManagerFinished(QNetworkReply *reply)
|
||||||
|
@ -76,6 +76,7 @@ bool LocalSourceGUI::handleMessage(const Message& message)
|
|||||||
const LocalSource::MsgConfigureLocalSource& cfg = (LocalSource::MsgConfigureLocalSource&) message;
|
const LocalSource::MsgConfigureLocalSource& cfg = (LocalSource::MsgConfigureLocalSource&) message;
|
||||||
m_settings = cfg.getSettings();
|
m_settings = cfg.getSettings();
|
||||||
blockApplySettings(true);
|
blockApplySettings(true);
|
||||||
|
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
|
||||||
displaySettings();
|
displaySettings();
|
||||||
blockApplySettings(false);
|
blockApplySettings(false);
|
||||||
return true;
|
return true;
|
||||||
|
@ -541,6 +541,9 @@ void IEEE_802_15_4_Mod::webapiUpdateChannelSettings(
|
|||||||
if (channelSettingsKeys.contains("udpPort")) {
|
if (channelSettingsKeys.contains("udpPort")) {
|
||||||
settings.m_udpPort = response.getIeee802154ModSettings()->getUdpPort();
|
settings.m_udpPort = response.getIeee802154ModSettings()->getUdpPort();
|
||||||
}
|
}
|
||||||
|
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
|
||||||
|
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getIeee802154ModSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int IEEE_802_15_4_Mod::webapiReportGet(
|
int IEEE_802_15_4_Mod::webapiReportGet(
|
||||||
@ -655,6 +658,20 @@ void IEEE_802_15_4_Mod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSetti
|
|||||||
}
|
}
|
||||||
|
|
||||||
response.getIeee802154ModSettings()->setUdpPort(settings.m_udpPort);
|
response.getIeee802154ModSettings()->setUdpPort(settings.m_udpPort);
|
||||||
|
|
||||||
|
if (settings.m_channelMarker)
|
||||||
|
{
|
||||||
|
if (response.getIeee802154ModSettings()->getChannelMarker())
|
||||||
|
{
|
||||||
|
settings.m_channelMarker->formatTo(response.getIeee802154ModSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
response.getIeee802154ModSettings()->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void IEEE_802_15_4_Mod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
|
void IEEE_802_15_4_Mod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
|
||||||
@ -834,6 +851,13 @@ void IEEE_802_15_4_Mod::webapiFormatChannelSettings(
|
|||||||
if (channelSettingsKeys.contains("udpPort") || force) {
|
if (channelSettingsKeys.contains("udpPort") || force) {
|
||||||
swgIEEE_802_15_4_ModSettings->setUdpPort(settings.m_udpPort);
|
swgIEEE_802_15_4_ModSettings->setUdpPort(settings.m_udpPort);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
swgIEEE_802_15_4_ModSettings->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void IEEE_802_15_4_Mod::networkManagerFinished(QNetworkReply *reply)
|
void IEEE_802_15_4_Mod::networkManagerFinished(QNetworkReply *reply)
|
||||||
|
@ -115,6 +115,7 @@ bool IEEE_802_15_4_ModGUI::handleMessage(const Message& message)
|
|||||||
const IEEE_802_15_4_Mod::MsgConfigureIEEE_802_15_4_Mod& cfg = (IEEE_802_15_4_Mod::MsgConfigureIEEE_802_15_4_Mod&) message;
|
const IEEE_802_15_4_Mod::MsgConfigureIEEE_802_15_4_Mod& cfg = (IEEE_802_15_4_Mod::MsgConfigureIEEE_802_15_4_Mod&) message;
|
||||||
m_settings = cfg.getSettings();
|
m_settings = cfg.getSettings();
|
||||||
blockApplySettings(true);
|
blockApplySettings(true);
|
||||||
|
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
|
||||||
displaySettings();
|
displaySettings();
|
||||||
blockApplySettings(false);
|
blockApplySettings(false);
|
||||||
return true;
|
return true;
|
||||||
|
@ -641,6 +641,9 @@ void AISMod::webapiUpdateChannelSettings(
|
|||||||
if (channelSettingsKeys.contains("udpPort")) {
|
if (channelSettingsKeys.contains("udpPort")) {
|
||||||
settings.m_udpPort = response.getAisModSettings()->getUdpPort();
|
settings.m_udpPort = response.getAisModSettings()->getUdpPort();
|
||||||
}
|
}
|
||||||
|
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
|
||||||
|
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getAisModSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int AISMod::webapiReportGet(
|
int AISMod::webapiReportGet(
|
||||||
@ -766,6 +769,20 @@ void AISMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respon
|
|||||||
response.getAisModSettings()->setUdpEnabled(settings.m_udpEnabled);
|
response.getAisModSettings()->setUdpEnabled(settings.m_udpEnabled);
|
||||||
response.getAisModSettings()->setUdpAddress(new QString(settings.m_udpAddress));
|
response.getAisModSettings()->setUdpAddress(new QString(settings.m_udpAddress));
|
||||||
response.getAisModSettings()->setUdpPort(settings.m_udpPort);
|
response.getAisModSettings()->setUdpPort(settings.m_udpPort);
|
||||||
|
|
||||||
|
if (settings.m_channelMarker)
|
||||||
|
{
|
||||||
|
if (response.getAisModSettings()->getChannelMarker())
|
||||||
|
{
|
||||||
|
settings.m_channelMarker->formatTo(response.getAisModSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
response.getAisModSettings()->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void AISMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
|
void AISMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
|
||||||
@ -930,6 +947,13 @@ void AISMod::webapiFormatChannelSettings(
|
|||||||
if (channelSettingsKeys.contains("udpPort") || force) {
|
if (channelSettingsKeys.contains("udpPort") || force) {
|
||||||
swgAISModSettings->setUdpPort(settings.m_udpPort);
|
swgAISModSettings->setUdpPort(settings.m_udpPort);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
swgAISModSettings->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void AISMod::networkManagerFinished(QNetworkReply *reply)
|
void AISMod::networkManagerFinished(QNetworkReply *reply)
|
||||||
|
@ -84,6 +84,7 @@ bool AISModGUI::handleMessage(const Message& message)
|
|||||||
const AISMod::MsgConfigureAISMod& cfg = (AISMod::MsgConfigureAISMod&) message;
|
const AISMod::MsgConfigureAISMod& cfg = (AISMod::MsgConfigureAISMod&) message;
|
||||||
m_settings = cfg.getSettings();
|
m_settings = cfg.getSettings();
|
||||||
blockApplySettings(true);
|
blockApplySettings(true);
|
||||||
|
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
|
||||||
displaySettings();
|
displaySettings();
|
||||||
blockApplySettings(false);
|
blockApplySettings(false);
|
||||||
return true;
|
return true;
|
||||||
|
@ -473,6 +473,9 @@ void AMMod::webapiUpdateChannelSettings(
|
|||||||
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
|
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
|
||||||
settings.m_reverseAPIChannelIndex = response.getAmModSettings()->getReverseApiChannelIndex();
|
settings.m_reverseAPIChannelIndex = response.getAmModSettings()->getReverseApiChannelIndex();
|
||||||
}
|
}
|
||||||
|
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
|
||||||
|
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getAmModSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int AMMod::webapiReportGet(
|
int AMMod::webapiReportGet(
|
||||||
@ -526,6 +529,20 @@ void AMMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respons
|
|||||||
response.getAmModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
|
response.getAmModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
|
||||||
response.getAmModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
|
response.getAmModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
|
||||||
response.getAmModSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
|
response.getAmModSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
|
||||||
|
|
||||||
|
if (settings.m_channelMarker)
|
||||||
|
{
|
||||||
|
if (response.getAmModSettings()->getChannelMarker())
|
||||||
|
{
|
||||||
|
settings.m_channelMarker->formatTo(response.getAmModSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
response.getAmModSettings()->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void AMMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
|
void AMMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
|
||||||
@ -674,6 +691,13 @@ void AMMod::webapiFormatChannelSettings(
|
|||||||
SWGSDRangel::SWGCWKeyerSettings *apiCwKeyerSettings = swgAMModSettings->getCwKeyer();
|
SWGSDRangel::SWGCWKeyerSettings *apiCwKeyerSettings = swgAMModSettings->getCwKeyer();
|
||||||
m_basebandSource->getCWKeyer().webapiFormatChannelSettings(apiCwKeyerSettings, cwKeyerSettings);
|
m_basebandSource->getCWKeyer().webapiFormatChannelSettings(apiCwKeyerSettings, cwKeyerSettings);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
swgAMModSettings->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void AMMod::networkManagerFinished(QNetworkReply *reply)
|
void AMMod::networkManagerFinished(QNetworkReply *reply)
|
||||||
|
@ -93,6 +93,7 @@ bool AMModGUI::handleMessage(const Message& message)
|
|||||||
const AMMod::MsgConfigureAMMod& cfg = (AMMod::MsgConfigureAMMod&) message;
|
const AMMod::MsgConfigureAMMod& cfg = (AMMod::MsgConfigureAMMod&) message;
|
||||||
m_settings = cfg.getSettings();
|
m_settings = cfg.getSettings();
|
||||||
blockApplySettings(true);
|
blockApplySettings(true);
|
||||||
|
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
|
||||||
displaySettings();
|
displaySettings();
|
||||||
blockApplySettings(false);
|
blockApplySettings(false);
|
||||||
return true;
|
return true;
|
||||||
|
@ -35,6 +35,7 @@
|
|||||||
#include "dsp/devicesamplemimo.h"
|
#include "dsp/devicesamplemimo.h"
|
||||||
#include "device/deviceapi.h"
|
#include "device/deviceapi.h"
|
||||||
#include "feature/feature.h"
|
#include "feature/feature.h"
|
||||||
|
#include "settings/serializable.h"
|
||||||
#include "util/db.h"
|
#include "util/db.h"
|
||||||
#include "maincore.h"
|
#include "maincore.h"
|
||||||
|
|
||||||
@ -510,6 +511,9 @@ void ATVMod::webapiUpdateChannelSettings(
|
|||||||
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
|
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
|
||||||
settings.m_reverseAPIChannelIndex = response.getAtvModSettings()->getReverseApiChannelIndex();
|
settings.m_reverseAPIChannelIndex = response.getAtvModSettings()->getReverseApiChannelIndex();
|
||||||
}
|
}
|
||||||
|
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
|
||||||
|
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getAtvModSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int ATVMod::webapiReportGet(
|
int ATVMod::webapiReportGet(
|
||||||
@ -581,6 +585,20 @@ void ATVMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respon
|
|||||||
response.getAtvModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
|
response.getAtvModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
|
||||||
response.getAtvModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
|
response.getAtvModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
|
||||||
response.getAtvModSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
|
response.getAtvModSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
|
||||||
|
|
||||||
|
if (settings.m_channelMarker)
|
||||||
|
{
|
||||||
|
if (response.getAtvModSettings()->getChannelMarker())
|
||||||
|
{
|
||||||
|
settings.m_channelMarker->formatTo(response.getAtvModSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
response.getAtvModSettings()->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ATVMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
|
void ATVMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
|
||||||
@ -718,6 +736,13 @@ void ATVMod::webapiFormatChannelSettings(
|
|||||||
if (channelSettingsKeys.contains("streamIndex") || force) {
|
if (channelSettingsKeys.contains("streamIndex") || force) {
|
||||||
swgATVModSettings->setStreamIndex(settings.m_streamIndex);
|
swgATVModSettings->setStreamIndex(settings.m_streamIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
swgATVModSettings->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ATVMod::networkManagerFinished(QNetworkReply *reply)
|
void ATVMod::networkManagerFinished(QNetworkReply *reply)
|
||||||
|
@ -208,6 +208,7 @@ bool ATVModGUI::handleMessage(const Message& message)
|
|||||||
const ATVMod::MsgConfigureATVMod& cfg = (ATVMod::MsgConfigureATVMod&) message;
|
const ATVMod::MsgConfigureATVMod& cfg = (ATVMod::MsgConfigureATVMod&) message;
|
||||||
m_settings = cfg.getSettings();
|
m_settings = cfg.getSettings();
|
||||||
blockApplySettings(true);
|
blockApplySettings(true);
|
||||||
|
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
|
||||||
displaySettings();
|
displaySettings();
|
||||||
blockApplySettings(false);
|
blockApplySettings(false);
|
||||||
return true;
|
return true;
|
||||||
|
@ -37,6 +37,7 @@
|
|||||||
#include "dsp/dspcommands.h"
|
#include "dsp/dspcommands.h"
|
||||||
#include "device/deviceapi.h"
|
#include "device/deviceapi.h"
|
||||||
#include "feature/feature.h"
|
#include "feature/feature.h"
|
||||||
|
#include "settings/serializable.h"
|
||||||
#include "util/db.h"
|
#include "util/db.h"
|
||||||
#include "maincore.h"
|
#include "maincore.h"
|
||||||
|
|
||||||
@ -584,6 +585,9 @@ void ChirpChatMod::webapiUpdateChannelSettings(
|
|||||||
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
|
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
|
||||||
settings.m_reverseAPIChannelIndex = response.getChirpChatModSettings()->getReverseApiChannelIndex();
|
settings.m_reverseAPIChannelIndex = response.getChirpChatModSettings()->getReverseApiChannelIndex();
|
||||||
}
|
}
|
||||||
|
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
|
||||||
|
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getChirpChatModSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int ChirpChatMod::webapiReportGet(
|
int ChirpChatMod::webapiReportGet(
|
||||||
@ -725,6 +729,20 @@ void ChirpChatMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings&
|
|||||||
response.getChirpChatModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
|
response.getChirpChatModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
|
||||||
response.getChirpChatModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
|
response.getChirpChatModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
|
||||||
response.getChirpChatModSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
|
response.getChirpChatModSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
|
||||||
|
|
||||||
|
if (settings.m_channelMarker)
|
||||||
|
{
|
||||||
|
if (response.getChirpChatModSettings()->getChannelMarker())
|
||||||
|
{
|
||||||
|
settings.m_channelMarker->formatTo(response.getChirpChatModSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
response.getChirpChatModSettings()->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ChirpChatMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
|
void ChirpChatMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
|
||||||
@ -913,6 +931,13 @@ void ChirpChatMod::webapiFormatChannelSettings(
|
|||||||
if (channelSettingsKeys.contains("title") || force) {
|
if (channelSettingsKeys.contains("title") || force) {
|
||||||
swgChirpChatModSettings->setTitle(new QString(settings.m_title));
|
swgChirpChatModSettings->setTitle(new QString(settings.m_title));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
swgChirpChatModSettings->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ChirpChatMod::networkManagerFinished(QNetworkReply *reply)
|
void ChirpChatMod::networkManagerFinished(QNetworkReply *reply)
|
||||||
|
@ -81,6 +81,7 @@ bool ChirpChatModGUI::handleMessage(const Message& message)
|
|||||||
const ChirpChatMod::MsgConfigureChirpChatMod& cfg = (ChirpChatMod::MsgConfigureChirpChatMod&) message;
|
const ChirpChatMod::MsgConfigureChirpChatMod& cfg = (ChirpChatMod::MsgConfigureChirpChatMod&) message;
|
||||||
m_settings = cfg.getSettings();
|
m_settings = cfg.getSettings();
|
||||||
blockApplySettings(true);
|
blockApplySettings(true);
|
||||||
|
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
|
||||||
displaySettings();
|
displaySettings();
|
||||||
blockApplySettings(false);
|
blockApplySettings(false);
|
||||||
return true;
|
return true;
|
||||||
|
@ -39,6 +39,7 @@
|
|||||||
#include "dsp/devicesamplemimo.h"
|
#include "dsp/devicesamplemimo.h"
|
||||||
#include "device/deviceapi.h"
|
#include "device/deviceapi.h"
|
||||||
#include "feature/feature.h"
|
#include "feature/feature.h"
|
||||||
|
#include "settings/serializable.h"
|
||||||
#include "util/db.h"
|
#include "util/db.h"
|
||||||
#include "maincore.h"
|
#include "maincore.h"
|
||||||
|
|
||||||
@ -444,6 +445,9 @@ void DATVMod::webapiUpdateChannelSettings(
|
|||||||
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
|
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
|
||||||
settings.m_reverseAPIChannelIndex = response.getDatvModSettings()->getReverseApiChannelIndex();
|
settings.m_reverseAPIChannelIndex = response.getDatvModSettings()->getReverseApiChannelIndex();
|
||||||
}
|
}
|
||||||
|
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
|
||||||
|
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getDatvModSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int DATVMod::webapiReportGet(
|
int DATVMod::webapiReportGet(
|
||||||
@ -493,6 +497,20 @@ void DATVMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respo
|
|||||||
response.getDatvModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
|
response.getDatvModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
|
||||||
response.getDatvModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
|
response.getDatvModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
|
||||||
response.getDatvModSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
|
response.getDatvModSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
|
||||||
|
|
||||||
|
if (settings.m_channelMarker)
|
||||||
|
{
|
||||||
|
if (response.getDatvModSettings()->getChannelMarker())
|
||||||
|
{
|
||||||
|
settings.m_channelMarker->formatTo(response.getDatvModSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
response.getDatvModSettings()->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void DATVMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
|
void DATVMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
|
||||||
@ -627,6 +645,13 @@ void DATVMod::webapiFormatChannelSettings(
|
|||||||
if (channelSettingsKeys.contains("streamIndex") || force) {
|
if (channelSettingsKeys.contains("streamIndex") || force) {
|
||||||
swgDATVModSettings->setStreamIndex(settings.m_streamIndex);
|
swgDATVModSettings->setStreamIndex(settings.m_streamIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
swgDATVModSettings->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void DATVMod::networkManagerFinished(QNetworkReply *reply)
|
void DATVMod::networkManagerFinished(QNetworkReply *reply)
|
||||||
|
@ -193,6 +193,7 @@ bool DATVModGUI::handleMessage(const Message& message)
|
|||||||
const DATVMod::MsgConfigureDATVMod& cfg = (DATVMod::MsgConfigureDATVMod&) message;
|
const DATVMod::MsgConfigureDATVMod& cfg = (DATVMod::MsgConfigureDATVMod&) message;
|
||||||
m_settings = cfg.getSettings();
|
m_settings = cfg.getSettings();
|
||||||
blockApplySettings(true);
|
blockApplySettings(true);
|
||||||
|
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
|
||||||
displaySettings();
|
displaySettings();
|
||||||
blockApplySettings(false);
|
blockApplySettings(false);
|
||||||
return true;
|
return true;
|
||||||
|
@ -453,6 +453,9 @@ void FreeDVMod::webapiUpdateChannelSettings(
|
|||||||
if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) {
|
if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) {
|
||||||
settings.m_spectrumGUI->updateFrom(channelSettingsKeys, response.getFreeDvModSettings()->getSpectrumConfig());
|
settings.m_spectrumGUI->updateFrom(channelSettingsKeys, response.getFreeDvModSettings()->getSpectrumConfig());
|
||||||
}
|
}
|
||||||
|
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
|
||||||
|
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getFreeDvModSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int FreeDVMod::webapiReportGet(
|
int FreeDVMod::webapiReportGet(
|
||||||
@ -521,6 +524,20 @@ void FreeDVMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& res
|
|||||||
response.getFreeDvModSettings()->setSpectrumConfig(swgGLSpectrum);
|
response.getFreeDvModSettings()->setSpectrumConfig(swgGLSpectrum);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (settings.m_channelMarker)
|
||||||
|
{
|
||||||
|
if (response.getFreeDvModSettings()->getChannelMarker())
|
||||||
|
{
|
||||||
|
settings.m_channelMarker->formatTo(response.getFreeDvModSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
response.getFreeDvModSettings()->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void FreeDVMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
|
void FreeDVMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
|
||||||
@ -664,6 +681,7 @@ void FreeDVMod::webapiFormatChannelSettings(
|
|||||||
if (channelSettingsKeys.contains("streamIndex") || force) {
|
if (channelSettingsKeys.contains("streamIndex") || force) {
|
||||||
swgFreeDVModSettings->setStreamIndex(settings.m_streamIndex);
|
swgFreeDVModSettings->setStreamIndex(settings.m_streamIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force))
|
if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force))
|
||||||
{
|
{
|
||||||
SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum();
|
SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum();
|
||||||
@ -671,6 +689,13 @@ void FreeDVMod::webapiFormatChannelSettings(
|
|||||||
swgFreeDVModSettings->setSpectrumConfig(swgGLSpectrum);
|
swgFreeDVModSettings->setSpectrumConfig(swgGLSpectrum);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
swgFreeDVModSettings->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
|
|
||||||
if (force)
|
if (force)
|
||||||
{
|
{
|
||||||
const CWKeyerSettings& cwKeyerSettings = m_basebandSource->getCWKeyer().getSettings();
|
const CWKeyerSettings& cwKeyerSettings = m_basebandSource->getCWKeyer().getSettings();
|
||||||
|
@ -105,6 +105,7 @@ bool FreeDVModGUI::handleMessage(const Message& message)
|
|||||||
m_settings = cfg.getSettings();
|
m_settings = cfg.getSettings();
|
||||||
blockApplySettings(true);
|
blockApplySettings(true);
|
||||||
ui->spectrumGUI->updateSettings();
|
ui->spectrumGUI->updateSettings();
|
||||||
|
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
|
||||||
displaySettings();
|
displaySettings();
|
||||||
blockApplySettings(false);
|
blockApplySettings(false);
|
||||||
return true;
|
return true;
|
||||||
|
@ -535,6 +535,9 @@ void NFMMod::webapiUpdateChannelSettings(
|
|||||||
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
|
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
|
||||||
settings.m_reverseAPIChannelIndex = response.getNfmModSettings()->getReverseApiChannelIndex();
|
settings.m_reverseAPIChannelIndex = response.getNfmModSettings()->getReverseApiChannelIndex();
|
||||||
}
|
}
|
||||||
|
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
|
||||||
|
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getNfmModSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int NFMMod::webapiReportGet(
|
int NFMMod::webapiReportGet(
|
||||||
@ -594,6 +597,20 @@ void NFMMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respon
|
|||||||
response.getNfmModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
|
response.getNfmModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
|
||||||
response.getNfmModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
|
response.getNfmModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
|
||||||
response.getNfmModSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
|
response.getNfmModSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
|
||||||
|
|
||||||
|
if (settings.m_channelMarker)
|
||||||
|
{
|
||||||
|
if (response.getNfmModSettings()->getChannelMarker())
|
||||||
|
{
|
||||||
|
settings.m_channelMarker->formatTo(response.getNfmModSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
response.getNfmModSettings()->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void NFMMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
|
void NFMMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
|
||||||
@ -753,6 +770,13 @@ void NFMMod::webapiFormatChannelSettings(
|
|||||||
swgNFMModSettings->setStreamIndex(settings.m_streamIndex);
|
swgNFMModSettings->setStreamIndex(settings.m_streamIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
swgNFMModSettings->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
|
|
||||||
if (force)
|
if (force)
|
||||||
{
|
{
|
||||||
const CWKeyerSettings& cwKeyerSettings = m_basebandSource->getCWKeyer().getSettings();
|
const CWKeyerSettings& cwKeyerSettings = m_basebandSource->getCWKeyer().getSettings();
|
||||||
|
@ -94,6 +94,7 @@ bool NFMModGUI::handleMessage(const Message& message)
|
|||||||
const NFMMod::MsgConfigureNFMMod& cfg = (NFMMod::MsgConfigureNFMMod&) message;
|
const NFMMod::MsgConfigureNFMMod& cfg = (NFMMod::MsgConfigureNFMMod&) message;
|
||||||
m_settings = cfg.getSettings();
|
m_settings = cfg.getSettings();
|
||||||
blockApplySettings(true);
|
blockApplySettings(true);
|
||||||
|
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
|
||||||
displaySettings();
|
displaySettings();
|
||||||
blockApplySettings(false);
|
blockApplySettings(false);
|
||||||
return true;
|
return true;
|
||||||
|
@ -636,6 +636,9 @@ void PacketMod::webapiUpdateChannelSettings(
|
|||||||
if (channelSettingsKeys.contains("udpPort")) {
|
if (channelSettingsKeys.contains("udpPort")) {
|
||||||
settings.m_udpPort = response.getPacketModSettings()->getUdpPort();
|
settings.m_udpPort = response.getPacketModSettings()->getUdpPort();
|
||||||
}
|
}
|
||||||
|
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
|
||||||
|
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getPacketModSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int PacketMod::webapiReportGet(
|
int PacketMod::webapiReportGet(
|
||||||
@ -796,6 +799,20 @@ void PacketMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& res
|
|||||||
response.getPacketModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
|
response.getPacketModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
|
||||||
response.getPacketModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
|
response.getPacketModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
|
||||||
response.getPacketModSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
|
response.getPacketModSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
|
||||||
|
|
||||||
|
if (settings.m_channelMarker)
|
||||||
|
{
|
||||||
|
if (response.getPacketModSettings()->getChannelMarker())
|
||||||
|
{
|
||||||
|
settings.m_channelMarker->formatTo(response.getPacketModSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
response.getPacketModSettings()->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void PacketMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
|
void PacketMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
|
||||||
@ -1005,6 +1022,13 @@ void PacketMod::webapiFormatChannelSettings(
|
|||||||
if (channelSettingsKeys.contains("udpPort") || force) {
|
if (channelSettingsKeys.contains("udpPort") || force) {
|
||||||
swgPacketModSettings->setUdpPort(settings.m_udpPort);
|
swgPacketModSettings->setUdpPort(settings.m_udpPort);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
swgPacketModSettings->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void PacketMod::networkManagerFinished(QNetworkReply *reply)
|
void PacketMod::networkManagerFinished(QNetworkReply *reply)
|
||||||
|
@ -84,6 +84,7 @@ bool PacketModGUI::handleMessage(const Message& message)
|
|||||||
const PacketMod::MsgConfigurePacketMod& cfg = (PacketMod::MsgConfigurePacketMod&) message;
|
const PacketMod::MsgConfigurePacketMod& cfg = (PacketMod::MsgConfigurePacketMod&) message;
|
||||||
m_settings = cfg.getSettings();
|
m_settings = cfg.getSettings();
|
||||||
blockApplySettings(true);
|
blockApplySettings(true);
|
||||||
|
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
|
||||||
displaySettings();
|
displaySettings();
|
||||||
blockApplySettings(false);
|
blockApplySettings(false);
|
||||||
return true;
|
return true;
|
||||||
|
@ -524,6 +524,9 @@ void SSBMod::webapiUpdateChannelSettings(
|
|||||||
if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) {
|
if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) {
|
||||||
settings.m_spectrumGUI->updateFrom(channelSettingsKeys, response.getSsbModSettings()->getSpectrumConfig());
|
settings.m_spectrumGUI->updateFrom(channelSettingsKeys, response.getSsbModSettings()->getSpectrumConfig());
|
||||||
}
|
}
|
||||||
|
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
|
||||||
|
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getSsbModSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int SSBMod::webapiReportGet(
|
int SSBMod::webapiReportGet(
|
||||||
@ -599,6 +602,20 @@ void SSBMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respon
|
|||||||
response.getSsbModSettings()->setSpectrumConfig(swgGLSpectrum);
|
response.getSsbModSettings()->setSpectrumConfig(swgGLSpectrum);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (settings.m_channelMarker)
|
||||||
|
{
|
||||||
|
if (response.getSsbModSettings()->getChannelMarker())
|
||||||
|
{
|
||||||
|
settings.m_channelMarker->formatTo(response.getSsbModSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
response.getSsbModSettings()->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void SSBMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
|
void SSBMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
|
||||||
@ -763,6 +780,7 @@ void SSBMod::webapiFormatChannelSettings(
|
|||||||
if (channelSettingsKeys.contains("streamIndex") || force) {
|
if (channelSettingsKeys.contains("streamIndex") || force) {
|
||||||
swgSSBModSettings->setStreamIndex(settings.m_streamIndex);
|
swgSSBModSettings->setStreamIndex(settings.m_streamIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force))
|
if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force))
|
||||||
{
|
{
|
||||||
SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum();
|
SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum();
|
||||||
@ -770,6 +788,14 @@ void SSBMod::webapiFormatChannelSettings(
|
|||||||
swgSSBModSettings->setSpectrumConfig(swgGLSpectrum);
|
swgSSBModSettings->setSpectrumConfig(swgGLSpectrum);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
swgSSBModSettings->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
|
|
||||||
if (force)
|
if (force)
|
||||||
{
|
{
|
||||||
const CWKeyerSettings& cwKeyerSettings = m_basebandSource->getCWKeyer().getSettings();
|
const CWKeyerSettings& cwKeyerSettings = m_basebandSource->getCWKeyer().getSettings();
|
||||||
|
@ -111,6 +111,7 @@ bool SSBModGUI::handleMessage(const Message& message)
|
|||||||
m_settings = mod_settings;
|
m_settings = mod_settings;
|
||||||
blockApplySettings(true);
|
blockApplySettings(true);
|
||||||
ui->spectrumGUI->updateSettings();
|
ui->spectrumGUI->updateSettings();
|
||||||
|
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
|
||||||
displaySettings();
|
displaySettings();
|
||||||
blockApplySettings(false);
|
blockApplySettings(false);
|
||||||
return true;
|
return true;
|
||||||
|
@ -459,6 +459,9 @@ void WFMMod::webapiUpdateChannelSettings(
|
|||||||
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
|
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
|
||||||
settings.m_reverseAPIChannelIndex = response.getWfmModSettings()->getReverseApiChannelIndex();
|
settings.m_reverseAPIChannelIndex = response.getWfmModSettings()->getReverseApiChannelIndex();
|
||||||
}
|
}
|
||||||
|
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
|
||||||
|
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getWfmModSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int WFMMod::webapiReportGet(
|
int WFMMod::webapiReportGet(
|
||||||
@ -513,6 +516,20 @@ void WFMMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respon
|
|||||||
response.getWfmModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
|
response.getWfmModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
|
||||||
response.getWfmModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
|
response.getWfmModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
|
||||||
response.getWfmModSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
|
response.getWfmModSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
|
||||||
|
|
||||||
|
if (settings.m_channelMarker)
|
||||||
|
{
|
||||||
|
if (response.getWfmModSettings()->getChannelMarker())
|
||||||
|
{
|
||||||
|
settings.m_channelMarker->formatTo(response.getWfmModSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
response.getWfmModSettings()->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void WFMMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
|
void WFMMod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
|
||||||
@ -657,6 +674,13 @@ void WFMMod::webapiFormatChannelSettings(
|
|||||||
swgWFMModSettings->setAudioDeviceName(new QString(settings.m_audioDeviceName));
|
swgWFMModSettings->setAudioDeviceName(new QString(settings.m_audioDeviceName));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
swgWFMModSettings->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
|
|
||||||
if (force)
|
if (force)
|
||||||
{
|
{
|
||||||
const CWKeyerSettings& cwKeyerSettings = m_basebandSource->getCWKeyer().getSettings();
|
const CWKeyerSettings& cwKeyerSettings = m_basebandSource->getCWKeyer().getSettings();
|
||||||
|
@ -93,6 +93,7 @@ bool WFMModGUI::handleMessage(const Message& message)
|
|||||||
const WFMMod::MsgConfigureWFMMod& cfg = (WFMMod::MsgConfigureWFMMod&) message;
|
const WFMMod::MsgConfigureWFMMod& cfg = (WFMMod::MsgConfigureWFMMod&) message;
|
||||||
m_settings = cfg.getSettings();
|
m_settings = cfg.getSettings();
|
||||||
blockApplySettings(true);
|
blockApplySettings(true);
|
||||||
|
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
|
||||||
displaySettings();
|
displaySettings();
|
||||||
blockApplySettings(false);
|
blockApplySettings(false);
|
||||||
return true;
|
return true;
|
||||||
|
@ -30,6 +30,7 @@
|
|||||||
#include "dsp/devicesamplesink.h"
|
#include "dsp/devicesamplesink.h"
|
||||||
#include "device/deviceapi.h"
|
#include "device/deviceapi.h"
|
||||||
#include "feature/feature.h"
|
#include "feature/feature.h"
|
||||||
|
#include "settings/serializable.h"
|
||||||
#include "util/timeutil.h"
|
#include "util/timeutil.h"
|
||||||
#include "util/db.h"
|
#include "util/db.h"
|
||||||
#include "maincore.h"
|
#include "maincore.h"
|
||||||
@ -291,6 +292,9 @@ void RemoteSource::webapiUpdateChannelSettings(
|
|||||||
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
|
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
|
||||||
settings.m_reverseAPIChannelIndex = response.getRemoteSourceSettings()->getReverseApiChannelIndex();
|
settings.m_reverseAPIChannelIndex = response.getRemoteSourceSettings()->getReverseApiChannelIndex();
|
||||||
}
|
}
|
||||||
|
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
|
||||||
|
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getRemoteSourceSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int RemoteSource::webapiReportGet(
|
int RemoteSource::webapiReportGet(
|
||||||
@ -332,6 +336,20 @@ void RemoteSource::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings&
|
|||||||
response.getRemoteSourceSettings()->setReverseApiPort(settings.m_reverseAPIPort);
|
response.getRemoteSourceSettings()->setReverseApiPort(settings.m_reverseAPIPort);
|
||||||
response.getRemoteSourceSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
|
response.getRemoteSourceSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
|
||||||
response.getRemoteSourceSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
|
response.getRemoteSourceSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
|
||||||
|
|
||||||
|
if (settings.m_channelMarker)
|
||||||
|
{
|
||||||
|
if (response.getRemoteSourceSettings()->getChannelMarker())
|
||||||
|
{
|
||||||
|
settings.m_channelMarker->formatTo(response.getRemoteSourceSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
response.getRemoteSourceSettings()->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void RemoteSource::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
|
void RemoteSource::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
|
||||||
@ -433,6 +451,13 @@ void RemoteSource::webapiFormatChannelSettings(
|
|||||||
if (channelSettingsKeys.contains("streamIndex") || force) {
|
if (channelSettingsKeys.contains("streamIndex") || force) {
|
||||||
swgRemoteSourceSettings->setStreamIndex(settings.m_streamIndex);
|
swgRemoteSourceSettings->setStreamIndex(settings.m_streamIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
swgRemoteSourceSettings->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void RemoteSource::networkManagerFinished(QNetworkReply *reply)
|
void RemoteSource::networkManagerFinished(QNetworkReply *reply)
|
||||||
|
@ -70,6 +70,7 @@ bool RemoteSourceGUI::handleMessage(const Message& message)
|
|||||||
const RemoteSource::MsgConfigureRemoteSource& cfg = (RemoteSource::MsgConfigureRemoteSource&) message;
|
const RemoteSource::MsgConfigureRemoteSource& cfg = (RemoteSource::MsgConfigureRemoteSource&) message;
|
||||||
m_settings = cfg.getSettings();
|
m_settings = cfg.getSettings();
|
||||||
blockApplySettings(true);
|
blockApplySettings(true);
|
||||||
|
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
|
||||||
displaySettings();
|
displaySettings();
|
||||||
blockApplySettings(false);
|
blockApplySettings(false);
|
||||||
return true;
|
return true;
|
||||||
|
@ -421,6 +421,9 @@ void UDPSource::webapiUpdateChannelSettings(
|
|||||||
if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) {
|
if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) {
|
||||||
settings.m_spectrumGUI->updateFrom(channelSettingsKeys, response.getUdpSourceSettings()->getSpectrumConfig());
|
settings.m_spectrumGUI->updateFrom(channelSettingsKeys, response.getUdpSourceSettings()->getSpectrumConfig());
|
||||||
}
|
}
|
||||||
|
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
|
||||||
|
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getUdpSourceSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int UDPSource::webapiReportGet(
|
int UDPSource::webapiReportGet(
|
||||||
@ -500,6 +503,20 @@ void UDPSource::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& res
|
|||||||
response.getUdpSourceSettings()->setSpectrumConfig(swgGLSpectrum);
|
response.getUdpSourceSettings()->setSpectrumConfig(swgGLSpectrum);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (settings.m_channelMarker)
|
||||||
|
{
|
||||||
|
if (response.getUdpSourceSettings()->getChannelMarker())
|
||||||
|
{
|
||||||
|
settings.m_channelMarker->formatTo(response.getUdpSourceSettings()->getChannelMarker());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
response.getUdpSourceSettings()->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void UDPSource::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
|
void UDPSource::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
|
||||||
@ -640,12 +657,20 @@ void UDPSource::webapiFormatChannelSettings(
|
|||||||
if (channelSettingsKeys.contains("streamIndex") || force) {
|
if (channelSettingsKeys.contains("streamIndex") || force) {
|
||||||
swgUDPSourceSettings->setStreamIndex(settings.m_streamIndex);
|
swgUDPSourceSettings->setStreamIndex(settings.m_streamIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force))
|
if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force))
|
||||||
{
|
{
|
||||||
SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum();
|
SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum();
|
||||||
settings.m_spectrumGUI->formatTo(swgGLSpectrum);
|
settings.m_spectrumGUI->formatTo(swgGLSpectrum);
|
||||||
swgUDPSourceSettings->setSpectrumConfig(swgGLSpectrum);
|
swgUDPSourceSettings->setSpectrumConfig(swgGLSpectrum);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
|
||||||
|
{
|
||||||
|
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||||
|
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||||
|
swgUDPSourceSettings->setChannelMarker(swgChannelMarker);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void UDPSource::networkManagerFinished(QNetworkReply *reply)
|
void UDPSource::networkManagerFinished(QNetworkReply *reply)
|
||||||
|
@ -73,6 +73,7 @@ bool UDPSourceGUI::handleMessage(const Message& message)
|
|||||||
m_settings = cfg.getSettings();
|
m_settings = cfg.getSettings();
|
||||||
blockApplySettings(true);
|
blockApplySettings(true);
|
||||||
ui->spectrumGUI->updateSettings();
|
ui->spectrumGUI->updateSettings();
|
||||||
|
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
|
||||||
displaySettings();
|
displaySettings();
|
||||||
blockApplySettings(false);
|
blockApplySettings(false);
|
||||||
return true;
|
return true;
|
||||||
|
@ -1159,6 +1159,9 @@ margin-bottom: 20px;
|
|||||||
"udpPort" : {
|
"udpPort" : {
|
||||||
"type" : "integer",
|
"type" : "integer",
|
||||||
"description" : "UDP port to receive messages to transmit via"
|
"description" : "UDP port to receive messages to transmit via"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "AISMod"
|
"description" : "AISMod"
|
||||||
@ -1390,6 +1393,9 @@ margin-bottom: 20px;
|
|||||||
},
|
},
|
||||||
"cwKeyer" : {
|
"cwKeyer" : {
|
||||||
"$ref" : "#/definitions/CWKeyerSettings"
|
"$ref" : "#/definitions/CWKeyerSettings"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "AMMod"
|
"description" : "AMMod"
|
||||||
@ -1795,6 +1801,9 @@ margin-bottom: 20px;
|
|||||||
},
|
},
|
||||||
"reverseAPIChannelIndex" : {
|
"reverseAPIChannelIndex" : {
|
||||||
"type" : "integer"
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "ATVMod"
|
"description" : "ATVMod"
|
||||||
@ -3794,6 +3803,9 @@ margin-bottom: 20px;
|
|||||||
},
|
},
|
||||||
"reverseAPIChannelIndex" : {
|
"reverseAPIChannelIndex" : {
|
||||||
"type" : "integer"
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "ChirpChatMod"
|
"description" : "ChirpChatMod"
|
||||||
@ -4185,6 +4197,9 @@ margin-bottom: 20px;
|
|||||||
},
|
},
|
||||||
"reverseAPIChannelIndex" : {
|
"reverseAPIChannelIndex" : {
|
||||||
"type" : "integer"
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "DATVMod"
|
"description" : "DATVMod"
|
||||||
@ -5577,6 +5592,9 @@ margin-bottom: 20px;
|
|||||||
},
|
},
|
||||||
"reverseAPIChannelIndex" : {
|
"reverseAPIChannelIndex" : {
|
||||||
"type" : "integer"
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "FileSource"
|
"description" : "FileSource"
|
||||||
@ -5751,6 +5769,9 @@ margin-bottom: 20px;
|
|||||||
},
|
},
|
||||||
"spectrumConfig" : {
|
"spectrumConfig" : {
|
||||||
"$ref" : "#/definitions/GLSpectrum"
|
"$ref" : "#/definitions/GLSpectrum"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "FreeDVMod"
|
"description" : "FreeDVMod"
|
||||||
@ -6486,6 +6507,9 @@ margin-bottom: 20px;
|
|||||||
"udpPort" : {
|
"udpPort" : {
|
||||||
"type" : "integer",
|
"type" : "integer",
|
||||||
"description" : "UDP port to listen for frames to transmit on"
|
"description" : "UDP port to listen for frames to transmit on"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "IEEE_802_15_4_Mod"
|
"description" : "IEEE_802_15_4_Mod"
|
||||||
@ -7536,6 +7560,9 @@ margin-bottom: 20px;
|
|||||||
},
|
},
|
||||||
"reverseAPIChannelIndex" : {
|
"reverseAPIChannelIndex" : {
|
||||||
"type" : "integer"
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "Local channel source settings"
|
"description" : "Local channel source settings"
|
||||||
@ -8110,6 +8137,9 @@ margin-bottom: 20px;
|
|||||||
},
|
},
|
||||||
"cwKeyer" : {
|
"cwKeyer" : {
|
||||||
"$ref" : "#/definitions/CWKeyerSettings"
|
"$ref" : "#/definitions/CWKeyerSettings"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "NFMMod"
|
"description" : "NFMMod"
|
||||||
@ -8641,6 +8671,9 @@ margin-bottom: 20px;
|
|||||||
},
|
},
|
||||||
"reverseAPIChannelIndex" : {
|
"reverseAPIChannelIndex" : {
|
||||||
"type" : "integer"
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "PacketMod"
|
"description" : "PacketMod"
|
||||||
@ -9992,6 +10025,9 @@ margin-bottom: 20px;
|
|||||||
},
|
},
|
||||||
"reverseAPIChannelIndex" : {
|
"reverseAPIChannelIndex" : {
|
||||||
"type" : "integer"
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "Remote channel source settings"
|
"description" : "Remote channel source settings"
|
||||||
@ -10553,6 +10589,9 @@ margin-bottom: 20px;
|
|||||||
},
|
},
|
||||||
"spectrumConfig" : {
|
"spectrumConfig" : {
|
||||||
"$ref" : "#/definitions/GLSpectrum"
|
"$ref" : "#/definitions/GLSpectrum"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "SSBMod"
|
"description" : "SSBMod"
|
||||||
@ -12484,6 +12523,9 @@ margin-bottom: 20px;
|
|||||||
},
|
},
|
||||||
"spectrumConfig" : {
|
"spectrumConfig" : {
|
||||||
"$ref" : "#/definitions/GLSpectrum"
|
"$ref" : "#/definitions/GLSpectrum"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "UDPSource"
|
"description" : "UDPSource"
|
||||||
@ -13051,6 +13093,9 @@ margin-bottom: 20px;
|
|||||||
},
|
},
|
||||||
"cwKeyer" : {
|
"cwKeyer" : {
|
||||||
"$ref" : "#/definitions/CWKeyerSettings"
|
"$ref" : "#/definitions/CWKeyerSettings"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "WFMMod"
|
"description" : "WFMMod"
|
||||||
@ -51554,7 +51599,7 @@ except ApiException as e:
|
|||||||
</div>
|
</div>
|
||||||
<div id="generator">
|
<div id="generator">
|
||||||
<div class="content">
|
<div class="content">
|
||||||
Generated 2021-12-02T23:38:15.455+01:00
|
Generated 2021-12-03T00:35:44.973+01:00
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -116,6 +116,8 @@ AISModSettings:
|
|||||||
udpPort:
|
udpPort:
|
||||||
description: "UDP port to receive messages to transmit via"
|
description: "UDP port to receive messages to transmit via"
|
||||||
type: integer
|
type: integer
|
||||||
|
channelMarker:
|
||||||
|
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
|
||||||
AISModReport:
|
AISModReport:
|
||||||
description: AISMod
|
description: AISMod
|
||||||
|
@ -45,6 +45,8 @@ AMModSettings:
|
|||||||
type: integer
|
type: integer
|
||||||
cwKeyer:
|
cwKeyer:
|
||||||
$ref: "/doc/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
|
$ref: "/doc/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
|
||||||
|
channelMarker:
|
||||||
|
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
|
||||||
AMModReport:
|
AMModReport:
|
||||||
description: AMMod
|
description: AMMod
|
||||||
|
@ -67,6 +67,8 @@ ATVModSettings:
|
|||||||
type: integer
|
type: integer
|
||||||
reverseAPIChannelIndex:
|
reverseAPIChannelIndex:
|
||||||
type: integer
|
type: integer
|
||||||
|
channelMarker:
|
||||||
|
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
|
||||||
ATVModReport:
|
ATVModReport:
|
||||||
description: ATVMod
|
description: ATVMod
|
||||||
|
@ -157,6 +157,8 @@ ChirpChatModSettings:
|
|||||||
type: integer
|
type: integer
|
||||||
reverseAPIChannelIndex:
|
reverseAPIChannelIndex:
|
||||||
type: integer
|
type: integer
|
||||||
|
channelMarker:
|
||||||
|
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
|
||||||
ChirpChatModReport:
|
ChirpChatModReport:
|
||||||
description: ChirpChatMod
|
description: ChirpChatMod
|
||||||
|
@ -58,6 +58,8 @@ DATVModSettings:
|
|||||||
type: integer
|
type: integer
|
||||||
reverseAPIChannelIndex:
|
reverseAPIChannelIndex:
|
||||||
type: integer
|
type: integer
|
||||||
|
channelMarker:
|
||||||
|
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
|
||||||
DATVModReport:
|
DATVModReport:
|
||||||
description: DATVMod
|
description: DATVMod
|
||||||
|
@ -31,6 +31,8 @@ FileSourceSettings:
|
|||||||
type: integer
|
type: integer
|
||||||
reverseAPIChannelIndex:
|
reverseAPIChannelIndex:
|
||||||
type: integer
|
type: integer
|
||||||
|
channelMarker:
|
||||||
|
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
|
||||||
FileSourceReport:
|
FileSourceReport:
|
||||||
description: FileSource
|
description: FileSource
|
||||||
|
@ -46,6 +46,8 @@ FreeDVModSettings:
|
|||||||
$ref: "/doc/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
|
$ref: "/doc/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
|
||||||
spectrumConfig:
|
spectrumConfig:
|
||||||
$ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum"
|
$ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum"
|
||||||
|
channelMarker:
|
||||||
|
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
|
||||||
FreeDVModReport:
|
FreeDVModReport:
|
||||||
description: FreeDVMod
|
description: FreeDVMod
|
||||||
|
@ -124,6 +124,8 @@ IEEE_802_15_4_ModSettings:
|
|||||||
udpPort:
|
udpPort:
|
||||||
description: UDP port to listen for frames to transmit on
|
description: UDP port to listen for frames to transmit on
|
||||||
type: integer
|
type: integer
|
||||||
|
channelMarker:
|
||||||
|
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
|
||||||
IEEE_802_15_4_ModReport:
|
IEEE_802_15_4_ModReport:
|
||||||
description: IEEE_802_15_4_Mod
|
description: IEEE_802_15_4_Mod
|
||||||
|
@ -29,3 +29,5 @@ LocalSourceSettings:
|
|||||||
type: integer
|
type: integer
|
||||||
reverseAPIChannelIndex:
|
reverseAPIChannelIndex:
|
||||||
type: integer
|
type: integer
|
||||||
|
channelMarker:
|
||||||
|
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
@ -69,6 +69,8 @@ NFMModSettings:
|
|||||||
type: integer
|
type: integer
|
||||||
cwKeyer:
|
cwKeyer:
|
||||||
$ref: "/doc/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
|
$ref: "/doc/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
|
||||||
|
channelMarker:
|
||||||
|
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
|
||||||
NFMModReport:
|
NFMModReport:
|
||||||
description: NFMMod
|
description: NFMMod
|
||||||
|
@ -149,6 +149,8 @@ PacketModSettings:
|
|||||||
type: integer
|
type: integer
|
||||||
reverseAPIChannelIndex:
|
reverseAPIChannelIndex:
|
||||||
type: integer
|
type: integer
|
||||||
|
channelMarker:
|
||||||
|
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
|
||||||
PacketModReport:
|
PacketModReport:
|
||||||
description: PacketMod
|
description: PacketMod
|
||||||
|
@ -25,6 +25,8 @@ RemoteSourceSettings:
|
|||||||
type: integer
|
type: integer
|
||||||
reverseAPIChannelIndex:
|
reverseAPIChannelIndex:
|
||||||
type: integer
|
type: integer
|
||||||
|
channelMarker:
|
||||||
|
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
|
||||||
RemoteSourceReport:
|
RemoteSourceReport:
|
||||||
description: "Remote channel source report"
|
description: "Remote channel source report"
|
||||||
|
@ -62,6 +62,8 @@ SSBModSettings:
|
|||||||
$ref: "/doc/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
|
$ref: "/doc/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
|
||||||
spectrumConfig:
|
spectrumConfig:
|
||||||
$ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum"
|
$ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum"
|
||||||
|
channelMarker:
|
||||||
|
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
|
||||||
SSBModReport:
|
SSBModReport:
|
||||||
description: SSBMod
|
description: SSBMod
|
||||||
|
@ -73,6 +73,8 @@ UDPSourceSettings:
|
|||||||
type: integer
|
type: integer
|
||||||
spectrumConfig:
|
spectrumConfig:
|
||||||
$ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum"
|
$ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum"
|
||||||
|
channelMarker:
|
||||||
|
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
|
||||||
UDPSourceReport:
|
UDPSourceReport:
|
||||||
description: UDPSource
|
description: UDPSource
|
||||||
|
@ -47,6 +47,8 @@ WFMModSettings:
|
|||||||
type: integer
|
type: integer
|
||||||
cwKeyer:
|
cwKeyer:
|
||||||
$ref: "/doc/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
|
$ref: "/doc/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
|
||||||
|
channelMarker:
|
||||||
|
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
|
||||||
WFMModReport:
|
WFMModReport:
|
||||||
description: WFMMod
|
description: WFMMod
|
||||||
|
@ -116,6 +116,8 @@ AISModSettings:
|
|||||||
udpPort:
|
udpPort:
|
||||||
description: "UDP port to receive messages to transmit via"
|
description: "UDP port to receive messages to transmit via"
|
||||||
type: integer
|
type: integer
|
||||||
|
channelMarker:
|
||||||
|
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
|
||||||
AISModReport:
|
AISModReport:
|
||||||
description: AISMod
|
description: AISMod
|
||||||
|
@ -45,6 +45,8 @@ AMModSettings:
|
|||||||
type: integer
|
type: integer
|
||||||
cwKeyer:
|
cwKeyer:
|
||||||
$ref: "http://swgserver:8081/api/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
|
$ref: "http://swgserver:8081/api/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
|
||||||
|
channelMarker:
|
||||||
|
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
|
||||||
AMModReport:
|
AMModReport:
|
||||||
description: AMMod
|
description: AMMod
|
||||||
|
@ -67,6 +67,8 @@ ATVModSettings:
|
|||||||
type: integer
|
type: integer
|
||||||
reverseAPIChannelIndex:
|
reverseAPIChannelIndex:
|
||||||
type: integer
|
type: integer
|
||||||
|
channelMarker:
|
||||||
|
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
|
||||||
ATVModReport:
|
ATVModReport:
|
||||||
description: ATVMod
|
description: ATVMod
|
||||||
|
@ -157,6 +157,8 @@ ChirpChatModSettings:
|
|||||||
type: integer
|
type: integer
|
||||||
reverseAPIChannelIndex:
|
reverseAPIChannelIndex:
|
||||||
type: integer
|
type: integer
|
||||||
|
channelMarker:
|
||||||
|
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
|
||||||
ChirpChatModReport:
|
ChirpChatModReport:
|
||||||
description: ChirpChatMod
|
description: ChirpChatMod
|
||||||
|
@ -58,6 +58,8 @@ DATVModSettings:
|
|||||||
type: integer
|
type: integer
|
||||||
reverseAPIChannelIndex:
|
reverseAPIChannelIndex:
|
||||||
type: integer
|
type: integer
|
||||||
|
channelMarker:
|
||||||
|
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
|
||||||
DATVModReport:
|
DATVModReport:
|
||||||
description: DATVMod
|
description: DATVMod
|
||||||
|
@ -31,6 +31,8 @@ FileSourceSettings:
|
|||||||
type: integer
|
type: integer
|
||||||
reverseAPIChannelIndex:
|
reverseAPIChannelIndex:
|
||||||
type: integer
|
type: integer
|
||||||
|
channelMarker:
|
||||||
|
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
|
||||||
FileSourceReport:
|
FileSourceReport:
|
||||||
description: FileSource
|
description: FileSource
|
||||||
|
@ -46,6 +46,8 @@ FreeDVModSettings:
|
|||||||
$ref: "http://swgserver:8081/api/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
|
$ref: "http://swgserver:8081/api/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
|
||||||
spectrumConfig:
|
spectrumConfig:
|
||||||
$ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum"
|
$ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum"
|
||||||
|
channelMarker:
|
||||||
|
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
|
||||||
FreeDVModReport:
|
FreeDVModReport:
|
||||||
description: FreeDVMod
|
description: FreeDVMod
|
||||||
|
@ -124,6 +124,8 @@ IEEE_802_15_4_ModSettings:
|
|||||||
udpPort:
|
udpPort:
|
||||||
description: UDP port to listen for frames to transmit on
|
description: UDP port to listen for frames to transmit on
|
||||||
type: integer
|
type: integer
|
||||||
|
channelMarker:
|
||||||
|
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
|
||||||
IEEE_802_15_4_ModReport:
|
IEEE_802_15_4_ModReport:
|
||||||
description: IEEE_802_15_4_Mod
|
description: IEEE_802_15_4_Mod
|
||||||
|
@ -29,3 +29,5 @@ LocalSourceSettings:
|
|||||||
type: integer
|
type: integer
|
||||||
reverseAPIChannelIndex:
|
reverseAPIChannelIndex:
|
||||||
type: integer
|
type: integer
|
||||||
|
channelMarker:
|
||||||
|
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
@ -69,6 +69,8 @@ NFMModSettings:
|
|||||||
type: integer
|
type: integer
|
||||||
cwKeyer:
|
cwKeyer:
|
||||||
$ref: "http://swgserver:8081/api/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
|
$ref: "http://swgserver:8081/api/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
|
||||||
|
channelMarker:
|
||||||
|
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
|
||||||
NFMModReport:
|
NFMModReport:
|
||||||
description: NFMMod
|
description: NFMMod
|
||||||
|
@ -149,6 +149,8 @@ PacketModSettings:
|
|||||||
type: integer
|
type: integer
|
||||||
reverseAPIChannelIndex:
|
reverseAPIChannelIndex:
|
||||||
type: integer
|
type: integer
|
||||||
|
channelMarker:
|
||||||
|
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
|
||||||
PacketModReport:
|
PacketModReport:
|
||||||
description: PacketMod
|
description: PacketMod
|
||||||
|
@ -25,6 +25,8 @@ RemoteSourceSettings:
|
|||||||
type: integer
|
type: integer
|
||||||
reverseAPIChannelIndex:
|
reverseAPIChannelIndex:
|
||||||
type: integer
|
type: integer
|
||||||
|
channelMarker:
|
||||||
|
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
|
||||||
RemoteSourceReport:
|
RemoteSourceReport:
|
||||||
description: "Remote channel source report"
|
description: "Remote channel source report"
|
||||||
|
@ -62,6 +62,8 @@ SSBModSettings:
|
|||||||
$ref: "http://swgserver:8081/api/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
|
$ref: "http://swgserver:8081/api/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
|
||||||
spectrumConfig:
|
spectrumConfig:
|
||||||
$ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum"
|
$ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum"
|
||||||
|
channelMarker:
|
||||||
|
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
|
||||||
SSBModReport:
|
SSBModReport:
|
||||||
description: SSBMod
|
description: SSBMod
|
||||||
|
@ -73,6 +73,8 @@ UDPSourceSettings:
|
|||||||
type: integer
|
type: integer
|
||||||
spectrumConfig:
|
spectrumConfig:
|
||||||
$ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum"
|
$ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum"
|
||||||
|
channelMarker:
|
||||||
|
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
|
||||||
UDPSourceReport:
|
UDPSourceReport:
|
||||||
description: UDPSource
|
description: UDPSource
|
||||||
|
@ -47,6 +47,8 @@ WFMModSettings:
|
|||||||
type: integer
|
type: integer
|
||||||
cwKeyer:
|
cwKeyer:
|
||||||
$ref: "http://swgserver:8081/api/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
|
$ref: "http://swgserver:8081/api/swagger/include/CWKeyer.yaml#/CWKeyerSettings"
|
||||||
|
channelMarker:
|
||||||
|
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||||
|
|
||||||
WFMModReport:
|
WFMModReport:
|
||||||
description: WFMMod
|
description: WFMMod
|
||||||
|
@ -1159,6 +1159,9 @@ margin-bottom: 20px;
|
|||||||
"udpPort" : {
|
"udpPort" : {
|
||||||
"type" : "integer",
|
"type" : "integer",
|
||||||
"description" : "UDP port to receive messages to transmit via"
|
"description" : "UDP port to receive messages to transmit via"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "AISMod"
|
"description" : "AISMod"
|
||||||
@ -1390,6 +1393,9 @@ margin-bottom: 20px;
|
|||||||
},
|
},
|
||||||
"cwKeyer" : {
|
"cwKeyer" : {
|
||||||
"$ref" : "#/definitions/CWKeyerSettings"
|
"$ref" : "#/definitions/CWKeyerSettings"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "AMMod"
|
"description" : "AMMod"
|
||||||
@ -1795,6 +1801,9 @@ margin-bottom: 20px;
|
|||||||
},
|
},
|
||||||
"reverseAPIChannelIndex" : {
|
"reverseAPIChannelIndex" : {
|
||||||
"type" : "integer"
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "ATVMod"
|
"description" : "ATVMod"
|
||||||
@ -3794,6 +3803,9 @@ margin-bottom: 20px;
|
|||||||
},
|
},
|
||||||
"reverseAPIChannelIndex" : {
|
"reverseAPIChannelIndex" : {
|
||||||
"type" : "integer"
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "ChirpChatMod"
|
"description" : "ChirpChatMod"
|
||||||
@ -4185,6 +4197,9 @@ margin-bottom: 20px;
|
|||||||
},
|
},
|
||||||
"reverseAPIChannelIndex" : {
|
"reverseAPIChannelIndex" : {
|
||||||
"type" : "integer"
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "DATVMod"
|
"description" : "DATVMod"
|
||||||
@ -5577,6 +5592,9 @@ margin-bottom: 20px;
|
|||||||
},
|
},
|
||||||
"reverseAPIChannelIndex" : {
|
"reverseAPIChannelIndex" : {
|
||||||
"type" : "integer"
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "FileSource"
|
"description" : "FileSource"
|
||||||
@ -5751,6 +5769,9 @@ margin-bottom: 20px;
|
|||||||
},
|
},
|
||||||
"spectrumConfig" : {
|
"spectrumConfig" : {
|
||||||
"$ref" : "#/definitions/GLSpectrum"
|
"$ref" : "#/definitions/GLSpectrum"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "FreeDVMod"
|
"description" : "FreeDVMod"
|
||||||
@ -6486,6 +6507,9 @@ margin-bottom: 20px;
|
|||||||
"udpPort" : {
|
"udpPort" : {
|
||||||
"type" : "integer",
|
"type" : "integer",
|
||||||
"description" : "UDP port to listen for frames to transmit on"
|
"description" : "UDP port to listen for frames to transmit on"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "IEEE_802_15_4_Mod"
|
"description" : "IEEE_802_15_4_Mod"
|
||||||
@ -7536,6 +7560,9 @@ margin-bottom: 20px;
|
|||||||
},
|
},
|
||||||
"reverseAPIChannelIndex" : {
|
"reverseAPIChannelIndex" : {
|
||||||
"type" : "integer"
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "Local channel source settings"
|
"description" : "Local channel source settings"
|
||||||
@ -8110,6 +8137,9 @@ margin-bottom: 20px;
|
|||||||
},
|
},
|
||||||
"cwKeyer" : {
|
"cwKeyer" : {
|
||||||
"$ref" : "#/definitions/CWKeyerSettings"
|
"$ref" : "#/definitions/CWKeyerSettings"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "NFMMod"
|
"description" : "NFMMod"
|
||||||
@ -8641,6 +8671,9 @@ margin-bottom: 20px;
|
|||||||
},
|
},
|
||||||
"reverseAPIChannelIndex" : {
|
"reverseAPIChannelIndex" : {
|
||||||
"type" : "integer"
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "PacketMod"
|
"description" : "PacketMod"
|
||||||
@ -9992,6 +10025,9 @@ margin-bottom: 20px;
|
|||||||
},
|
},
|
||||||
"reverseAPIChannelIndex" : {
|
"reverseAPIChannelIndex" : {
|
||||||
"type" : "integer"
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "Remote channel source settings"
|
"description" : "Remote channel source settings"
|
||||||
@ -10553,6 +10589,9 @@ margin-bottom: 20px;
|
|||||||
},
|
},
|
||||||
"spectrumConfig" : {
|
"spectrumConfig" : {
|
||||||
"$ref" : "#/definitions/GLSpectrum"
|
"$ref" : "#/definitions/GLSpectrum"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "SSBMod"
|
"description" : "SSBMod"
|
||||||
@ -12484,6 +12523,9 @@ margin-bottom: 20px;
|
|||||||
},
|
},
|
||||||
"spectrumConfig" : {
|
"spectrumConfig" : {
|
||||||
"$ref" : "#/definitions/GLSpectrum"
|
"$ref" : "#/definitions/GLSpectrum"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "UDPSource"
|
"description" : "UDPSource"
|
||||||
@ -13051,6 +13093,9 @@ margin-bottom: 20px;
|
|||||||
},
|
},
|
||||||
"cwKeyer" : {
|
"cwKeyer" : {
|
||||||
"$ref" : "#/definitions/CWKeyerSettings"
|
"$ref" : "#/definitions/CWKeyerSettings"
|
||||||
|
},
|
||||||
|
"channelMarker" : {
|
||||||
|
"$ref" : "#/definitions/ChannelMarker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "WFMMod"
|
"description" : "WFMMod"
|
||||||
@ -51554,7 +51599,7 @@ except ApiException as e:
|
|||||||
</div>
|
</div>
|
||||||
<div id="generator">
|
<div id="generator">
|
||||||
<div class="content">
|
<div class="content">
|
||||||
Generated 2021-12-02T23:38:15.455+01:00
|
Generated 2021-12-03T00:35:44.973+01:00
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -100,6 +100,8 @@ SWGAISModSettings::SWGAISModSettings() {
|
|||||||
m_udp_address_isSet = false;
|
m_udp_address_isSet = false;
|
||||||
udp_port = 0;
|
udp_port = 0;
|
||||||
m_udp_port_isSet = false;
|
m_udp_port_isSet = false;
|
||||||
|
channel_marker = nullptr;
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGAISModSettings::~SWGAISModSettings() {
|
SWGAISModSettings::~SWGAISModSettings() {
|
||||||
@ -180,6 +182,8 @@ SWGAISModSettings::init() {
|
|||||||
m_udp_address_isSet = false;
|
m_udp_address_isSet = false;
|
||||||
udp_port = 0;
|
udp_port = 0;
|
||||||
m_udp_port_isSet = false;
|
m_udp_port_isSet = false;
|
||||||
|
channel_marker = new SWGChannelMarker();
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -230,6 +234,9 @@ SWGAISModSettings::cleanup() {
|
|||||||
delete udp_address;
|
delete udp_address;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(channel_marker != nullptr) {
|
||||||
|
delete channel_marker;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGAISModSettings*
|
SWGAISModSettings*
|
||||||
@ -315,6 +322,8 @@ SWGAISModSettings::fromJsonObject(QJsonObject &pJson) {
|
|||||||
|
|
||||||
::SWGSDRangel::setValue(&udp_port, pJson["udpPort"], "qint32", "");
|
::SWGSDRangel::setValue(&udp_port, pJson["udpPort"], "qint32", "");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QString
|
QString
|
||||||
@ -439,6 +448,9 @@ SWGAISModSettings::asJsonObject() {
|
|||||||
if(m_udp_port_isSet){
|
if(m_udp_port_isSet){
|
||||||
obj->insert("udpPort", QJsonValue(udp_port));
|
obj->insert("udpPort", QJsonValue(udp_port));
|
||||||
}
|
}
|
||||||
|
if((channel_marker != nullptr) && (channel_marker->isSet())){
|
||||||
|
toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker"));
|
||||||
|
}
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
@ -803,6 +815,16 @@ SWGAISModSettings::setUdpPort(qint32 udp_port) {
|
|||||||
this->m_udp_port_isSet = true;
|
this->m_udp_port_isSet = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SWGChannelMarker*
|
||||||
|
SWGAISModSettings::getChannelMarker() {
|
||||||
|
return channel_marker;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGAISModSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
|
||||||
|
this->channel_marker = channel_marker;
|
||||||
|
this->m_channel_marker_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
bool
|
bool
|
||||||
SWGAISModSettings::isSet(){
|
SWGAISModSettings::isSet(){
|
||||||
@ -916,6 +938,9 @@ SWGAISModSettings::isSet(){
|
|||||||
if(m_udp_port_isSet){
|
if(m_udp_port_isSet){
|
||||||
isObjectUpdated = true; break;
|
isObjectUpdated = true; break;
|
||||||
}
|
}
|
||||||
|
if(channel_marker && channel_marker->isSet()){
|
||||||
|
isObjectUpdated = true; break;
|
||||||
|
}
|
||||||
}while(false);
|
}while(false);
|
||||||
return isObjectUpdated;
|
return isObjectUpdated;
|
||||||
}
|
}
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
#include <QJsonObject>
|
#include <QJsonObject>
|
||||||
|
|
||||||
|
|
||||||
|
#include "SWGChannelMarker.h"
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
#include "SWGObject.h"
|
#include "SWGObject.h"
|
||||||
@ -150,6 +151,9 @@ public:
|
|||||||
qint32 getUdpPort();
|
qint32 getUdpPort();
|
||||||
void setUdpPort(qint32 udp_port);
|
void setUdpPort(qint32 udp_port);
|
||||||
|
|
||||||
|
SWGChannelMarker* getChannelMarker();
|
||||||
|
void setChannelMarker(SWGChannelMarker* channel_marker);
|
||||||
|
|
||||||
|
|
||||||
virtual bool isSet() override;
|
virtual bool isSet() override;
|
||||||
|
|
||||||
@ -262,6 +266,9 @@ private:
|
|||||||
qint32 udp_port;
|
qint32 udp_port;
|
||||||
bool m_udp_port_isSet;
|
bool m_udp_port_isSet;
|
||||||
|
|
||||||
|
SWGChannelMarker* channel_marker;
|
||||||
|
bool m_channel_marker_isSet;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -64,6 +64,8 @@ SWGAMModSettings::SWGAMModSettings() {
|
|||||||
m_reverse_api_channel_index_isSet = false;
|
m_reverse_api_channel_index_isSet = false;
|
||||||
cw_keyer = nullptr;
|
cw_keyer = nullptr;
|
||||||
m_cw_keyer_isSet = false;
|
m_cw_keyer_isSet = false;
|
||||||
|
channel_marker = nullptr;
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGAMModSettings::~SWGAMModSettings() {
|
SWGAMModSettings::~SWGAMModSettings() {
|
||||||
@ -108,6 +110,8 @@ SWGAMModSettings::init() {
|
|||||||
m_reverse_api_channel_index_isSet = false;
|
m_reverse_api_channel_index_isSet = false;
|
||||||
cw_keyer = new SWGCWKeyerSettings();
|
cw_keyer = new SWGCWKeyerSettings();
|
||||||
m_cw_keyer_isSet = false;
|
m_cw_keyer_isSet = false;
|
||||||
|
channel_marker = new SWGChannelMarker();
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -138,6 +142,9 @@ SWGAMModSettings::cleanup() {
|
|||||||
if(cw_keyer != nullptr) {
|
if(cw_keyer != nullptr) {
|
||||||
delete cw_keyer;
|
delete cw_keyer;
|
||||||
}
|
}
|
||||||
|
if(channel_marker != nullptr) {
|
||||||
|
delete channel_marker;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGAMModSettings*
|
SWGAMModSettings*
|
||||||
@ -187,6 +194,8 @@ SWGAMModSettings::fromJsonObject(QJsonObject &pJson) {
|
|||||||
|
|
||||||
::SWGSDRangel::setValue(&cw_keyer, pJson["cwKeyer"], "SWGCWKeyerSettings", "SWGCWKeyerSettings");
|
::SWGSDRangel::setValue(&cw_keyer, pJson["cwKeyer"], "SWGCWKeyerSettings", "SWGCWKeyerSettings");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QString
|
QString
|
||||||
@ -257,6 +266,9 @@ SWGAMModSettings::asJsonObject() {
|
|||||||
if((cw_keyer != nullptr) && (cw_keyer->isSet())){
|
if((cw_keyer != nullptr) && (cw_keyer->isSet())){
|
||||||
toJsonValue(QString("cwKeyer"), cw_keyer, obj, QString("SWGCWKeyerSettings"));
|
toJsonValue(QString("cwKeyer"), cw_keyer, obj, QString("SWGCWKeyerSettings"));
|
||||||
}
|
}
|
||||||
|
if((channel_marker != nullptr) && (channel_marker->isSet())){
|
||||||
|
toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker"));
|
||||||
|
}
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
@ -441,6 +453,16 @@ SWGAMModSettings::setCwKeyer(SWGCWKeyerSettings* cw_keyer) {
|
|||||||
this->m_cw_keyer_isSet = true;
|
this->m_cw_keyer_isSet = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SWGChannelMarker*
|
||||||
|
SWGAMModSettings::getChannelMarker() {
|
||||||
|
return channel_marker;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGAMModSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
|
||||||
|
this->channel_marker = channel_marker;
|
||||||
|
this->m_channel_marker_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
bool
|
bool
|
||||||
SWGAMModSettings::isSet(){
|
SWGAMModSettings::isSet(){
|
||||||
@ -500,6 +522,9 @@ SWGAMModSettings::isSet(){
|
|||||||
if(cw_keyer && cw_keyer->isSet()){
|
if(cw_keyer && cw_keyer->isSet()){
|
||||||
isObjectUpdated = true; break;
|
isObjectUpdated = true; break;
|
||||||
}
|
}
|
||||||
|
if(channel_marker && channel_marker->isSet()){
|
||||||
|
isObjectUpdated = true; break;
|
||||||
|
}
|
||||||
}while(false);
|
}while(false);
|
||||||
return isObjectUpdated;
|
return isObjectUpdated;
|
||||||
}
|
}
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
|
|
||||||
|
|
||||||
#include "SWGCWKeyerSettings.h"
|
#include "SWGCWKeyerSettings.h"
|
||||||
|
#include "SWGChannelMarker.h"
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
#include "SWGObject.h"
|
#include "SWGObject.h"
|
||||||
@ -97,6 +98,9 @@ public:
|
|||||||
SWGCWKeyerSettings* getCwKeyer();
|
SWGCWKeyerSettings* getCwKeyer();
|
||||||
void setCwKeyer(SWGCWKeyerSettings* cw_keyer);
|
void setCwKeyer(SWGCWKeyerSettings* cw_keyer);
|
||||||
|
|
||||||
|
SWGChannelMarker* getChannelMarker();
|
||||||
|
void setChannelMarker(SWGChannelMarker* channel_marker);
|
||||||
|
|
||||||
|
|
||||||
virtual bool isSet() override;
|
virtual bool isSet() override;
|
||||||
|
|
||||||
@ -155,6 +159,9 @@ private:
|
|||||||
SWGCWKeyerSettings* cw_keyer;
|
SWGCWKeyerSettings* cw_keyer;
|
||||||
bool m_cw_keyer_isSet;
|
bool m_cw_keyer_isSet;
|
||||||
|
|
||||||
|
SWGChannelMarker* channel_marker;
|
||||||
|
bool m_channel_marker_isSet;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -86,6 +86,8 @@ SWGATVModSettings::SWGATVModSettings() {
|
|||||||
m_reverse_api_device_index_isSet = false;
|
m_reverse_api_device_index_isSet = false;
|
||||||
reverse_api_channel_index = 0;
|
reverse_api_channel_index = 0;
|
||||||
m_reverse_api_channel_index_isSet = false;
|
m_reverse_api_channel_index_isSet = false;
|
||||||
|
channel_marker = nullptr;
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGATVModSettings::~SWGATVModSettings() {
|
SWGATVModSettings::~SWGATVModSettings() {
|
||||||
@ -152,6 +154,8 @@ SWGATVModSettings::init() {
|
|||||||
m_reverse_api_device_index_isSet = false;
|
m_reverse_api_device_index_isSet = false;
|
||||||
reverse_api_channel_index = 0;
|
reverse_api_channel_index = 0;
|
||||||
m_reverse_api_channel_index_isSet = false;
|
m_reverse_api_channel_index_isSet = false;
|
||||||
|
channel_marker = new SWGChannelMarker();
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -195,6 +199,9 @@ SWGATVModSettings::cleanup() {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
if(channel_marker != nullptr) {
|
||||||
|
delete channel_marker;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGATVModSettings*
|
SWGATVModSettings*
|
||||||
@ -266,6 +273,8 @@ SWGATVModSettings::fromJsonObject(QJsonObject &pJson) {
|
|||||||
|
|
||||||
::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
|
::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QString
|
QString
|
||||||
@ -369,6 +378,9 @@ SWGATVModSettings::asJsonObject() {
|
|||||||
if(m_reverse_api_channel_index_isSet){
|
if(m_reverse_api_channel_index_isSet){
|
||||||
obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index));
|
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;
|
return obj;
|
||||||
}
|
}
|
||||||
@ -663,6 +675,16 @@ SWGATVModSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index) {
|
|||||||
this->m_reverse_api_channel_index_isSet = true;
|
this->m_reverse_api_channel_index_isSet = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SWGChannelMarker*
|
||||||
|
SWGATVModSettings::getChannelMarker() {
|
||||||
|
return channel_marker;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGATVModSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
|
||||||
|
this->channel_marker = channel_marker;
|
||||||
|
this->m_channel_marker_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
bool
|
bool
|
||||||
SWGATVModSettings::isSet(){
|
SWGATVModSettings::isSet(){
|
||||||
@ -755,6 +777,9 @@ SWGATVModSettings::isSet(){
|
|||||||
if(m_reverse_api_channel_index_isSet){
|
if(m_reverse_api_channel_index_isSet){
|
||||||
isObjectUpdated = true; break;
|
isObjectUpdated = true; break;
|
||||||
}
|
}
|
||||||
|
if(channel_marker && channel_marker->isSet()){
|
||||||
|
isObjectUpdated = true; break;
|
||||||
|
}
|
||||||
}while(false);
|
}while(false);
|
||||||
return isObjectUpdated;
|
return isObjectUpdated;
|
||||||
}
|
}
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
#include <QJsonObject>
|
#include <QJsonObject>
|
||||||
|
|
||||||
|
|
||||||
|
#include "SWGChannelMarker.h"
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
#include "SWGObject.h"
|
#include "SWGObject.h"
|
||||||
@ -129,6 +130,9 @@ public:
|
|||||||
qint32 getReverseApiChannelIndex();
|
qint32 getReverseApiChannelIndex();
|
||||||
void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
|
void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
|
||||||
|
|
||||||
|
SWGChannelMarker* getChannelMarker();
|
||||||
|
void setChannelMarker(SWGChannelMarker* channel_marker);
|
||||||
|
|
||||||
|
|
||||||
virtual bool isSet() override;
|
virtual bool isSet() override;
|
||||||
|
|
||||||
@ -220,6 +224,9 @@ private:
|
|||||||
qint32 reverse_api_channel_index;
|
qint32 reverse_api_channel_index;
|
||||||
bool m_reverse_api_channel_index_isSet;
|
bool m_reverse_api_channel_index_isSet;
|
||||||
|
|
||||||
|
SWGChannelMarker* channel_marker;
|
||||||
|
bool m_channel_marker_isSet;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -106,6 +106,8 @@ SWGChirpChatModSettings::SWGChirpChatModSettings() {
|
|||||||
m_reverse_api_device_index_isSet = false;
|
m_reverse_api_device_index_isSet = false;
|
||||||
reverse_api_channel_index = 0;
|
reverse_api_channel_index = 0;
|
||||||
m_reverse_api_channel_index_isSet = false;
|
m_reverse_api_channel_index_isSet = false;
|
||||||
|
channel_marker = nullptr;
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGChirpChatModSettings::~SWGChirpChatModSettings() {
|
SWGChirpChatModSettings::~SWGChirpChatModSettings() {
|
||||||
@ -192,6 +194,8 @@ SWGChirpChatModSettings::init() {
|
|||||||
m_reverse_api_device_index_isSet = false;
|
m_reverse_api_device_index_isSet = false;
|
||||||
reverse_api_channel_index = 0;
|
reverse_api_channel_index = 0;
|
||||||
m_reverse_api_channel_index_isSet = false;
|
m_reverse_api_channel_index_isSet = false;
|
||||||
|
channel_marker = new SWGChannelMarker();
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -273,6 +277,9 @@ SWGChirpChatModSettings::cleanup() {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
if(channel_marker != nullptr) {
|
||||||
|
delete channel_marker;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGChirpChatModSettings*
|
SWGChirpChatModSettings*
|
||||||
@ -364,6 +371,8 @@ SWGChirpChatModSettings::fromJsonObject(QJsonObject &pJson) {
|
|||||||
|
|
||||||
::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
|
::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QString
|
QString
|
||||||
@ -497,6 +506,9 @@ SWGChirpChatModSettings::asJsonObject() {
|
|||||||
if(m_reverse_api_channel_index_isSet){
|
if(m_reverse_api_channel_index_isSet){
|
||||||
obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index));
|
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;
|
return obj;
|
||||||
}
|
}
|
||||||
@ -891,6 +903,16 @@ SWGChirpChatModSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_in
|
|||||||
this->m_reverse_api_channel_index_isSet = true;
|
this->m_reverse_api_channel_index_isSet = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SWGChannelMarker*
|
||||||
|
SWGChirpChatModSettings::getChannelMarker() {
|
||||||
|
return channel_marker;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGChirpChatModSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
|
||||||
|
this->channel_marker = channel_marker;
|
||||||
|
this->m_channel_marker_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
bool
|
bool
|
||||||
SWGChirpChatModSettings::isSet(){
|
SWGChirpChatModSettings::isSet(){
|
||||||
@ -1013,6 +1035,9 @@ SWGChirpChatModSettings::isSet(){
|
|||||||
if(m_reverse_api_channel_index_isSet){
|
if(m_reverse_api_channel_index_isSet){
|
||||||
isObjectUpdated = true; break;
|
isObjectUpdated = true; break;
|
||||||
}
|
}
|
||||||
|
if(channel_marker && channel_marker->isSet()){
|
||||||
|
isObjectUpdated = true; break;
|
||||||
|
}
|
||||||
}while(false);
|
}while(false);
|
||||||
return isObjectUpdated;
|
return isObjectUpdated;
|
||||||
}
|
}
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
#include <QJsonObject>
|
#include <QJsonObject>
|
||||||
|
|
||||||
|
|
||||||
|
#include "SWGChannelMarker.h"
|
||||||
#include <QList>
|
#include <QList>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
@ -160,6 +161,9 @@ public:
|
|||||||
qint32 getReverseApiChannelIndex();
|
qint32 getReverseApiChannelIndex();
|
||||||
void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
|
void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
|
||||||
|
|
||||||
|
SWGChannelMarker* getChannelMarker();
|
||||||
|
void setChannelMarker(SWGChannelMarker* channel_marker);
|
||||||
|
|
||||||
|
|
||||||
virtual bool isSet() override;
|
virtual bool isSet() override;
|
||||||
|
|
||||||
@ -281,6 +285,9 @@ private:
|
|||||||
qint32 reverse_api_channel_index;
|
qint32 reverse_api_channel_index;
|
||||||
bool m_reverse_api_channel_index_isSet;
|
bool m_reverse_api_channel_index_isSet;
|
||||||
|
|
||||||
|
SWGChannelMarker* channel_marker;
|
||||||
|
bool m_channel_marker_isSet;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -72,6 +72,8 @@ SWGDATVModSettings::SWGDATVModSettings() {
|
|||||||
m_reverse_api_device_index_isSet = false;
|
m_reverse_api_device_index_isSet = false;
|
||||||
reverse_api_channel_index = 0;
|
reverse_api_channel_index = 0;
|
||||||
m_reverse_api_channel_index_isSet = false;
|
m_reverse_api_channel_index_isSet = false;
|
||||||
|
channel_marker = nullptr;
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGDATVModSettings::~SWGDATVModSettings() {
|
SWGDATVModSettings::~SWGDATVModSettings() {
|
||||||
@ -124,6 +126,8 @@ SWGDATVModSettings::init() {
|
|||||||
m_reverse_api_device_index_isSet = false;
|
m_reverse_api_device_index_isSet = false;
|
||||||
reverse_api_channel_index = 0;
|
reverse_api_channel_index = 0;
|
||||||
m_reverse_api_channel_index_isSet = false;
|
m_reverse_api_channel_index_isSet = false;
|
||||||
|
channel_marker = new SWGChannelMarker();
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -158,6 +162,9 @@ SWGDATVModSettings::cleanup() {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
if(channel_marker != nullptr) {
|
||||||
|
delete channel_marker;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGDATVModSettings*
|
SWGDATVModSettings*
|
||||||
@ -215,6 +222,8 @@ SWGDATVModSettings::fromJsonObject(QJsonObject &pJson) {
|
|||||||
|
|
||||||
::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
|
::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QString
|
QString
|
||||||
@ -297,6 +306,9 @@ SWGDATVModSettings::asJsonObject() {
|
|||||||
if(m_reverse_api_channel_index_isSet){
|
if(m_reverse_api_channel_index_isSet){
|
||||||
obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index));
|
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;
|
return obj;
|
||||||
}
|
}
|
||||||
@ -521,6 +533,16 @@ SWGDATVModSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index)
|
|||||||
this->m_reverse_api_channel_index_isSet = true;
|
this->m_reverse_api_channel_index_isSet = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SWGChannelMarker*
|
||||||
|
SWGDATVModSettings::getChannelMarker() {
|
||||||
|
return channel_marker;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGDATVModSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
|
||||||
|
this->channel_marker = channel_marker;
|
||||||
|
this->m_channel_marker_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
bool
|
bool
|
||||||
SWGDATVModSettings::isSet(){
|
SWGDATVModSettings::isSet(){
|
||||||
@ -592,6 +614,9 @@ SWGDATVModSettings::isSet(){
|
|||||||
if(m_reverse_api_channel_index_isSet){
|
if(m_reverse_api_channel_index_isSet){
|
||||||
isObjectUpdated = true; break;
|
isObjectUpdated = true; break;
|
||||||
}
|
}
|
||||||
|
if(channel_marker && channel_marker->isSet()){
|
||||||
|
isObjectUpdated = true; break;
|
||||||
|
}
|
||||||
}while(false);
|
}while(false);
|
||||||
return isObjectUpdated;
|
return isObjectUpdated;
|
||||||
}
|
}
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
#include <QJsonObject>
|
#include <QJsonObject>
|
||||||
|
|
||||||
|
|
||||||
|
#include "SWGChannelMarker.h"
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
#include "SWGObject.h"
|
#include "SWGObject.h"
|
||||||
@ -108,6 +109,9 @@ public:
|
|||||||
qint32 getReverseApiChannelIndex();
|
qint32 getReverseApiChannelIndex();
|
||||||
void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
|
void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
|
||||||
|
|
||||||
|
SWGChannelMarker* getChannelMarker();
|
||||||
|
void setChannelMarker(SWGChannelMarker* channel_marker);
|
||||||
|
|
||||||
|
|
||||||
virtual bool isSet() override;
|
virtual bool isSet() override;
|
||||||
|
|
||||||
@ -178,6 +182,9 @@ private:
|
|||||||
qint32 reverse_api_channel_index;
|
qint32 reverse_api_channel_index;
|
||||||
bool m_reverse_api_channel_index_isSet;
|
bool m_reverse_api_channel_index_isSet;
|
||||||
|
|
||||||
|
SWGChannelMarker* channel_marker;
|
||||||
|
bool m_channel_marker_isSet;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -54,6 +54,8 @@ SWGFileSourceSettings::SWGFileSourceSettings() {
|
|||||||
m_reverse_api_device_index_isSet = false;
|
m_reverse_api_device_index_isSet = false;
|
||||||
reverse_api_channel_index = 0;
|
reverse_api_channel_index = 0;
|
||||||
m_reverse_api_channel_index_isSet = false;
|
m_reverse_api_channel_index_isSet = false;
|
||||||
|
channel_marker = nullptr;
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGFileSourceSettings::~SWGFileSourceSettings() {
|
SWGFileSourceSettings::~SWGFileSourceSettings() {
|
||||||
@ -88,6 +90,8 @@ SWGFileSourceSettings::init() {
|
|||||||
m_reverse_api_device_index_isSet = false;
|
m_reverse_api_device_index_isSet = false;
|
||||||
reverse_api_channel_index = 0;
|
reverse_api_channel_index = 0;
|
||||||
m_reverse_api_channel_index_isSet = false;
|
m_reverse_api_channel_index_isSet = false;
|
||||||
|
channel_marker = new SWGChannelMarker();
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -111,6 +115,9 @@ SWGFileSourceSettings::cleanup() {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
if(channel_marker != nullptr) {
|
||||||
|
delete channel_marker;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGFileSourceSettings*
|
SWGFileSourceSettings*
|
||||||
@ -150,6 +157,8 @@ SWGFileSourceSettings::fromJsonObject(QJsonObject &pJson) {
|
|||||||
|
|
||||||
::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
|
::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QString
|
QString
|
||||||
@ -205,6 +214,9 @@ SWGFileSourceSettings::asJsonObject() {
|
|||||||
if(m_reverse_api_channel_index_isSet){
|
if(m_reverse_api_channel_index_isSet){
|
||||||
obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index));
|
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;
|
return obj;
|
||||||
}
|
}
|
||||||
@ -339,6 +351,16 @@ SWGFileSourceSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_inde
|
|||||||
this->m_reverse_api_channel_index_isSet = true;
|
this->m_reverse_api_channel_index_isSet = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SWGChannelMarker*
|
||||||
|
SWGFileSourceSettings::getChannelMarker() {
|
||||||
|
return channel_marker;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGFileSourceSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
|
||||||
|
this->channel_marker = channel_marker;
|
||||||
|
this->m_channel_marker_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
bool
|
bool
|
||||||
SWGFileSourceSettings::isSet(){
|
SWGFileSourceSettings::isSet(){
|
||||||
@ -383,6 +405,9 @@ SWGFileSourceSettings::isSet(){
|
|||||||
if(m_reverse_api_channel_index_isSet){
|
if(m_reverse_api_channel_index_isSet){
|
||||||
isObjectUpdated = true; break;
|
isObjectUpdated = true; break;
|
||||||
}
|
}
|
||||||
|
if(channel_marker && channel_marker->isSet()){
|
||||||
|
isObjectUpdated = true; break;
|
||||||
|
}
|
||||||
}while(false);
|
}while(false);
|
||||||
return isObjectUpdated;
|
return isObjectUpdated;
|
||||||
}
|
}
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
#include <QJsonObject>
|
#include <QJsonObject>
|
||||||
|
|
||||||
|
|
||||||
|
#include "SWGChannelMarker.h"
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
#include "SWGObject.h"
|
#include "SWGObject.h"
|
||||||
@ -81,6 +82,9 @@ public:
|
|||||||
qint32 getReverseApiChannelIndex();
|
qint32 getReverseApiChannelIndex();
|
||||||
void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
|
void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
|
||||||
|
|
||||||
|
SWGChannelMarker* getChannelMarker();
|
||||||
|
void setChannelMarker(SWGChannelMarker* channel_marker);
|
||||||
|
|
||||||
|
|
||||||
virtual bool isSet() override;
|
virtual bool isSet() override;
|
||||||
|
|
||||||
@ -124,6 +128,9 @@ private:
|
|||||||
qint32 reverse_api_channel_index;
|
qint32 reverse_api_channel_index;
|
||||||
bool m_reverse_api_channel_index_isSet;
|
bool m_reverse_api_channel_index_isSet;
|
||||||
|
|
||||||
|
SWGChannelMarker* channel_marker;
|
||||||
|
bool m_channel_marker_isSet;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -68,6 +68,8 @@ SWGFreeDVModSettings::SWGFreeDVModSettings() {
|
|||||||
m_cw_keyer_isSet = false;
|
m_cw_keyer_isSet = false;
|
||||||
spectrum_config = nullptr;
|
spectrum_config = nullptr;
|
||||||
m_spectrum_config_isSet = false;
|
m_spectrum_config_isSet = false;
|
||||||
|
channel_marker = nullptr;
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGFreeDVModSettings::~SWGFreeDVModSettings() {
|
SWGFreeDVModSettings::~SWGFreeDVModSettings() {
|
||||||
@ -116,6 +118,8 @@ SWGFreeDVModSettings::init() {
|
|||||||
m_cw_keyer_isSet = false;
|
m_cw_keyer_isSet = false;
|
||||||
spectrum_config = new SWGGLSpectrum();
|
spectrum_config = new SWGGLSpectrum();
|
||||||
m_spectrum_config_isSet = false;
|
m_spectrum_config_isSet = false;
|
||||||
|
channel_marker = new SWGChannelMarker();
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -150,6 +154,9 @@ SWGFreeDVModSettings::cleanup() {
|
|||||||
if(spectrum_config != nullptr) {
|
if(spectrum_config != nullptr) {
|
||||||
delete spectrum_config;
|
delete spectrum_config;
|
||||||
}
|
}
|
||||||
|
if(channel_marker != nullptr) {
|
||||||
|
delete channel_marker;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGFreeDVModSettings*
|
SWGFreeDVModSettings*
|
||||||
@ -203,6 +210,8 @@ SWGFreeDVModSettings::fromJsonObject(QJsonObject &pJson) {
|
|||||||
|
|
||||||
::SWGSDRangel::setValue(&spectrum_config, pJson["spectrumConfig"], "SWGGLSpectrum", "SWGGLSpectrum");
|
::SWGSDRangel::setValue(&spectrum_config, pJson["spectrumConfig"], "SWGGLSpectrum", "SWGGLSpectrum");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QString
|
QString
|
||||||
@ -279,6 +288,9 @@ SWGFreeDVModSettings::asJsonObject() {
|
|||||||
if((spectrum_config != nullptr) && (spectrum_config->isSet())){
|
if((spectrum_config != nullptr) && (spectrum_config->isSet())){
|
||||||
toJsonValue(QString("spectrumConfig"), spectrum_config, obj, QString("SWGGLSpectrum"));
|
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;
|
return obj;
|
||||||
}
|
}
|
||||||
@ -483,6 +495,16 @@ SWGFreeDVModSettings::setSpectrumConfig(SWGGLSpectrum* spectrum_config) {
|
|||||||
this->m_spectrum_config_isSet = true;
|
this->m_spectrum_config_isSet = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SWGChannelMarker*
|
||||||
|
SWGFreeDVModSettings::getChannelMarker() {
|
||||||
|
return channel_marker;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGFreeDVModSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
|
||||||
|
this->channel_marker = channel_marker;
|
||||||
|
this->m_channel_marker_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
bool
|
bool
|
||||||
SWGFreeDVModSettings::isSet(){
|
SWGFreeDVModSettings::isSet(){
|
||||||
@ -548,6 +570,9 @@ SWGFreeDVModSettings::isSet(){
|
|||||||
if(spectrum_config && spectrum_config->isSet()){
|
if(spectrum_config && spectrum_config->isSet()){
|
||||||
isObjectUpdated = true; break;
|
isObjectUpdated = true; break;
|
||||||
}
|
}
|
||||||
|
if(channel_marker && channel_marker->isSet()){
|
||||||
|
isObjectUpdated = true; break;
|
||||||
|
}
|
||||||
}while(false);
|
}while(false);
|
||||||
return isObjectUpdated;
|
return isObjectUpdated;
|
||||||
}
|
}
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
|
|
||||||
|
|
||||||
#include "SWGCWKeyerSettings.h"
|
#include "SWGCWKeyerSettings.h"
|
||||||
|
#include "SWGChannelMarker.h"
|
||||||
#include "SWGGLSpectrum.h"
|
#include "SWGGLSpectrum.h"
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
@ -104,6 +105,9 @@ public:
|
|||||||
SWGGLSpectrum* getSpectrumConfig();
|
SWGGLSpectrum* getSpectrumConfig();
|
||||||
void setSpectrumConfig(SWGGLSpectrum* spectrum_config);
|
void setSpectrumConfig(SWGGLSpectrum* spectrum_config);
|
||||||
|
|
||||||
|
SWGChannelMarker* getChannelMarker();
|
||||||
|
void setChannelMarker(SWGChannelMarker* channel_marker);
|
||||||
|
|
||||||
|
|
||||||
virtual bool isSet() override;
|
virtual bool isSet() override;
|
||||||
|
|
||||||
@ -168,6 +172,9 @@ private:
|
|||||||
SWGGLSpectrum* spectrum_config;
|
SWGGLSpectrum* spectrum_config;
|
||||||
bool m_spectrum_config_isSet;
|
bool m_spectrum_config_isSet;
|
||||||
|
|
||||||
|
SWGChannelMarker* channel_marker;
|
||||||
|
bool m_channel_marker_isSet;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -100,6 +100,8 @@ SWGIEEE_802_15_4_ModSettings::SWGIEEE_802_15_4_ModSettings() {
|
|||||||
m_udp_address_isSet = false;
|
m_udp_address_isSet = false;
|
||||||
udp_port = 0;
|
udp_port = 0;
|
||||||
m_udp_port_isSet = false;
|
m_udp_port_isSet = false;
|
||||||
|
channel_marker = nullptr;
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGIEEE_802_15_4_ModSettings::~SWGIEEE_802_15_4_ModSettings() {
|
SWGIEEE_802_15_4_ModSettings::~SWGIEEE_802_15_4_ModSettings() {
|
||||||
@ -180,6 +182,8 @@ SWGIEEE_802_15_4_ModSettings::init() {
|
|||||||
m_udp_address_isSet = false;
|
m_udp_address_isSet = false;
|
||||||
udp_port = 0;
|
udp_port = 0;
|
||||||
m_udp_port_isSet = false;
|
m_udp_port_isSet = false;
|
||||||
|
channel_marker = new SWGChannelMarker();
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -228,6 +232,9 @@ SWGIEEE_802_15_4_ModSettings::cleanup() {
|
|||||||
delete udp_address;
|
delete udp_address;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(channel_marker != nullptr) {
|
||||||
|
delete channel_marker;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGIEEE_802_15_4_ModSettings*
|
SWGIEEE_802_15_4_ModSettings*
|
||||||
@ -313,6 +320,8 @@ SWGIEEE_802_15_4_ModSettings::fromJsonObject(QJsonObject &pJson) {
|
|||||||
|
|
||||||
::SWGSDRangel::setValue(&udp_port, pJson["udpPort"], "qint32", "");
|
::SWGSDRangel::setValue(&udp_port, pJson["udpPort"], "qint32", "");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QString
|
QString
|
||||||
@ -437,6 +446,9 @@ SWGIEEE_802_15_4_ModSettings::asJsonObject() {
|
|||||||
if(m_udp_port_isSet){
|
if(m_udp_port_isSet){
|
||||||
obj->insert("udpPort", QJsonValue(udp_port));
|
obj->insert("udpPort", QJsonValue(udp_port));
|
||||||
}
|
}
|
||||||
|
if((channel_marker != nullptr) && (channel_marker->isSet())){
|
||||||
|
toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker"));
|
||||||
|
}
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
@ -801,6 +813,16 @@ SWGIEEE_802_15_4_ModSettings::setUdpPort(qint32 udp_port) {
|
|||||||
this->m_udp_port_isSet = true;
|
this->m_udp_port_isSet = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SWGChannelMarker*
|
||||||
|
SWGIEEE_802_15_4_ModSettings::getChannelMarker() {
|
||||||
|
return channel_marker;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGIEEE_802_15_4_ModSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
|
||||||
|
this->channel_marker = channel_marker;
|
||||||
|
this->m_channel_marker_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
bool
|
bool
|
||||||
SWGIEEE_802_15_4_ModSettings::isSet(){
|
SWGIEEE_802_15_4_ModSettings::isSet(){
|
||||||
@ -914,6 +936,9 @@ SWGIEEE_802_15_4_ModSettings::isSet(){
|
|||||||
if(m_udp_port_isSet){
|
if(m_udp_port_isSet){
|
||||||
isObjectUpdated = true; break;
|
isObjectUpdated = true; break;
|
||||||
}
|
}
|
||||||
|
if(channel_marker && channel_marker->isSet()){
|
||||||
|
isObjectUpdated = true; break;
|
||||||
|
}
|
||||||
}while(false);
|
}while(false);
|
||||||
return isObjectUpdated;
|
return isObjectUpdated;
|
||||||
}
|
}
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
#include <QJsonObject>
|
#include <QJsonObject>
|
||||||
|
|
||||||
|
|
||||||
|
#include "SWGChannelMarker.h"
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
#include "SWGObject.h"
|
#include "SWGObject.h"
|
||||||
@ -150,6 +151,9 @@ public:
|
|||||||
qint32 getUdpPort();
|
qint32 getUdpPort();
|
||||||
void setUdpPort(qint32 udp_port);
|
void setUdpPort(qint32 udp_port);
|
||||||
|
|
||||||
|
SWGChannelMarker* getChannelMarker();
|
||||||
|
void setChannelMarker(SWGChannelMarker* channel_marker);
|
||||||
|
|
||||||
|
|
||||||
virtual bool isSet() override;
|
virtual bool isSet() override;
|
||||||
|
|
||||||
@ -262,6 +266,9 @@ private:
|
|||||||
qint32 udp_port;
|
qint32 udp_port;
|
||||||
bool m_udp_port_isSet;
|
bool m_udp_port_isSet;
|
||||||
|
|
||||||
|
SWGChannelMarker* channel_marker;
|
||||||
|
bool m_channel_marker_isSet;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -52,6 +52,8 @@ SWGLocalSourceSettings::SWGLocalSourceSettings() {
|
|||||||
m_reverse_api_device_index_isSet = false;
|
m_reverse_api_device_index_isSet = false;
|
||||||
reverse_api_channel_index = 0;
|
reverse_api_channel_index = 0;
|
||||||
m_reverse_api_channel_index_isSet = false;
|
m_reverse_api_channel_index_isSet = false;
|
||||||
|
channel_marker = nullptr;
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGLocalSourceSettings::~SWGLocalSourceSettings() {
|
SWGLocalSourceSettings::~SWGLocalSourceSettings() {
|
||||||
@ -84,6 +86,8 @@ SWGLocalSourceSettings::init() {
|
|||||||
m_reverse_api_device_index_isSet = false;
|
m_reverse_api_device_index_isSet = false;
|
||||||
reverse_api_channel_index = 0;
|
reverse_api_channel_index = 0;
|
||||||
m_reverse_api_channel_index_isSet = false;
|
m_reverse_api_channel_index_isSet = false;
|
||||||
|
channel_marker = new SWGChannelMarker();
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -104,6 +108,9 @@ SWGLocalSourceSettings::cleanup() {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
if(channel_marker != nullptr) {
|
||||||
|
delete channel_marker;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGLocalSourceSettings*
|
SWGLocalSourceSettings*
|
||||||
@ -141,6 +148,8 @@ SWGLocalSourceSettings::fromJsonObject(QJsonObject &pJson) {
|
|||||||
|
|
||||||
::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
|
::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QString
|
QString
|
||||||
@ -193,6 +202,9 @@ SWGLocalSourceSettings::asJsonObject() {
|
|||||||
if(m_reverse_api_channel_index_isSet){
|
if(m_reverse_api_channel_index_isSet){
|
||||||
obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index));
|
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;
|
return obj;
|
||||||
}
|
}
|
||||||
@ -317,6 +329,16 @@ SWGLocalSourceSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_ind
|
|||||||
this->m_reverse_api_channel_index_isSet = true;
|
this->m_reverse_api_channel_index_isSet = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SWGChannelMarker*
|
||||||
|
SWGLocalSourceSettings::getChannelMarker() {
|
||||||
|
return channel_marker;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGLocalSourceSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
|
||||||
|
this->channel_marker = channel_marker;
|
||||||
|
this->m_channel_marker_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
bool
|
bool
|
||||||
SWGLocalSourceSettings::isSet(){
|
SWGLocalSourceSettings::isSet(){
|
||||||
@ -358,6 +380,9 @@ SWGLocalSourceSettings::isSet(){
|
|||||||
if(m_reverse_api_channel_index_isSet){
|
if(m_reverse_api_channel_index_isSet){
|
||||||
isObjectUpdated = true; break;
|
isObjectUpdated = true; break;
|
||||||
}
|
}
|
||||||
|
if(channel_marker && channel_marker->isSet()){
|
||||||
|
isObjectUpdated = true; break;
|
||||||
|
}
|
||||||
}while(false);
|
}while(false);
|
||||||
return isObjectUpdated;
|
return isObjectUpdated;
|
||||||
}
|
}
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
#include <QJsonObject>
|
#include <QJsonObject>
|
||||||
|
|
||||||
|
|
||||||
|
#include "SWGChannelMarker.h"
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
#include "SWGObject.h"
|
#include "SWGObject.h"
|
||||||
@ -78,6 +79,9 @@ public:
|
|||||||
qint32 getReverseApiChannelIndex();
|
qint32 getReverseApiChannelIndex();
|
||||||
void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
|
void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
|
||||||
|
|
||||||
|
SWGChannelMarker* getChannelMarker();
|
||||||
|
void setChannelMarker(SWGChannelMarker* channel_marker);
|
||||||
|
|
||||||
|
|
||||||
virtual bool isSet() override;
|
virtual bool isSet() override;
|
||||||
|
|
||||||
@ -118,6 +122,9 @@ private:
|
|||||||
qint32 reverse_api_channel_index;
|
qint32 reverse_api_channel_index;
|
||||||
bool m_reverse_api_channel_index_isSet;
|
bool m_reverse_api_channel_index_isSet;
|
||||||
|
|
||||||
|
SWGChannelMarker* channel_marker;
|
||||||
|
bool m_channel_marker_isSet;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -76,6 +76,8 @@ SWGNFMModSettings::SWGNFMModSettings() {
|
|||||||
m_reverse_api_channel_index_isSet = false;
|
m_reverse_api_channel_index_isSet = false;
|
||||||
cw_keyer = nullptr;
|
cw_keyer = nullptr;
|
||||||
m_cw_keyer_isSet = false;
|
m_cw_keyer_isSet = false;
|
||||||
|
channel_marker = nullptr;
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGNFMModSettings::~SWGNFMModSettings() {
|
SWGNFMModSettings::~SWGNFMModSettings() {
|
||||||
@ -132,6 +134,8 @@ SWGNFMModSettings::init() {
|
|||||||
m_reverse_api_channel_index_isSet = false;
|
m_reverse_api_channel_index_isSet = false;
|
||||||
cw_keyer = new SWGCWKeyerSettings();
|
cw_keyer = new SWGCWKeyerSettings();
|
||||||
m_cw_keyer_isSet = false;
|
m_cw_keyer_isSet = false;
|
||||||
|
channel_marker = new SWGChannelMarker();
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -168,6 +172,9 @@ SWGNFMModSettings::cleanup() {
|
|||||||
if(cw_keyer != nullptr) {
|
if(cw_keyer != nullptr) {
|
||||||
delete cw_keyer;
|
delete cw_keyer;
|
||||||
}
|
}
|
||||||
|
if(channel_marker != nullptr) {
|
||||||
|
delete channel_marker;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGNFMModSettings*
|
SWGNFMModSettings*
|
||||||
@ -229,6 +236,8 @@ SWGNFMModSettings::fromJsonObject(QJsonObject &pJson) {
|
|||||||
|
|
||||||
::SWGSDRangel::setValue(&cw_keyer, pJson["cwKeyer"], "SWGCWKeyerSettings", "SWGCWKeyerSettings");
|
::SWGSDRangel::setValue(&cw_keyer, pJson["cwKeyer"], "SWGCWKeyerSettings", "SWGCWKeyerSettings");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QString
|
QString
|
||||||
@ -317,6 +326,9 @@ SWGNFMModSettings::asJsonObject() {
|
|||||||
if((cw_keyer != nullptr) && (cw_keyer->isSet())){
|
if((cw_keyer != nullptr) && (cw_keyer->isSet())){
|
||||||
toJsonValue(QString("cwKeyer"), cw_keyer, obj, QString("SWGCWKeyerSettings"));
|
toJsonValue(QString("cwKeyer"), cw_keyer, obj, QString("SWGCWKeyerSettings"));
|
||||||
}
|
}
|
||||||
|
if((channel_marker != nullptr) && (channel_marker->isSet())){
|
||||||
|
toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker"));
|
||||||
|
}
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
@ -561,6 +573,16 @@ SWGNFMModSettings::setCwKeyer(SWGCWKeyerSettings* cw_keyer) {
|
|||||||
this->m_cw_keyer_isSet = true;
|
this->m_cw_keyer_isSet = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SWGChannelMarker*
|
||||||
|
SWGNFMModSettings::getChannelMarker() {
|
||||||
|
return channel_marker;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGNFMModSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
|
||||||
|
this->channel_marker = channel_marker;
|
||||||
|
this->m_channel_marker_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
bool
|
bool
|
||||||
SWGNFMModSettings::isSet(){
|
SWGNFMModSettings::isSet(){
|
||||||
@ -638,6 +660,9 @@ SWGNFMModSettings::isSet(){
|
|||||||
if(cw_keyer && cw_keyer->isSet()){
|
if(cw_keyer && cw_keyer->isSet()){
|
||||||
isObjectUpdated = true; break;
|
isObjectUpdated = true; break;
|
||||||
}
|
}
|
||||||
|
if(channel_marker && channel_marker->isSet()){
|
||||||
|
isObjectUpdated = true; break;
|
||||||
|
}
|
||||||
}while(false);
|
}while(false);
|
||||||
return isObjectUpdated;
|
return isObjectUpdated;
|
||||||
}
|
}
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
|
|
||||||
|
|
||||||
#include "SWGCWKeyerSettings.h"
|
#include "SWGCWKeyerSettings.h"
|
||||||
|
#include "SWGChannelMarker.h"
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
#include "SWGObject.h"
|
#include "SWGObject.h"
|
||||||
@ -115,6 +116,9 @@ public:
|
|||||||
SWGCWKeyerSettings* getCwKeyer();
|
SWGCWKeyerSettings* getCwKeyer();
|
||||||
void setCwKeyer(SWGCWKeyerSettings* cw_keyer);
|
void setCwKeyer(SWGCWKeyerSettings* cw_keyer);
|
||||||
|
|
||||||
|
SWGChannelMarker* getChannelMarker();
|
||||||
|
void setChannelMarker(SWGChannelMarker* channel_marker);
|
||||||
|
|
||||||
|
|
||||||
virtual bool isSet() override;
|
virtual bool isSet() override;
|
||||||
|
|
||||||
@ -191,6 +195,9 @@ private:
|
|||||||
SWGCWKeyerSettings* cw_keyer;
|
SWGCWKeyerSettings* cw_keyer;
|
||||||
bool m_cw_keyer_isSet;
|
bool m_cw_keyer_isSet;
|
||||||
|
|
||||||
|
SWGChannelMarker* channel_marker;
|
||||||
|
bool m_channel_marker_isSet;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -132,6 +132,8 @@ SWGPacketModSettings::SWGPacketModSettings() {
|
|||||||
m_reverse_api_device_index_isSet = false;
|
m_reverse_api_device_index_isSet = false;
|
||||||
reverse_api_channel_index = 0;
|
reverse_api_channel_index = 0;
|
||||||
m_reverse_api_channel_index_isSet = false;
|
m_reverse_api_channel_index_isSet = false;
|
||||||
|
channel_marker = nullptr;
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGPacketModSettings::~SWGPacketModSettings() {
|
SWGPacketModSettings::~SWGPacketModSettings() {
|
||||||
@ -244,6 +246,8 @@ SWGPacketModSettings::init() {
|
|||||||
m_reverse_api_device_index_isSet = false;
|
m_reverse_api_device_index_isSet = false;
|
||||||
reverse_api_channel_index = 0;
|
reverse_api_channel_index = 0;
|
||||||
m_reverse_api_channel_index_isSet = false;
|
m_reverse_api_channel_index_isSet = false;
|
||||||
|
channel_marker = new SWGChannelMarker();
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -314,6 +318,9 @@ SWGPacketModSettings::cleanup() {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
if(channel_marker != nullptr) {
|
||||||
|
delete channel_marker;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGPacketModSettings*
|
SWGPacketModSettings*
|
||||||
@ -431,6 +438,8 @@ SWGPacketModSettings::fromJsonObject(QJsonObject &pJson) {
|
|||||||
|
|
||||||
::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
|
::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QString
|
QString
|
||||||
@ -603,6 +612,9 @@ SWGPacketModSettings::asJsonObject() {
|
|||||||
if(m_reverse_api_channel_index_isSet){
|
if(m_reverse_api_channel_index_isSet){
|
||||||
obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index));
|
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;
|
return obj;
|
||||||
}
|
}
|
||||||
@ -1127,6 +1139,16 @@ SWGPacketModSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index
|
|||||||
this->m_reverse_api_channel_index_isSet = true;
|
this->m_reverse_api_channel_index_isSet = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SWGChannelMarker*
|
||||||
|
SWGPacketModSettings::getChannelMarker() {
|
||||||
|
return channel_marker;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGPacketModSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
|
||||||
|
this->channel_marker = channel_marker;
|
||||||
|
this->m_channel_marker_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
bool
|
bool
|
||||||
SWGPacketModSettings::isSet(){
|
SWGPacketModSettings::isSet(){
|
||||||
@ -1288,6 +1310,9 @@ SWGPacketModSettings::isSet(){
|
|||||||
if(m_reverse_api_channel_index_isSet){
|
if(m_reverse_api_channel_index_isSet){
|
||||||
isObjectUpdated = true; break;
|
isObjectUpdated = true; break;
|
||||||
}
|
}
|
||||||
|
if(channel_marker && channel_marker->isSet()){
|
||||||
|
isObjectUpdated = true; break;
|
||||||
|
}
|
||||||
}while(false);
|
}while(false);
|
||||||
return isObjectUpdated;
|
return isObjectUpdated;
|
||||||
}
|
}
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
#include <QJsonObject>
|
#include <QJsonObject>
|
||||||
|
|
||||||
|
|
||||||
|
#include "SWGChannelMarker.h"
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
#include "SWGObject.h"
|
#include "SWGObject.h"
|
||||||
@ -198,6 +199,9 @@ public:
|
|||||||
qint32 getReverseApiChannelIndex();
|
qint32 getReverseApiChannelIndex();
|
||||||
void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
|
void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
|
||||||
|
|
||||||
|
SWGChannelMarker* getChannelMarker();
|
||||||
|
void setChannelMarker(SWGChannelMarker* channel_marker);
|
||||||
|
|
||||||
|
|
||||||
virtual bool isSet() override;
|
virtual bool isSet() override;
|
||||||
|
|
||||||
@ -358,6 +362,9 @@ private:
|
|||||||
qint32 reverse_api_channel_index;
|
qint32 reverse_api_channel_index;
|
||||||
bool m_reverse_api_channel_index_isSet;
|
bool m_reverse_api_channel_index_isSet;
|
||||||
|
|
||||||
|
SWGChannelMarker* channel_marker;
|
||||||
|
bool m_channel_marker_isSet;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -48,6 +48,8 @@ SWGRemoteSourceSettings::SWGRemoteSourceSettings() {
|
|||||||
m_reverse_api_device_index_isSet = false;
|
m_reverse_api_device_index_isSet = false;
|
||||||
reverse_api_channel_index = 0;
|
reverse_api_channel_index = 0;
|
||||||
m_reverse_api_channel_index_isSet = false;
|
m_reverse_api_channel_index_isSet = false;
|
||||||
|
channel_marker = nullptr;
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGRemoteSourceSettings::~SWGRemoteSourceSettings() {
|
SWGRemoteSourceSettings::~SWGRemoteSourceSettings() {
|
||||||
@ -76,6 +78,8 @@ SWGRemoteSourceSettings::init() {
|
|||||||
m_reverse_api_device_index_isSet = false;
|
m_reverse_api_device_index_isSet = false;
|
||||||
reverse_api_channel_index = 0;
|
reverse_api_channel_index = 0;
|
||||||
m_reverse_api_channel_index_isSet = false;
|
m_reverse_api_channel_index_isSet = false;
|
||||||
|
channel_marker = new SWGChannelMarker();
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -96,6 +100,9 @@ SWGRemoteSourceSettings::cleanup() {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
if(channel_marker != nullptr) {
|
||||||
|
delete channel_marker;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGRemoteSourceSettings*
|
SWGRemoteSourceSettings*
|
||||||
@ -129,6 +136,8 @@ SWGRemoteSourceSettings::fromJsonObject(QJsonObject &pJson) {
|
|||||||
|
|
||||||
::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
|
::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QString
|
QString
|
||||||
@ -175,6 +184,9 @@ SWGRemoteSourceSettings::asJsonObject() {
|
|||||||
if(m_reverse_api_channel_index_isSet){
|
if(m_reverse_api_channel_index_isSet){
|
||||||
obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index));
|
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;
|
return obj;
|
||||||
}
|
}
|
||||||
@ -279,6 +291,16 @@ SWGRemoteSourceSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_in
|
|||||||
this->m_reverse_api_channel_index_isSet = true;
|
this->m_reverse_api_channel_index_isSet = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SWGChannelMarker*
|
||||||
|
SWGRemoteSourceSettings::getChannelMarker() {
|
||||||
|
return channel_marker;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGRemoteSourceSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
|
||||||
|
this->channel_marker = channel_marker;
|
||||||
|
this->m_channel_marker_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
bool
|
bool
|
||||||
SWGRemoteSourceSettings::isSet(){
|
SWGRemoteSourceSettings::isSet(){
|
||||||
@ -314,6 +336,9 @@ SWGRemoteSourceSettings::isSet(){
|
|||||||
if(m_reverse_api_channel_index_isSet){
|
if(m_reverse_api_channel_index_isSet){
|
||||||
isObjectUpdated = true; break;
|
isObjectUpdated = true; break;
|
||||||
}
|
}
|
||||||
|
if(channel_marker && channel_marker->isSet()){
|
||||||
|
isObjectUpdated = true; break;
|
||||||
|
}
|
||||||
}while(false);
|
}while(false);
|
||||||
return isObjectUpdated;
|
return isObjectUpdated;
|
||||||
}
|
}
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
#include <QJsonObject>
|
#include <QJsonObject>
|
||||||
|
|
||||||
|
|
||||||
|
#include "SWGChannelMarker.h"
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
#include "SWGObject.h"
|
#include "SWGObject.h"
|
||||||
@ -72,6 +73,9 @@ public:
|
|||||||
qint32 getReverseApiChannelIndex();
|
qint32 getReverseApiChannelIndex();
|
||||||
void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
|
void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
|
||||||
|
|
||||||
|
SWGChannelMarker* getChannelMarker();
|
||||||
|
void setChannelMarker(SWGChannelMarker* channel_marker);
|
||||||
|
|
||||||
|
|
||||||
virtual bool isSet() override;
|
virtual bool isSet() override;
|
||||||
|
|
||||||
@ -106,6 +110,9 @@ private:
|
|||||||
qint32 reverse_api_channel_index;
|
qint32 reverse_api_channel_index;
|
||||||
bool m_reverse_api_channel_index_isSet;
|
bool m_reverse_api_channel_index_isSet;
|
||||||
|
|
||||||
|
SWGChannelMarker* channel_marker;
|
||||||
|
bool m_channel_marker_isSet;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -82,6 +82,8 @@ SWGSSBModSettings::SWGSSBModSettings() {
|
|||||||
m_cw_keyer_isSet = false;
|
m_cw_keyer_isSet = false;
|
||||||
spectrum_config = nullptr;
|
spectrum_config = nullptr;
|
||||||
m_spectrum_config_isSet = false;
|
m_spectrum_config_isSet = false;
|
||||||
|
channel_marker = nullptr;
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGSSBModSettings::~SWGSSBModSettings() {
|
SWGSSBModSettings::~SWGSSBModSettings() {
|
||||||
@ -144,6 +146,8 @@ SWGSSBModSettings::init() {
|
|||||||
m_cw_keyer_isSet = false;
|
m_cw_keyer_isSet = false;
|
||||||
spectrum_config = new SWGGLSpectrum();
|
spectrum_config = new SWGGLSpectrum();
|
||||||
m_spectrum_config_isSet = false;
|
m_spectrum_config_isSet = false;
|
||||||
|
channel_marker = new SWGChannelMarker();
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -185,6 +189,9 @@ SWGSSBModSettings::cleanup() {
|
|||||||
if(spectrum_config != nullptr) {
|
if(spectrum_config != nullptr) {
|
||||||
delete spectrum_config;
|
delete spectrum_config;
|
||||||
}
|
}
|
||||||
|
if(channel_marker != nullptr) {
|
||||||
|
delete channel_marker;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGSSBModSettings*
|
SWGSSBModSettings*
|
||||||
@ -252,6 +259,8 @@ SWGSSBModSettings::fromJsonObject(QJsonObject &pJson) {
|
|||||||
|
|
||||||
::SWGSDRangel::setValue(&spectrum_config, pJson["spectrumConfig"], "SWGGLSpectrum", "SWGGLSpectrum");
|
::SWGSDRangel::setValue(&spectrum_config, pJson["spectrumConfig"], "SWGGLSpectrum", "SWGGLSpectrum");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QString
|
QString
|
||||||
@ -349,6 +358,9 @@ SWGSSBModSettings::asJsonObject() {
|
|||||||
if((spectrum_config != nullptr) && (spectrum_config->isSet())){
|
if((spectrum_config != nullptr) && (spectrum_config->isSet())){
|
||||||
toJsonValue(QString("spectrumConfig"), spectrum_config, obj, QString("SWGGLSpectrum"));
|
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;
|
return obj;
|
||||||
}
|
}
|
||||||
@ -623,6 +635,16 @@ SWGSSBModSettings::setSpectrumConfig(SWGGLSpectrum* spectrum_config) {
|
|||||||
this->m_spectrum_config_isSet = true;
|
this->m_spectrum_config_isSet = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SWGChannelMarker*
|
||||||
|
SWGSSBModSettings::getChannelMarker() {
|
||||||
|
return channel_marker;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGSSBModSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
|
||||||
|
this->channel_marker = channel_marker;
|
||||||
|
this->m_channel_marker_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
bool
|
bool
|
||||||
SWGSSBModSettings::isSet(){
|
SWGSSBModSettings::isSet(){
|
||||||
@ -709,6 +731,9 @@ SWGSSBModSettings::isSet(){
|
|||||||
if(spectrum_config && spectrum_config->isSet()){
|
if(spectrum_config && spectrum_config->isSet()){
|
||||||
isObjectUpdated = true; break;
|
isObjectUpdated = true; break;
|
||||||
}
|
}
|
||||||
|
if(channel_marker && channel_marker->isSet()){
|
||||||
|
isObjectUpdated = true; break;
|
||||||
|
}
|
||||||
}while(false);
|
}while(false);
|
||||||
return isObjectUpdated;
|
return isObjectUpdated;
|
||||||
}
|
}
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
|
|
||||||
|
|
||||||
#include "SWGCWKeyerSettings.h"
|
#include "SWGCWKeyerSettings.h"
|
||||||
|
#include "SWGChannelMarker.h"
|
||||||
#include "SWGGLSpectrum.h"
|
#include "SWGGLSpectrum.h"
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
@ -125,6 +126,9 @@ public:
|
|||||||
SWGGLSpectrum* getSpectrumConfig();
|
SWGGLSpectrum* getSpectrumConfig();
|
||||||
void setSpectrumConfig(SWGGLSpectrum* spectrum_config);
|
void setSpectrumConfig(SWGGLSpectrum* spectrum_config);
|
||||||
|
|
||||||
|
SWGChannelMarker* getChannelMarker();
|
||||||
|
void setChannelMarker(SWGChannelMarker* channel_marker);
|
||||||
|
|
||||||
|
|
||||||
virtual bool isSet() override;
|
virtual bool isSet() override;
|
||||||
|
|
||||||
@ -210,6 +214,9 @@ private:
|
|||||||
SWGGLSpectrum* spectrum_config;
|
SWGGLSpectrum* spectrum_config;
|
||||||
bool m_spectrum_config_isSet;
|
bool m_spectrum_config_isSet;
|
||||||
|
|
||||||
|
SWGChannelMarker* channel_marker;
|
||||||
|
bool m_channel_marker_isSet;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -84,6 +84,8 @@ SWGUDPSourceSettings::SWGUDPSourceSettings() {
|
|||||||
m_reverse_api_channel_index_isSet = false;
|
m_reverse_api_channel_index_isSet = false;
|
||||||
spectrum_config = nullptr;
|
spectrum_config = nullptr;
|
||||||
m_spectrum_config_isSet = false;
|
m_spectrum_config_isSet = false;
|
||||||
|
channel_marker = nullptr;
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGUDPSourceSettings::~SWGUDPSourceSettings() {
|
SWGUDPSourceSettings::~SWGUDPSourceSettings() {
|
||||||
@ -148,6 +150,8 @@ SWGUDPSourceSettings::init() {
|
|||||||
m_reverse_api_channel_index_isSet = false;
|
m_reverse_api_channel_index_isSet = false;
|
||||||
spectrum_config = new SWGGLSpectrum();
|
spectrum_config = new SWGGLSpectrum();
|
||||||
m_spectrum_config_isSet = false;
|
m_spectrum_config_isSet = false;
|
||||||
|
channel_marker = new SWGChannelMarker();
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -190,6 +194,9 @@ SWGUDPSourceSettings::cleanup() {
|
|||||||
if(spectrum_config != nullptr) {
|
if(spectrum_config != nullptr) {
|
||||||
delete spectrum_config;
|
delete spectrum_config;
|
||||||
}
|
}
|
||||||
|
if(channel_marker != nullptr) {
|
||||||
|
delete channel_marker;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGUDPSourceSettings*
|
SWGUDPSourceSettings*
|
||||||
@ -259,6 +266,8 @@ SWGUDPSourceSettings::fromJsonObject(QJsonObject &pJson) {
|
|||||||
|
|
||||||
::SWGSDRangel::setValue(&spectrum_config, pJson["spectrumConfig"], "SWGGLSpectrum", "SWGGLSpectrum");
|
::SWGSDRangel::setValue(&spectrum_config, pJson["spectrumConfig"], "SWGGLSpectrum", "SWGGLSpectrum");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QString
|
QString
|
||||||
@ -359,6 +368,9 @@ SWGUDPSourceSettings::asJsonObject() {
|
|||||||
if((spectrum_config != nullptr) && (spectrum_config->isSet())){
|
if((spectrum_config != nullptr) && (spectrum_config->isSet())){
|
||||||
toJsonValue(QString("spectrumConfig"), spectrum_config, obj, QString("SWGGLSpectrum"));
|
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;
|
return obj;
|
||||||
}
|
}
|
||||||
@ -643,6 +655,16 @@ SWGUDPSourceSettings::setSpectrumConfig(SWGGLSpectrum* spectrum_config) {
|
|||||||
this->m_spectrum_config_isSet = true;
|
this->m_spectrum_config_isSet = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SWGChannelMarker*
|
||||||
|
SWGUDPSourceSettings::getChannelMarker() {
|
||||||
|
return channel_marker;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGUDPSourceSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
|
||||||
|
this->channel_marker = channel_marker;
|
||||||
|
this->m_channel_marker_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
bool
|
bool
|
||||||
SWGUDPSourceSettings::isSet(){
|
SWGUDPSourceSettings::isSet(){
|
||||||
@ -732,6 +754,9 @@ SWGUDPSourceSettings::isSet(){
|
|||||||
if(spectrum_config && spectrum_config->isSet()){
|
if(spectrum_config && spectrum_config->isSet()){
|
||||||
isObjectUpdated = true; break;
|
isObjectUpdated = true; break;
|
||||||
}
|
}
|
||||||
|
if(channel_marker && channel_marker->isSet()){
|
||||||
|
isObjectUpdated = true; break;
|
||||||
|
}
|
||||||
}while(false);
|
}while(false);
|
||||||
return isObjectUpdated;
|
return isObjectUpdated;
|
||||||
}
|
}
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
#include <QJsonObject>
|
#include <QJsonObject>
|
||||||
|
|
||||||
|
|
||||||
|
#include "SWGChannelMarker.h"
|
||||||
#include "SWGGLSpectrum.h"
|
#include "SWGGLSpectrum.h"
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
@ -127,6 +128,9 @@ public:
|
|||||||
SWGGLSpectrum* getSpectrumConfig();
|
SWGGLSpectrum* getSpectrumConfig();
|
||||||
void setSpectrumConfig(SWGGLSpectrum* spectrum_config);
|
void setSpectrumConfig(SWGGLSpectrum* spectrum_config);
|
||||||
|
|
||||||
|
SWGChannelMarker* getChannelMarker();
|
||||||
|
void setChannelMarker(SWGChannelMarker* channel_marker);
|
||||||
|
|
||||||
|
|
||||||
virtual bool isSet() override;
|
virtual bool isSet() override;
|
||||||
|
|
||||||
@ -215,6 +219,9 @@ private:
|
|||||||
SWGGLSpectrum* spectrum_config;
|
SWGGLSpectrum* spectrum_config;
|
||||||
bool m_spectrum_config_isSet;
|
bool m_spectrum_config_isSet;
|
||||||
|
|
||||||
|
SWGChannelMarker* channel_marker;
|
||||||
|
bool m_channel_marker_isSet;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -66,6 +66,8 @@ SWGWFMModSettings::SWGWFMModSettings() {
|
|||||||
m_reverse_api_channel_index_isSet = false;
|
m_reverse_api_channel_index_isSet = false;
|
||||||
cw_keyer = nullptr;
|
cw_keyer = nullptr;
|
||||||
m_cw_keyer_isSet = false;
|
m_cw_keyer_isSet = false;
|
||||||
|
channel_marker = nullptr;
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGWFMModSettings::~SWGWFMModSettings() {
|
SWGWFMModSettings::~SWGWFMModSettings() {
|
||||||
@ -112,6 +114,8 @@ SWGWFMModSettings::init() {
|
|||||||
m_reverse_api_channel_index_isSet = false;
|
m_reverse_api_channel_index_isSet = false;
|
||||||
cw_keyer = new SWGCWKeyerSettings();
|
cw_keyer = new SWGCWKeyerSettings();
|
||||||
m_cw_keyer_isSet = false;
|
m_cw_keyer_isSet = false;
|
||||||
|
channel_marker = new SWGChannelMarker();
|
||||||
|
m_channel_marker_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -143,6 +147,9 @@ SWGWFMModSettings::cleanup() {
|
|||||||
if(cw_keyer != nullptr) {
|
if(cw_keyer != nullptr) {
|
||||||
delete cw_keyer;
|
delete cw_keyer;
|
||||||
}
|
}
|
||||||
|
if(channel_marker != nullptr) {
|
||||||
|
delete channel_marker;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGWFMModSettings*
|
SWGWFMModSettings*
|
||||||
@ -194,6 +201,8 @@ SWGWFMModSettings::fromJsonObject(QJsonObject &pJson) {
|
|||||||
|
|
||||||
::SWGSDRangel::setValue(&cw_keyer, pJson["cwKeyer"], "SWGCWKeyerSettings", "SWGCWKeyerSettings");
|
::SWGSDRangel::setValue(&cw_keyer, pJson["cwKeyer"], "SWGCWKeyerSettings", "SWGCWKeyerSettings");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QString
|
QString
|
||||||
@ -267,6 +276,9 @@ SWGWFMModSettings::asJsonObject() {
|
|||||||
if((cw_keyer != nullptr) && (cw_keyer->isSet())){
|
if((cw_keyer != nullptr) && (cw_keyer->isSet())){
|
||||||
toJsonValue(QString("cwKeyer"), cw_keyer, obj, QString("SWGCWKeyerSettings"));
|
toJsonValue(QString("cwKeyer"), cw_keyer, obj, QString("SWGCWKeyerSettings"));
|
||||||
}
|
}
|
||||||
|
if((channel_marker != nullptr) && (channel_marker->isSet())){
|
||||||
|
toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker"));
|
||||||
|
}
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
@ -461,6 +473,16 @@ SWGWFMModSettings::setCwKeyer(SWGCWKeyerSettings* cw_keyer) {
|
|||||||
this->m_cw_keyer_isSet = true;
|
this->m_cw_keyer_isSet = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SWGChannelMarker*
|
||||||
|
SWGWFMModSettings::getChannelMarker() {
|
||||||
|
return channel_marker;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGWFMModSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
|
||||||
|
this->channel_marker = channel_marker;
|
||||||
|
this->m_channel_marker_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
bool
|
bool
|
||||||
SWGWFMModSettings::isSet(){
|
SWGWFMModSettings::isSet(){
|
||||||
@ -523,6 +545,9 @@ SWGWFMModSettings::isSet(){
|
|||||||
if(cw_keyer && cw_keyer->isSet()){
|
if(cw_keyer && cw_keyer->isSet()){
|
||||||
isObjectUpdated = true; break;
|
isObjectUpdated = true; break;
|
||||||
}
|
}
|
||||||
|
if(channel_marker && channel_marker->isSet()){
|
||||||
|
isObjectUpdated = true; break;
|
||||||
|
}
|
||||||
}while(false);
|
}while(false);
|
||||||
return isObjectUpdated;
|
return isObjectUpdated;
|
||||||
}
|
}
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
|
|
||||||
|
|
||||||
#include "SWGCWKeyerSettings.h"
|
#include "SWGCWKeyerSettings.h"
|
||||||
|
#include "SWGChannelMarker.h"
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
#include "SWGObject.h"
|
#include "SWGObject.h"
|
||||||
@ -100,6 +101,9 @@ public:
|
|||||||
SWGCWKeyerSettings* getCwKeyer();
|
SWGCWKeyerSettings* getCwKeyer();
|
||||||
void setCwKeyer(SWGCWKeyerSettings* cw_keyer);
|
void setCwKeyer(SWGCWKeyerSettings* cw_keyer);
|
||||||
|
|
||||||
|
SWGChannelMarker* getChannelMarker();
|
||||||
|
void setChannelMarker(SWGChannelMarker* channel_marker);
|
||||||
|
|
||||||
|
|
||||||
virtual bool isSet() override;
|
virtual bool isSet() override;
|
||||||
|
|
||||||
@ -161,6 +165,9 @@ private:
|
|||||||
SWGCWKeyerSettings* cw_keyer;
|
SWGCWKeyerSettings* cw_keyer;
|
||||||
bool m_cw_keyer_isSet;
|
bool m_cw_keyer_isSet;
|
||||||
|
|
||||||
|
SWGChannelMarker* channel_marker;
|
||||||
|
bool m_channel_marker_isSet;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user