Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
1718 files changed
+126739
-18495
No files matched your search
+7
-6
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "ppm_handler.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
#include <QtCore/QJsonDocument>
|
||||
|
||||
@@ -101,7 +102,7 @@ void PpmHandler::onParticipantChanged(const ParticipantManagement::Participant &
|
||||
|
||||
|
||||
|
||||
if(!participant.equipmentNumber().is_set())
|
||||
if(!participant.equipmentNumber().has_value())
|
||||
{
|
||||
for(auto it = m_participantIdsByEqNo.begin(); it != m_participantIdsByEqNo.end(); ++it)
|
||||
if (it.value() == participant.id())
|
||||
@@ -164,8 +165,8 @@ void PpmHandler::onParticipantChanged(const ParticipantManagement::Participant &
|
||||
QJsonObject data;
|
||||
data[QStringLiteral("header")] = headerJson;
|
||||
|
||||
data[QStringLiteral("status")] = static_cast<int>(m_dtcPpm->youngestStateInformation(dynamicData.stateHistory()).vulnerabilityState().underlying());
|
||||
data[QStringLiteral("forceIdentifier")] = static_cast<int>(party.hlaForceIdentifier().underlying());
|
||||
data[QStringLiteral("status")] = static_cast<int>(m_dtcPpm->youngestStateInformation(dynamicData.stateHistory()).vulnerabilityState());
|
||||
data[QStringLiteral("forceIdentifier")] = static_cast<int>(party.hlaForceIdentifier());
|
||||
|
||||
data[QStringLiteral("ets")] = type.disEntities().empty() ? QStringLiteral("2.0.0.0.0.0.1") : fromDisInt(type.disEntities().front());
|
||||
data[QStringLiteral("geoPosition")] = geoPositionObj;
|
||||
@@ -184,7 +185,7 @@ void PpmHandler::onParticipantPositionChanged(const ParticipantManagement::Parti
|
||||
|
||||
ParticipantManagement::Participant part = m_dtcPpm->participant(position.participantId());
|
||||
|
||||
if (part.externalId() > 0 || !part.equipmentNumber().is_set())
|
||||
if (part.externalId() > 0 || !part.equipmentNumber().has_value())
|
||||
return;
|
||||
|
||||
QJsonObject telegram;
|
||||
@@ -215,7 +216,7 @@ void PpmHandler::onDynamicParticipantDataChanged(const ParticipantManagement::Dy
|
||||
|
||||
ParticipantManagement::Participant part = m_dtcPpm->participant(dynPartData.participantId());
|
||||
|
||||
if (part.externalId() > 0 || !part.equipmentNumber().is_set())
|
||||
if (part.externalId() > 0 || !part.equipmentNumber().has_value())
|
||||
return;
|
||||
|
||||
QJsonObject telegram;
|
||||
@@ -229,7 +230,7 @@ void PpmHandler::onDynamicParticipantDataChanged(const ParticipantManagement::Dy
|
||||
QJsonObject data;
|
||||
data[QStringLiteral("header")] = headerJson;
|
||||
|
||||
data[QStringLiteral("status")] = static_cast<int>(m_dtcPpm->youngestStateInformation(dynPartData.stateHistory()).vulnerabilityState().underlying());
|
||||
data[QStringLiteral("status")] = static_cast<int>(m_dtcPpm->youngestStateInformation(dynPartData.stateHistory()).vulnerabilityState());
|
||||
telegram[QStringLiteral("data")] = data;
|
||||
|
||||
emit participantChanged(telegram);
|
||||
|
||||
Reference in new issue
Block a user