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/TrainingAreaBase/main_handler.cpp
+40 -45
View File
@@ -178,7 +178,7 @@ bool MainHandler::init(int domainId, int exerciseId)
ERROR_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler failed.";
return false;
}
m_ddsHandler->pacemaker()->addPort(m_handlerWebSocket->serverWebSocketPort(), Core::PortType::WebSocketServer, QStringLiteral("{\"id\":\"TAB\"}"));
m_ddsHandler->pacemaker()->addPort(m_handlerWebSocket->serverWebSocketPort(), Core::CorePortType::WebSocketServer, QStringLiteral("{\"id\":\"TAB\"}"));
DEBUG_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler successful.";
@@ -199,15 +199,15 @@ ProjectDataManagement::RadioGroup MainHandler::exerciseRadioGroup() const
const QMap<int, ProjectDataManagement::RadioGroup> radioGrps = m_pdmHandler->radioGroups();
for (auto it = radioGrps.begin(); it != radioGrps.end(); ++it)
if (it.value().base_group())
if (it.value().base_group)
return it.value();
return ProjectDataManagement::RadioGroup();
}
const auto ex = m_exmHandler->exercise(exerciseId());
if (ex.radioGroupId().is_set())
return m_pdmHandler->radioGroup(ex.radioGroupId().get());
if (ex.radioGroupId.is_set())
return m_pdmHandler->radioGroup(ex.radioGroupId.get());
return ProjectDataManagement::RadioGroup();
}
@@ -252,7 +252,7 @@ TetraIcd::ExerciseEnvironmentData MainHandler::exerciseEnvironmentData() const
exData.utmZone = baseCoord.zone;
exData.grid = zone.mid(3, 2).toStdString();
exData.utmBand = zone.mid(2, 1).at(0).toLatin1();
exData.timeZone = m_exerciseData.defaultTimeZone();
exData.timeZone = m_exerciseData.defaultTimeZone;
return exData;
}
@@ -261,11 +261,11 @@ TetraIcd::ExerciseStateData MainHandler::exerciseStateData() const
{
TetraIcd::ExerciseStateData exData;
if (m_exerciseData.id() != exerciseId())
if (m_exerciseData.id != exerciseId())
return exData;
exData.exerciseId = m_exerciseData.id();
exData.exerciseState = static_cast<TetraIcd::ExerciseStateData::ExerciseState>(m_exerciseData.state().underlying());
exData.exerciseId = m_exerciseData.id;
exData.exerciseState = static_cast<TetraIcd::ExerciseStateData::ExerciseState>(m_exerciseData.state);
return exData;
}
@@ -279,7 +279,7 @@ TetraIcd::ExerciseEquipmentAssignmentComplete MainHandler::exerciseEquipmentAssi
for (const auto &it : exercises)
{
const ProjectDataManagement::RadioGroup rg = radioGroups.value(it.second);
if (rg.id() == 0)
if (rg.id == 0)
{
WARNING_LOG(m_logger) << "Got a radio group id " << it.second << " for exercise " << it.first
<< " but could not find valid data for it - ignoring!";
@@ -287,9 +287,9 @@ TetraIcd::ExerciseEquipmentAssignmentComplete MainHandler::exerciseEquipmentAssi
}
TrainingAreaBase::TetraIcd::GroupIssiInformation gissi;
gissi.exerciseId = it.first;
gissi.serverIssi = rg.issi();
gissi.broadcastIssi1 = rg.group_issi1();
gissi.broadcastIssi2 = rg.group_issi2();
gissi.serverIssi = rg.issi;
gissi.broadcastIssi1 = rg.group_issi1;
gissi.broadcastIssi2 = rg.group_issi2;
eeac.groupIssiInformation.push_back(std::move(gissi));
}
return eeac;
@@ -325,7 +325,7 @@ int MainHandler::domainId() const
void MainHandler::onExerciseChanged(const ExerciseManagement::Exercise &data, DataModification modType)
{
if (data.id() != exerciseId())
if (data.id != exerciseId())
return;
m_exerciseData = data;
@@ -359,9 +359,8 @@ void MainHandler::onConnectionState(const QString &name, bool connectionState)
DEBUG_LOG(m_logger) << "Publishing connection states: " << m_ifcConnectionState.size();
TrainingAreaBase::Connections connections;
connections.id(1);
for (auto it = m_ifcConnectionState.cbegin(); it != m_ifcConnectionState.cend(); ++it)
connections.connections().push_back(
connections.id = 1; for (auto it = m_ifcConnectionState.cbegin(); it != m_ifcConnectionState.cend(); ++it)
connections.connections.push_back(
TrainingAreaBase::ConnectionState(it.key().toStdString(), it.value()));
m_ddsHandler->dtsTab()->publish(connections);
@@ -395,9 +394,9 @@ void MainHandler::onDirectMessage(const QByteArray &jsonMessage)
QString isOk;
for (const ProjectDataManagement::CanComponentString &ccs : qAsConst(m_ccsMap))
{
if (ccs.bitMask() == bitValue)
if (ccs.pdm_bitMask == bitValue)
{
name = m_pdmHandler->dtc()->trCanComponentStringName(ccs.id());
name = m_pdmHandler->dtc()->trCanComponentStringName(ccs.id);
break;
}
}
@@ -442,28 +441,24 @@ void MainHandler::onDirectMessage(const QByteArray &jsonMessage)
QString text;
QJsonObject error = ele.toObject();
ParticipantManagement::BiteError bitError;
bitError.canDeviceNumber(error.value(QStringLiteral("canDeviceNumber")).toInt());
bitError.errorNumber(error.value(QStringLiteral("errorNumber")).toInt());
bitError.subdeviceNumber(error.value(QStringLiteral("subdeviceNumber")).toInt());
bitError.uniqueId(error.value(QStringLiteral("uniqueId")).toInt());
if (bitError.subdeviceNumber() != 0)
bitError.canDeviceNumber = error.value(QStringLiteral("canDeviceNumber")).toInt(); bitError.errorNumber = error.value(QStringLiteral("errorNumber")).toInt(); bitError.subdeviceNumber = error.value(QStringLiteral("subdeviceNumber")).toInt(); bitError.uniqueId = error.value(QStringLiteral("uniqueId")).toInt();
if (bitError.subdeviceNumber != 0)
text = (tr("Error: %1 \nComponent: %2 \nSubdev: %3 \nUId: %4 ")
.arg(getErrorString(bitError),
getCanDeviceName(bitError.canDeviceNumber()),
getSubDeviceName(bitError.subdeviceNumber()))
.arg(QString::number( bitError.uniqueId(), 16 ).toUpper()));
getCanDeviceName(bitError.canDeviceNumber),
getSubDeviceName(bitError.subdeviceNumber))
.arg(QString::number( bitError.uniqueId, 16 ).toUpper()));
else if (bitError.canDeviceNumber() != 0)
else if (bitError.canDeviceNumber != 0)
text = (tr("Error: %1 \nComponent: %2")
.arg(getErrorString(bitError),
getCanDeviceName(bitError.canDeviceNumber())));
getCanDeviceName(bitError.canDeviceNumber)));
WebSocketInterface::Messages::BiteDataMessage::BiteError biteErrorLocal;
biteErrorLocal.deviceId = bitError.canDeviceNumber();
biteErrorLocal.subDevice = bitError.subdeviceNumber();
biteErrorLocal.errorNo = bitError.errorNumber();
biteErrorLocal.uniqueId = bitError.uniqueId();
biteErrorLocal.deviceId = bitError.canDeviceNumber;
biteErrorLocal.subDevice = bitError.subdeviceNumber;
biteErrorLocal.errorNo = bitError.errorNumber;
biteErrorLocal.uniqueId = bitError.uniqueId;
WebSocketInterface::Messages::BiteDataMessage::ErrorText errorT;
errorT.lang = QStringLiteral("de_DE");
@@ -483,22 +478,22 @@ void MainHandler::onDirectMessage(const QByteArray &jsonMessage)
QString MainHandler::getErrorString(const ParticipantManagement::BiteError &error) const
{
const bool subDevice = (error.subdeviceNumber() != 0);
const bool subDevice = (error.subdeviceNumber != 0);
for (const ProjectDataManagement::BiteComponentText &bct : m_bctMap)
{
if (((subDevice && bct.subDeviceId() == error.subdeviceNumber()) ||
(bct.canDeviceId() == error.canDeviceNumber())) &&
(bct.errorNumber() == error.errorNumber()))
return m_pdmHandler->dtc()->trBiteComponentTextName(bct.id());
if (((subDevice && bct.subDeviceId == error.subdeviceNumber) ||
(bct.canDeviceId == error.canDeviceNumber)) &&
(bct.errorNumber == error.errorNumber))
return m_pdmHandler->dtc()->trBiteComponentTextName(bct.id);
}
return tr("Unknown (%1)").arg(error.errorNumber());
return tr("Unknown (%1)").arg(error.errorNumber);
}
QString MainHandler::getCanDeviceName(int id) const
{
for (const ProjectDataManagement::CanComponentString &ccs : m_ccsMap)
{
if (ccs.canDeviceId() == id)
return m_pdmHandler->dtc()->trCanComponentStringName(ccs.id());
if (ccs.canDeviceId == id)
return m_pdmHandler->dtc()->trCanComponentStringName(ccs.id);
}
return tr("Unknown (%1)").arg(id);
}
@@ -507,8 +502,8 @@ QString MainHandler::getSubDeviceName(int id) const
{
for (const ProjectDataManagement::CanComponentString &ccs : m_ccsMap)
{
if (ccs.subDeviceId() == id)
return m_pdmHandler->dtc()->trCanComponentStringName(ccs.id());
if (ccs.subDeviceId == id)
return m_pdmHandler->dtc()->trCanComponentStringName(ccs.id);
}
return tr("Unknown (%1)").arg(id);
}
@@ -517,8 +512,8 @@ void MainHandler::onPositionChanged(int equipNo, const ParticipantManagement::Pa
{
WebSocketInterface::Messages::PositionMessage::PositionData positionData;
positionData.equipNo = equipNo;
positionData.pos = pos.pos();
positionData.gpsTime = pos.sampleTime();
positionData.pos = pos.pos;
positionData.gpsTime = pos.sampleTime;
WebSocketInterface::Messages::PositionMessage *msg = new WebSocketInterface::Messages::PositionMessage(positionData, QUuid::createUuid().toString());