VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-09 09:25:07 -04:00
Code Issues Projects Releases Wiki Activity

API: implemented Channel Marker in Tx channels

Browse Source
This commit is contained in:
f4exb
2021-12-03 22:32:54 +01:00
parent 8a438a94c1
commit 2a3ce0e7fb
92 changed files with 1017 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/channeltx/filesource/filesource.cpp
+25
View File
@@ -34,6 +34,7 @@
#include "dsp/hbfilterchainconverter.h"
#include "dsp/filerecord.h"
#include "feature/feature.h"
#include "settings/serializable.h"
#include "util/db.h"
#include "maincore.h"
@@ -373,6 +374,9 @@ void FileSource::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
settings.m_reverseAPIChannelIndex = response.getFileSourceSettings()->getReverseApiChannelIndex();
}
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getFileSourceSettings()->getChannelMarker());
}
}
int FileSource::webapiReportGet(
@@ -463,6 +467,20 @@ void FileSource::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& re
response.getFileSourceSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getFileSourceSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
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)
@@ -584,6 +602,13 @@ void FileSource::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex") || force) {
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)
plugins/channeltx/filesource/filesourcegui.cpp
+1
View File
@@ -82,6 +82,7 @@ bool FileSourceGUI::handleMessage(const Message& message)
const FileSource::MsgConfigureFileSource& cfg = (FileSource::MsgConfigureFileSource&) message;
m_settings = cfg.getSettings();
blockApplySettings(true);
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings();
blockApplySettings(false);
return true;
plugins/channeltx/localsource/localsource.cpp
+25
View File
@@ -32,6 +32,7 @@
#include "dsp/hbfilterchainconverter.h"
#include "device/deviceapi.h"
#include "feature/feature.h"
#include "settings/serializable.h"
#include "maincore.h"
#include "localsourcebaseband.h"
@@ -414,6 +415,9 @@ void LocalSource::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("streamIndex")) {
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)
@@ -441,6 +445,20 @@ void LocalSource::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& r
response.getLocalSourceSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getLocalSourceSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
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)
@@ -527,6 +545,13 @@ void LocalSource::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex") || force) {
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)
plugins/channeltx/localsource/localsourcegui.cpp
+1
View File
@@ -76,6 +76,7 @@ bool LocalSourceGUI::handleMessage(const Message& message)
const LocalSource::MsgConfigureLocalSource& cfg = (LocalSource::MsgConfigureLocalSource&) message;
m_settings = cfg.getSettings();
blockApplySettings(true);
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings();
blockApplySettings(false);
return true;
plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp
+24
View File
@@ -541,6 +541,9 @@ void IEEE_802_15_4_Mod::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("udpPort")) {
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(
@@ -655,6 +658,20 @@ void IEEE_802_15_4_Mod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSetti
}
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)
@@ -834,6 +851,13 @@ void IEEE_802_15_4_Mod::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("udpPort") || force) {
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)
plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.cpp
+1
View File
@@ -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;
m_settings = cfg.getSettings();
blockApplySettings(true);
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings();
blockApplySettings(false);
return true;
plugins/channeltx/modais/aismod.cpp
+24
View File
@@ -641,6 +641,9 @@ void AISMod::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("udpPort")) {
settings.m_udpPort = response.getAisModSettings()->getUdpPort();
}
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getAisModSettings()->getChannelMarker());
}
}
int AISMod::webapiReportGet(
@@ -766,6 +769,20 @@ void AISMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respon
response.getAisModSettings()->setUdpEnabled(settings.m_udpEnabled);
response.getAisModSettings()->setUdpAddress(new QString(settings.m_udpAddress));
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)
@@ -930,6 +947,13 @@ void AISMod::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("udpPort") || force) {
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)
plugins/channeltx/modais/aismodgui.cpp
+1
View File
@@ -84,6 +84,7 @@ bool AISModGUI::handleMessage(const Message& message)
const AISMod::MsgConfigureAISMod& cfg = (AISMod::MsgConfigureAISMod&) message;
m_settings = cfg.getSettings();
blockApplySettings(true);
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings();
blockApplySettings(false);
return true;
plugins/channeltx/modam/ammod.cpp
+24
View File
@@ -473,6 +473,9 @@ void AMMod::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
settings.m_reverseAPIChannelIndex = response.getAmModSettings()->getReverseApiChannelIndex();
}
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getAmModSettings()->getChannelMarker());
}
}
int AMMod::webapiReportGet(
@@ -526,6 +529,20 @@ void AMMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respons
response.getAmModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getAmModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
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)
@@ -674,6 +691,13 @@ void AMMod::webapiFormatChannelSettings(
SWGSDRangel::SWGCWKeyerSettings *apiCwKeyerSettings = swgAMModSettings->getCwKeyer();
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)
plugins/channeltx/modam/ammodgui.cpp
+1
View File
@@ -93,6 +93,7 @@ bool AMModGUI::handleMessage(const Message& message)
const AMMod::MsgConfigureAMMod& cfg = (AMMod::MsgConfigureAMMod&) message;
m_settings = cfg.getSettings();
blockApplySettings(true);
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings();
blockApplySettings(false);
return true;
plugins/channeltx/modatv/atvmod.cpp
+25
View File
@@ -35,6 +35,7 @@
#include "dsp/devicesamplemimo.h"
#include "device/deviceapi.h"
#include "feature/feature.h"
#include "settings/serializable.h"
#include "util/db.h"
#include "maincore.h"
@@ -510,6 +511,9 @@ void ATVMod::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
settings.m_reverseAPIChannelIndex = response.getAtvModSettings()->getReverseApiChannelIndex();
}
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getAtvModSettings()->getChannelMarker());
}
}
int ATVMod::webapiReportGet(
@@ -581,6 +585,20 @@ void ATVMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respon
response.getAtvModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getAtvModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
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)
@@ -718,6 +736,13 @@ void ATVMod::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex") || force) {
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)
plugins/channeltx/modatv/atvmodgui.cpp
+1
View File
@@ -208,6 +208,7 @@ bool ATVModGUI::handleMessage(const Message& message)
const ATVMod::MsgConfigureATVMod& cfg = (ATVMod::MsgConfigureATVMod&) message;
m_settings = cfg.getSettings();
blockApplySettings(true);
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings();
blockApplySettings(false);
return true;
plugins/channeltx/modchirpchat/chirpchatmod.cpp
+25
View File
@@ -37,6 +37,7 @@
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
#include "feature/feature.h"
#include "settings/serializable.h"
#include "util/db.h"
#include "maincore.h"
@@ -584,6 +585,9 @@ void ChirpChatMod::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
settings.m_reverseAPIChannelIndex = response.getChirpChatModSettings()->getReverseApiChannelIndex();
}
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getChirpChatModSettings()->getChannelMarker());
}
}
int ChirpChatMod::webapiReportGet(
@@ -725,6 +729,20 @@ void ChirpChatMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings&
response.getChirpChatModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getChirpChatModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
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)
@@ -913,6 +931,13 @@ void ChirpChatMod::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("title") || force) {
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)
plugins/channeltx/modchirpchat/chirpchatmodgui.cpp
+1
View File
@@ -81,6 +81,7 @@ bool ChirpChatModGUI::handleMessage(const Message& message)
const ChirpChatMod::MsgConfigureChirpChatMod& cfg = (ChirpChatMod::MsgConfigureChirpChatMod&) message;
m_settings = cfg.getSettings();
blockApplySettings(true);
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings();
blockApplySettings(false);
return true;
plugins/channeltx/moddatv/datvmod.cpp
+25
View File
@@ -39,6 +39,7 @@
#include "dsp/devicesamplemimo.h"
#include "device/deviceapi.h"
#include "feature/feature.h"
#include "settings/serializable.h"
#include "util/db.h"
#include "maincore.h"
@@ -444,6 +445,9 @@ void DATVMod::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
settings.m_reverseAPIChannelIndex = response.getDatvModSettings()->getReverseApiChannelIndex();
}
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getDatvModSettings()->getChannelMarker());
}
}
int DATVMod::webapiReportGet(
@@ -493,6 +497,20 @@ void DATVMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respo
response.getDatvModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getDatvModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
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)
@@ -627,6 +645,13 @@ void DATVMod::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex") || force) {
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)
plugins/channeltx/moddatv/datvmodgui.cpp
+1
View File
@@ -193,6 +193,7 @@ bool DATVModGUI::handleMessage(const Message& message)
const DATVMod::MsgConfigureDATVMod& cfg = (DATVMod::MsgConfigureDATVMod&) message;
m_settings = cfg.getSettings();
blockApplySettings(true);
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings();
blockApplySettings(false);
return true;
plugins/channeltx/modfreedv/freedvmod.cpp
+25
View File
@@ -453,6 +453,9 @@ void FreeDVMod::webapiUpdateChannelSettings(
if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) {
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(
@@ -521,6 +524,20 @@ void FreeDVMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& res
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)
@@ -664,6 +681,7 @@ void FreeDVMod::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex") || force) {
swgFreeDVModSettings->setStreamIndex(settings.m_streamIndex);
}
if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force))
{
SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum();
@@ -671,6 +689,13 @@ void FreeDVMod::webapiFormatChannelSettings(
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)
{
const CWKeyerSettings& cwKeyerSettings = m_basebandSource->getCWKeyer().getSettings();
plugins/channeltx/modfreedv/freedvmodgui.cpp
+1
View File
@@ -105,6 +105,7 @@ bool FreeDVModGUI::handleMessage(const Message& message)
m_settings = cfg.getSettings();
blockApplySettings(true);
ui->spectrumGUI->updateSettings();
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings();
blockApplySettings(false);
return true;
plugins/channeltx/modnfm/nfmmod.cpp
+24
View File
@@ -535,6 +535,9 @@ void NFMMod::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
settings.m_reverseAPIChannelIndex = response.getNfmModSettings()->getReverseApiChannelIndex();
}
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getNfmModSettings()->getChannelMarker());
}
}
int NFMMod::webapiReportGet(
@@ -594,6 +597,20 @@ void NFMMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respon
response.getNfmModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getNfmModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
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)
@@ -753,6 +770,13 @@ void NFMMod::webapiFormatChannelSettings(
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)
{
const CWKeyerSettings& cwKeyerSettings = m_basebandSource->getCWKeyer().getSettings();
plugins/channeltx/modnfm/nfmmodgui.cpp
+1
View File
@@ -94,6 +94,7 @@ bool NFMModGUI::handleMessage(const Message& message)
const NFMMod::MsgConfigureNFMMod& cfg = (NFMMod::MsgConfigureNFMMod&) message;
m_settings = cfg.getSettings();
blockApplySettings(true);
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings();
blockApplySettings(false);
return true;
plugins/channeltx/modpacket/packetmod.cpp
+24
View File
@@ -636,6 +636,9 @@ void PacketMod::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("udpPort")) {
settings.m_udpPort = response.getPacketModSettings()->getUdpPort();
}
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getPacketModSettings()->getChannelMarker());
}
}
int PacketMod::webapiReportGet(
@@ -796,6 +799,20 @@ void PacketMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& res
response.getPacketModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getPacketModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
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)
@@ -1005,6 +1022,13 @@ void PacketMod::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("udpPort") || force) {
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)
plugins/channeltx/modpacket/packetmodgui.cpp
+1
View File
@@ -84,6 +84,7 @@ bool PacketModGUI::handleMessage(const Message& message)
const PacketMod::MsgConfigurePacketMod& cfg = (PacketMod::MsgConfigurePacketMod&) message;
m_settings = cfg.getSettings();
blockApplySettings(true);
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings();
blockApplySettings(false);
return true;
plugins/channeltx/modssb/ssbmod.cpp
+26
View File
@@ -524,6 +524,9 @@ void SSBMod::webapiUpdateChannelSettings(
if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) {
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(
@@ -599,6 +602,20 @@ void SSBMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respon
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)
@@ -763,6 +780,7 @@ void SSBMod::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex") || force) {
swgSSBModSettings->setStreamIndex(settings.m_streamIndex);
}
if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force))
{
SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum();
@@ -770,6 +788,14 @@ void SSBMod::webapiFormatChannelSettings(
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)
{
const CWKeyerSettings& cwKeyerSettings = m_basebandSource->getCWKeyer().getSettings();
plugins/channeltx/modssb/ssbmodgui.cpp
+1
View File
@@ -111,6 +111,7 @@ bool SSBModGUI::handleMessage(const Message& message)
m_settings = mod_settings;
blockApplySettings(true);
ui->spectrumGUI->updateSettings();
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings();
blockApplySettings(false);
return true;
plugins/channeltx/modwfm/wfmmod.cpp
+24
View File
@@ -459,6 +459,9 @@ void WFMMod::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
settings.m_reverseAPIChannelIndex = response.getWfmModSettings()->getReverseApiChannelIndex();
}
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getWfmModSettings()->getChannelMarker());
}
}
int WFMMod::webapiReportGet(
@@ -513,6 +516,20 @@ void WFMMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respon
response.getWfmModSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getWfmModSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
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)
@@ -657,6 +674,13 @@ void WFMMod::webapiFormatChannelSettings(
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)
{
const CWKeyerSettings& cwKeyerSettings = m_basebandSource->getCWKeyer().getSettings();
plugins/channeltx/modwfm/wfmmodgui.cpp
+1
View File
@@ -93,6 +93,7 @@ bool WFMModGUI::handleMessage(const Message& message)
const WFMMod::MsgConfigureWFMMod& cfg = (WFMMod::MsgConfigureWFMMod&) message;
m_settings = cfg.getSettings();
blockApplySettings(true);
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings();
blockApplySettings(false);
return true;
plugins/channeltx/remotesource/remotesource.cpp
+25
View File
@@ -30,6 +30,7 @@
#include "dsp/devicesamplesink.h"
#include "device/deviceapi.h"
#include "feature/feature.h"
#include "settings/serializable.h"
#include "util/timeutil.h"
#include "util/db.h"
#include "maincore.h"
@@ -291,6 +292,9 @@ void RemoteSource::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
settings.m_reverseAPIChannelIndex = response.getRemoteSourceSettings()->getReverseApiChannelIndex();
}
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getRemoteSourceSettings()->getChannelMarker());
}
}
int RemoteSource::webapiReportGet(
@@ -332,6 +336,20 @@ void RemoteSource::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings&
response.getRemoteSourceSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getRemoteSourceSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
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)
@@ -433,6 +451,13 @@ void RemoteSource::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex") || force) {
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)
plugins/channeltx/remotesource/remotesourcegui.cpp
+1
View File
@@ -70,6 +70,7 @@ bool RemoteSourceGUI::handleMessage(const Message& message)
const RemoteSource::MsgConfigureRemoteSource& cfg = (RemoteSource::MsgConfigureRemoteSource&) message;
m_settings = cfg.getSettings();
blockApplySettings(true);
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings();
blockApplySettings(false);
return true;
plugins/channeltx/udpsource/udpsource.cpp
+25
View File
@@ -421,6 +421,9 @@ void UDPSource::webapiUpdateChannelSettings(
if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) {
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(
@@ -500,6 +503,20 @@ void UDPSource::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& res
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)
@@ -640,12 +657,20 @@ void UDPSource::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("streamIndex") || force) {
swgUDPSourceSettings->setStreamIndex(settings.m_streamIndex);
}
if (settings.m_spectrumGUI && (channelSettingsKeys.contains("spectrunConfig") || force))
{
SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum();
settings.m_spectrumGUI->formatTo(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)
plugins/channeltx/udpsource/udpsourcegui.cpp
+1
View File
@@ -73,6 +73,7 @@ bool UDPSourceGUI::handleMessage(const Message& message)
m_settings = cfg.getSettings();
blockApplySettings(true);
ui->spectrumGUI->updateSettings();
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
displaySettings();
blockApplySettings(false);
return true;