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

Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set

Browse Source 
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:
berrux-dev committed 2026-10-20 09:36:57 +02:00
1 parent 2b957d1edb
commit 598fc2560e
1718 files changed
+126739 -18495
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_connector.cpp
+27 -26
View File
@@ -3,6 +3,7 @@
#include "ngs_connector.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <utility>
#include "ngs_handler.h"
#include "ppm_handler.h"
@@ -986,10 +987,10 @@ void NgsConnector::onBaseEntityEntityIdentifierChanged(const rpr2::EntityIdentif
GuezHitStruct hs;
hs.originatorType = ProjectDataManagement::StateChangeOriginator::Initialization;
hs.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Initialization;
hs.sampleTime = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch();
hs.targetId = is.entityNumber();
hs.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged;
hs.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_VulnerabilityBitsChanged;
QTimer::singleShot(STATUS_WAIT_INTERVAL, this, [this, hs, obj, simTimeMSecs]() mutable
{
@@ -1048,10 +1049,10 @@ void NgsConnector::onEmbeddedSystemEntityIdentifierChanged(const rpr2::EntityIde
GuezHitStruct hs;
hs.originatorType = ProjectDataManagement::StateChangeOriginator::Initialization;
hs.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Initialization;
hs.sampleTime = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch();
hs.targetId = is.entityNumber();
hs.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged;
hs.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_VulnerabilityBitsChanged;
QTimer::singleShot(STATUS_WAIT_INTERVAL, this, [this, hs, obj, simTimeMSecs]() mutable
{
@@ -1149,11 +1150,11 @@ bool NgsConnector::onDamageStateChanged(const rpr2::EntityIdentifierStruct &eis,
GuezHitStruct hitStruct;
hitStruct.originatorChargeTypeEtsString = TypeStruct::fromDisInt(0).toString();
hitStruct.originatorId = 0;
hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::Unknown;
hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Unknown;
hitStruct.position = m_observerPositions[is.entityNumber()].toGeoPosition();
hitStruct.sampleTime = simTimeMSecs;
hitStruct.targetId = is.entityNumber();
hitStruct.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged;
hitStruct.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_VulnerabilityBitsChanged;
hitStruct.vulnerabilityKind = 0;
@@ -1317,7 +1318,7 @@ void NgsConnector::onNewEngagementReply(const rpr2::IObserverEngagementReplyIntI
if (sender > 0)
{
state.originatorId(sender);
state.originatorType(ProjectDataManagement::StateChangeOriginator::Participant);
state.originatorType(ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant);
}
else
{
@@ -1326,35 +1327,35 @@ void NgsConnector::onNewEngagementReply(const rpr2::IObserverEngagementReplyIntI
if (source == QLatin1String("excon"))
{
state.originatorId(0);
state.originatorType(ProjectDataManagement::StateChangeOriginator::ExerciseControl);
state.originatorType(ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl);
}
else if (source == QLatin1String("cis"))
{
state.originatorId(1);
state.originatorType(ProjectDataManagement::StateChangeOriginator::ExerciseControl);
state.originatorType(ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl);
}
else if (source == QLatin1String("greenkey"))
{
state.originatorId(0);
state.originatorType(ProjectDataManagement::StateChangeOriginator::ObserverController);
state.originatorType(ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController);
}
else if (source == QLatin1String("optical"))
{
state.originatorId(0);
state.originatorType(ProjectDataManagement::StateChangeOriginator::ObserverController);
state.originatorType(ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController);
}
else
{
state.originatorId(2);
state.originatorType(ProjectDataManagement::StateChangeOriginator::ExerciseControl);
state.originatorType(ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl);
}
}
state.sampleTime(simTimeToMSec(interaction.getReceiveTimeStamp()));
DamageModel dm(IdentifierStruct(0), interaction.getResultingDamageState());
const auto ds = dm.vulnerabilityState(QDateTime::currentMSecsSinceEpoch());
state.vulnerabilityBits(1 << ds.underlying());
state.vulnerabilityBits(1 << ds);
state.vulnerabilityKindId();
state.vulnerabilityState(ds);
@@ -1707,17 +1708,17 @@ bool NgsConnector::setParticipantHit(int eqNo, const ParticipantManagement::Stat
switch (originatorType.underlying()) {
case ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation:
switch (originatorType) {
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation:
{
break;
}
case ProjectDataManagement::StateChangeOriginator::ExerciseControl:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl:
break;
case ProjectDataManagement::StateChangeOriginator::ObserverController:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController:
break;
case ProjectDataManagement::StateChangeOriginator::Participant:
if (originatorType == ProjectDataManagement::StateChangeOriginator::Participant)
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant:
if (originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant)
{
if (m_playerMap.contains(originatorEqNo))
is = IdentifierStruct(originatorEqNo);
@@ -1731,14 +1732,14 @@ bool NgsConnector::setParticipantHit(int eqNo, const ParticipantManagement::Stat
break;
}
Q_FALLTHROUGH();
case ProjectDataManagement::StateChangeOriginator::Initialization:
case ProjectDataManagement::StateChangeOriginator::FunctionalArea:
case ProjectDataManagement::StateChangeOriginator::MaintainanceDevice:
case ProjectDataManagement::StateChangeOriginator::Unknown:
case ProjectDataManagement::StateChangeOriginator::WoundTreatmentDevice:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Initialization:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_FunctionalArea:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MaintainanceDevice:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Unknown:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_WoundTreatmentDevice:
case ProjectDataManagement::StateChangeOriginator::ImprovisedExplosiveDevice:
case ProjectDataManagement::StateChangeOriginator::DusMine:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ImprovisedExplosiveDevice:
case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_DusMine:
break;
}