Complete Qt6/rtiddsgen migration of residual Lts service sources

This commit is contained in:
berrux-dev committed 2026-09-25 20:23:37 +02:00
1 parent e748e82c84
commit a410019553
86 files changed
+1235 -1128

No files matched your search

@@ -5,6 +5,8 @@
#include <QtCore/QPointF>
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "main_handler.h"
namespace TrainingAreaBaseOC
@@ -21,21 +23,21 @@ void SendToDds::rxData(const OcTelegrams::Display &inData)
if (0 == inData.multiplexer)
{
TrainingAreaBaseOC::ShortMessage outData;
outData.id(m_idToSend++);
outData.id = m_idToSend++;
outData.textType(static_cast<long>(inData.textType));
outData.indexVbg(inData.indexVbg);
outData.indexVba(inData.indexVba);
outData.timeStamp(QDateTime::currentDateTimeUtc().toMSecsSinceEpoch());
outData.textType = static_cast<long>(inData.textType);
outData.indexVbg = inData.indexVbg;
outData.indexVba = inData.indexVba;
outData.timeStamp = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch();
m_dtsTaboc->publish(outData);
}
else
{
TrainingAreaBaseOC::FreeText outData;
outData.id(m_idToSend++);
outData.text(inData.text.data());
outData.timeStamp(QDateTime::currentDateTimeUtc().toMSecsSinceEpoch());
outData.id = m_idToSend++;
outData.text = inData.text.data();
outData.timeStamp = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch();
m_dtsTaboc->publish(outData);
}
@@ -44,10 +46,10 @@ void SendToDds::rxData(const OcTelegrams::Display &inData)
void SendToDds::rxData(const OcTelegrams::TimeSync &inData)
{
TrainingAreaBaseOC::TimeSync outData;
outData.id(1);
outData.id = 1;
outData.gpsTime(inData.gpsTimeMsec);
outData.timezone(inData.timezone);
outData.gpsTime = inData.gpsTimeMsec;
outData.timezone = inData.timezone;
m_dtsTaboc->publish(outData);
}
@@ -61,14 +63,14 @@ void SendToDds::rxData(const OcTelegrams::SpecificsExercise &inData)
QString::number(inData.easting).rightJustified(7, QLatin1Char('0')));
TrainingAreaBaseOC::SpecificsExercise outData;
outData.id(1);
outData.id = 1;
outData.exerciseId(inData.exerciseId);
outData.zone(inData.zone);
outData.band(inData.band);
outData.square(inData.square.data());
outData.easting(inData.easting);
outData.northing(inData.northing);
outData.exerciseId = inData.exerciseId;
outData.zone = inData.zone;
outData.band = inData.band;
outData.square = inData.square.data();
outData.easting = inData.easting;
outData.northing = inData.northing;
m_dtsTaboc->publish(outData);
}
@@ -76,14 +78,14 @@ void SendToDds::rxData(const OcTelegrams::SpecificsExercise &inData)
void SendToDds::rxData(const OcTelegrams::SpecificsEquipment &inData)
{
TrainingAreaBaseOC::SpecificsEquipment outData;
outData.id(1);
outData.id = 1;
outData.equipmentNumber(inData.equipmentNumber);
outData.playerType(inData.playerType);
outData.language(static_cast<ProjectDataManagement::LanguageConfiguration>(inData.language));
outData.pyrotechnics(inData.pyrotechnics);
outData.voiceOutput(inData.voiceOutput);
outData.exerciseBreak(inData.exerciseBreak);
outData.equipmentNumber = inData.equipmentNumber;
outData.playerType = inData.playerType;
outData.language = static_cast<ProjectDataManagement::LanguageConfiguration>(inData.language);
outData.pyrotechnics = inData.pyrotechnics;
outData.voiceOutput = inData.voiceOutput;
outData.exerciseBreak = inData.exerciseBreak;
m_dtsTaboc->publish(outData);
}
@@ -91,16 +93,16 @@ void SendToDds::rxData(const OcTelegrams::SpecificsEquipment &inData)
void SendToDds::rxData(const OcTelegrams::TechnicalStateSfm &inData)
{
TrainingAreaBaseOC::TechnicalStateSfm outData;
outData.id(1);
outData.id = 1;
outData.sfmConnected(inData.sfmConnected);
outData.radioAvailable(inData.radioAvailable);
outData.licensed(inData.licensed);
outData.timeStamp(inData.gpsTimeMsec);
outData.batteryTest(inData.batteryTest);
outData.manipulationEquipment(inData.manipulationEquipment);
outData.manipulationSfm(inData.manipulationSfm);
outData.errorCode(inData.errorCode);
outData.sfmConnected = inData.sfmConnected;
outData.radioAvailable = inData.radioAvailable;
outData.licensed = inData.licensed;
outData.timeStamp = inData.gpsTimeMsec;
outData.batteryTest = inData.batteryTest;
outData.manipulationEquipment = inData.manipulationEquipment;
outData.manipulationSfm = inData.manipulationSfm;
outData.errorCode = inData.errorCode;
m_dtsTaboc->publish(outData);
}
@@ -108,13 +110,13 @@ void SendToDds::rxData(const OcTelegrams::TechnicalStateSfm &inData)
void SendToDds::rxData(const OcTelegrams::EnterLeaveAes &inData)
{
TrainingAreaBaseOC::EnterLeaveAes outData;
outData.id(1);
outData.id = 1;
outData.aesId(inData.aesId);
outData.aesEntered(inData.aesEntered);
outData.abcArea(inData.nbcArea);
outData.chargeTypeId(inData.chargeTasCode);
outData.cAreaType(inData.cAreaType);
outData.aesId = inData.aesId;
outData.aesEntered = inData.aesEntered;
outData.abcArea = inData.nbcArea;
outData.chargeTypeId = inData.chargeTasCode;
outData.cAreaType = inData.cAreaType;
m_dtsTaboc->publish(outData);
}
@@ -122,17 +124,17 @@ void SendToDds::rxData(const OcTelegrams::EnterLeaveAes &inData)
void SendToDds::rxData(const OcTelegrams::OwnPosition &inData)
{
TrainingAreaBaseOC::OwnPosition outData;
outData.id(1);
outData.id = 1;
outData.valid(inData.valid);
outData.timeStamp(inData.gpsTimeMsec);
outData.valid = inData.valid;
outData.timeStamp = inData.gpsTimeMsec;
if (inData.valid)
{
const QPointF point(m_utmCoord.geographic(inData.easting, inData.northing));
outData.position(Core::GeoPosition(point.x(), point.y(), 0));
outData.position = Core::GeoPosition(point.x(), point.y(), 0);
}
else
outData.position(Core::GeoPosition(nan(""), nan(""), 0));
outData.position = Core::GeoPosition(nan(""), nan(""), 0);
m_dtsTaboc->publish(outData);
}
@@ -144,8 +146,8 @@ void SendToDds::rxData(const TrainingAreaBase::TetraIcd::OpaquePayloadDataBase &
case TrainingAreaBase::TetraIcd::OpaquePayloadDataBase::Type::OC:
{
TrainingAreaBase::OcData outData;
outData.equipmentNumber(1);
outData.payload(inData.payload);
outData.equipmentNumber = 1;
outData.payload = inData.payload;
m_dtsTab->publish(outData);
break;
@@ -153,8 +155,8 @@ void SendToDds::rxData(const TrainingAreaBase::TetraIcd::OpaquePayloadDataBase &
case TrainingAreaBase::TetraIcd::OpaquePayloadDataBase::Type::FireSmokeMarker:
{
TrainingAreaBase::FireSmokeMarkerData outData;
outData.equipmentNumber(1);
outData.payload(inData.payload);
outData.equipmentNumber = 1;
outData.payload = inData.payload;
m_dtsTab->publish(outData);
break;