lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrates residual Lts sources to generated rtiddsgen API

Browse Source 
Adds NmeaManagement tests, fixes codegen includes and Qt6 SerialPort CMake target.
This commit is contained in:
berrux-dev committed 2026-09-23 12:05:37 +02:00
1 parent 5485a90385
commit 881d44f4dd
512 files changed
+6887 -6426
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/config_cnr.cpp
+38 -37
View File
@@ -3,6 +3,7 @@
#include "config_cnr.h"
#include <utility>
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "helper.h"
#include <AudioVideoManagement/avm_dtc.h>
#include <AudioVideoManagement/avm_translation.h>
@@ -53,22 +54,22 @@ void ConfigCnr::buildConfigCnrData()
return;
}
AudioVideoManagement::FrequencySet frequencySet = m_avmDtc->frequencySet(plan->frequencySetId());
AudioVideoManagement::FrequencySet frequencySet = m_avmDtc->frequencySet(plan->frequencySetId);
QMap<int, AudioVideoManagement::FrequencySetDataWithId> fsdMap;
for (const auto &fsd : std::as_const(frequencySet.data()))
fsdMap.insert(fsd.id(), fsd);
for (const auto &fsd : std::as_const(frequencySet.data))
fsdMap.insert(fsd.id, fsd);
configCnr.setId = plan->frequencySetId();
configCnr.time = QDateTime::fromMSecsSinceEpoch(plan->date()).toString(Qt::ISODate);
configCnr.radioCircuit.reserve(plan->data().size());
configCnr.setId = plan->frequencySetId;
configCnr.time = QDateTime::fromMSecsSinceEpoch(plan->date).toString(Qt::ISODate);
configCnr.radioCircuit.reserve(plan->data.size());
for (const auto &currentData : plan->data())
for (const auto &currentData : plan->data)
{
WebSocketInterface::Messages::ConfigCnrMessage::RadioCircuit radioCircuit;
AudioVideoManagement::CnrConfig cnrConfig = m_avmDtc->cnrConfig(currentData.cnrConfigId());
AudioVideoManagement::CnrChannel cnrChannel = m_avmDtc->cnrChannel(cnrConfig.cnrChannelId());
QVector<AudioVideoManagement::RadioCircuit*> circuits = AudioVideoManagement::fromJson(currentData.properties());
AudioVideoManagement::CnrConfig cnrConfig = m_avmDtc->cnrConfig(currentData.cnrConfigId);
AudioVideoManagement::CnrChannel cnrChannel = m_avmDtc->cnrChannel(cnrConfig.cnrChannelId);
QVector<AudioVideoManagement::RadioCircuit*> circuits = AudioVideoManagement::fromJson(currentData.properties);
int subCircuitCount = 0;
for (AudioVideoManagement::RadioCircuit* circuit : std::as_const(circuits))
@@ -78,9 +79,9 @@ void ConfigCnr::buildConfigCnrData()
WebSocketInterface::Messages::ConfigCnrMessage::SubRadioCircuit subCircuit;
switch (circuit->freqBand.underlying())
switch (circuit->freqBand)
{
case AudioVideoManagement::FrequencyBand_def::VHF:
case AudioVideoManagement::FrequencyBand::VHF:
{
AudioVideoManagement::RadioCircuitVHF *rcVhf = dynamic_cast<AudioVideoManagement::RadioCircuitVHF*>(circuit);
if (!rcVhf)
@@ -88,19 +89,19 @@ void ConfigCnr::buildConfigCnrData()
AudioVideoManagement::FrequencySetDataWithId &fsd = fsdMap[rcVhf->freqSetDataId];
subCircuit.agc = false;
subCircuit.akw = fsd.akwBundle().is_set() ? fsd.akwBundle().get() : 0;
subCircuit.akw = fsd.akwBundle.is_set() ? fsd.akwBundle.get() : 0;
subCircuit.channelSpacing = 0;
subCircuit.clipper = false;
subCircuit.comsec = fsd.comsec().is_set() ? fsd.comsec().get() : 0;
subCircuit.comsec = fsd.comsec.is_set() ? fsd.comsec.get() : 0;
subCircuit.crossbeam = 0;
subCircuit.frequency = fsd.frequency() * 1000;
subCircuit.frequencyBand = fsd.frequencyBand().underlying();
subCircuit.fsb = fsd.fsbBundle().is_set() ? fsd.fsbBundle().get() : 0;
subCircuit.frequency = fsd.frequency * 1000;
subCircuit.frequencyBand = static_cast<int>(fsd.frequencyBand);
subCircuit.fsb = fsd.fsbBundle.is_set() ? fsd.fsbBundle.get() : 0;
subCircuit.modulationType = 0;
subCircuit.orientation = 0;
subCircuit.ptSig = rcVhf->pilotTone;
subCircuit.rcAkw = fsd.akwRadioCircuit().is_set() ? fsd.akwRadioCircuit().get() : 0;
subCircuit.rcMode = rcVhf->operatingMode.underlying();
subCircuit.rcAkw = fsd.akwRadioCircuit.is_set() ? fsd.akwRadioCircuit.get() : 0;
subCircuit.rcMode = static_cast<int>(rcVhf->operatingMode);
subCircuit.rcSubId = toRcIdString(cnrChannel);
subCircuit.rcSubName = rcVhf->name;
subCircuit.rcType = 2;
@@ -109,7 +110,7 @@ void ConfigCnr::buildConfigCnrData()
break;
}
case AudioVideoManagement::FrequencyBand_def::UHF:
case AudioVideoManagement::FrequencyBand::UHF:
{
AudioVideoManagement::RadioCircuitUHF *rcUhf = dynamic_cast<AudioVideoManagement::RadioCircuitUHF*>(circuit);
if (!rcUhf)
@@ -117,14 +118,14 @@ void ConfigCnr::buildConfigCnrData()
subCircuit.agc = rcUhf->agc;
subCircuit.akw = 0;
subCircuit.channelSpacing = rcUhf->channelSpacing.underlying();
subCircuit.channelSpacing = static_cast<int>(rcUhf->channelSpacing);
subCircuit.clipper = rcUhf->clipper;
subCircuit.comsec = 0;
subCircuit.crossbeam = 0;
subCircuit.frequency = rcUhf->frequency;
subCircuit.frequencyBand = 0;
subCircuit.fsb = 0;
subCircuit.modulationType = rcUhf->modulationType.underlying();
subCircuit.modulationType = static_cast<int>(rcUhf->modulationType);
subCircuit.orientation = 0;
subCircuit.ptSig = 0;
subCircuit.rcAkw = 0;
@@ -136,7 +137,7 @@ void ConfigCnr::buildConfigCnrData()
subCircuit.station = stationId(radioStation);
break;
}
case AudioVideoManagement::FrequencyBand_def::HF:
case AudioVideoManagement::FrequencyBand::HF:
{
AudioVideoManagement::RadioCircuitHF *rcHf = dynamic_cast<AudioVideoManagement::RadioCircuitHF*>(circuit);
if (!rcHf)
@@ -144,14 +145,14 @@ void ConfigCnr::buildConfigCnrData()
subCircuit.agc = 0;
subCircuit.akw = 0;
subCircuit.channelSpacing = rcHf->channelSpacing.underlying();
subCircuit.channelSpacing = static_cast<int>(rcHf->channelSpacing);
subCircuit.clipper = 0;
subCircuit.comsec = 0;
subCircuit.crossbeam = 0;
subCircuit.frequency = rcHf->frequency;
subCircuit.frequencyBand = 0;
subCircuit.fsb = 0;
subCircuit.modulationType = rcHf->modulationType.underlying();
subCircuit.modulationType = static_cast<int>(rcHf->modulationType);
subCircuit.orientation = 0;
subCircuit.ptSig = 0;
subCircuit.rcAkw = 0;
@@ -173,8 +174,8 @@ void ConfigCnr::buildConfigCnrData()
qDeleteAll(circuits);
radioCircuit.rcId = toRcIdString(cnrChannel);
radioCircuit.rcName = QString::fromStdString(cnrConfig.radioCircuit());
radioCircuit.ssrc = cnrChannel.ssrc();
radioCircuit.rcName = QString::fromStdString(cnrConfig.radioCircuit);
radioCircuit.ssrc = cnrChannel.ssrc;
configCnr.radioCircuit.append(radioCircuit);
}
@@ -188,10 +189,10 @@ boost::optional<AudioVideoManagement::FrequencyPlanning> ConfigCnr::activePlan()
{
AudioVideoManagement::ActiveFrequencyPlanning activePlanning = m_avmDtc->activeFrequencyPlanning(m_exerciseId);
if (activePlanning.exerciseId() != m_exerciseId)
if (activePlanning.exerciseId != m_exerciseId)
return boost::none;
AudioVideoManagement::FrequencyPlanning frequencyPlanning = m_avmDtc->frequencyPlanning(activePlanning.frequencyPlanningId());
AudioVideoManagement::FrequencyPlanning frequencyPlanning = m_avmDtc->frequencyPlanning(activePlanning.frequencyPlanningId);
return frequencyPlanning;
}
@@ -201,7 +202,7 @@ void ConfigCnr::onActiveFrequencyPlanningChanged(const AudioVideoManagement::Act
DEBUG_LOG(m_logger) << Q_FUNC_INFO << ": " << data;
Q_UNUSED(modType);
if (data.exerciseId() == m_exerciseId)
if (data.exerciseId == m_exerciseId)
m_timer.start();
}
@@ -215,7 +216,7 @@ void ConfigCnr::onFrequencyPlanningChanged(const AudioVideoManagement::Frequency
if (!plan)
return;
if (data.id() == plan->id() || !data.exerciseId().is_set())
if (data.id == plan->id || !data.exerciseId.is_set())
m_timer.start();
}
@@ -225,8 +226,8 @@ void ConfigCnr::onCnrConfigChanged(const AudioVideoManagement::CnrConfig &data,
DEBUG_LOG(m_logger) << Q_FUNC_INFO << ": " << data;
Q_UNUSED(modType);
bool isGlobal = !data.exerciseId().is_set();
if ((isGlobal || data.exerciseId().get() == m_exerciseId) && modType != DataModification::eAdded && isInActiveFrequencyPlanning(data))
bool isGlobal = !data.exerciseId.is_set();
if ((isGlobal || data.exerciseId.get() == m_exerciseId) && modType != DataModification::eAdded && isInActiveFrequencyPlanning(data))
m_timer.start();
}
@@ -234,17 +235,17 @@ void ConfigCnr::onCnrConfigChanged(const AudioVideoManagement::CnrConfig &data,
bool ConfigCnr::isInActiveFrequencyPlanning(const AudioVideoManagement::CnrConfig &data)
{
if(!data.exerciseId().is_set())
if(!data.exerciseId.is_set())
return true;
const auto activePlans = m_avmDtc->activeFrequencyPlannings();
for (const AudioVideoManagement::ActiveFrequencyPlanning &activePlan : activePlans)
{
const auto frequencyPlannings = m_avmDtc->frequencyPlanning(activePlan.frequencyPlanningId());
for(const auto &frequencyPlanningData : frequencyPlannings.data())
const auto frequencyPlannings = m_avmDtc->frequencyPlanning(activePlan.frequencyPlanningId);
for(const auto &frequencyPlanningData : frequencyPlannings.data)
{
if(frequencyPlanningData.cnrConfigId() == data.id())
if(frequencyPlanningData.cnrConfigId == data.id)
return true;
}
}