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/Services/CentralEffectSimulation/Plugins/Jamming/handler_jamming.cpp
+21 -21
View File
@@ -24,7 +24,7 @@ namespace core
{
inline uint qHash(ProjectDataManagement::PdmEventType et)
{
return ::qHash(et.underlying());
return ::qHash(et);
}
}
}
@@ -79,19 +79,19 @@ bool HandlerJamming::init()
void HandlerJamming::onParticipantGearEventChanged(const ParticipantManagement::ParticipantGearEvent &data, DataModification modType)
{
ERROR_LOG(m_logger) << "onParticipantGearEventChanged << modType=" << modType
<< " originatorId=" << data.participantId()
<< " chargeTypeId=" << data.charge().chargeTypeId()
<< " gearTypeId=" << data.charge().gearTypeId()
<< " isJamming=" << m_ddsHandler->isJamming({data.charge().chargeTypeId(),0,0});
<< " originatorId=" << data.participantId
<< " chargeTypeId=" << data.charge.chargeTypeId
<< " gearTypeId=" << data.charge.gearTypeId
<< " isJamming=" << m_ddsHandler->isJamming({data.charge.chargeTypeId,0,0});
// Check, if Munition isJamming
// NOTE: igniterType/IgniterFunciton = 0 as long as ParticipantGearEvent does not contain values
if (!m_ddsHandler->isJamming({data.charge().chargeTypeId(),0,0}))
if (!m_ddsHandler->isJamming({data.charge.chargeTypeId,0,0}))
return;
QVector<int> uasIds = m_ddsHandler->dtcPpm()->getUasIds();
QVector<int> jammedUasIds;
int jammedUasId = 0;
double radius = m_ddsHandler->dtcPdm()->getMaxRange(data.charge().chargeTypeId(), data.charge().gearTypeId());
double radius = m_ddsHandler->dtcPdm()->getMaxRange(data.charge.chargeTypeId, data.charge.gearTypeId);
// int radius = 15;
DEBUG_LOG(m_logger) << "Radius=" << radius;
@@ -105,19 +105,19 @@ void HandlerJamming::onParticipantGearEventChanged(const ParticipantManagement::
continue;
}
if (LtsUtils::isPositionTimeOutdated(QDateTime::currentMSecsSinceEpoch(), cesParticipantData.sampleTime()))
if (LtsUtils::isPositionTimeOutdated(QDateTime::currentMSecsSinceEpoch(), cesParticipantData.sampleTime))
{
DEBUG_LOG(m_logger) << "continue positionTime outdated participantId=" << uasId;
continue;
}
long distance = m_handlerParticipant->getDistance(data.participantId(), uasId);
long distance = m_handlerParticipant->getDistance(data.participantId, uasId);
DEBUG_LOG(m_logger) << "distance = " << distance;
if ( distance < radius)
{
DEBUG_LOG(m_logger) << " Send Jamming to TAB and destroy uasId";
//sendCesHitRequest(data.charge().chargeTypeId(), data.participantId(),cesParticipantData);
if (cesParticipantData.vulnerabilityState != ProjectDataManagement::VulnerabilityState::CatastrophicKill)
if (cesParticipantData.vulnerabilityState != ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
jammedUasIds.append(uasId);
}
else
@@ -138,7 +138,7 @@ void HandlerJamming::onParticipantGearEventChanged(const ParticipantManagement::
}
CentralEffectSimulation::HandlerParticipant::CesParticipantData cesParticipantData = m_handlerParticipant->position(jammedUasId);
sendCesHitRequest(data.charge().chargeTypeId(), data.participantId(),cesParticipantData);
sendCesHitRequest(data.charge.chargeTypeId, data.participantId,cesParticipantData);
}
@@ -184,32 +184,32 @@ void HandlerJamming::sendCesHitRequest(const int chargeTypeId,
DEBUG_LOG(m_logger) << "sendCesHitRequest Settings::calculateCentralAes="
<< " insideWlsArea=" << std::boolalpha << participantData.insideWlsArea()
<< " participantId=" << participantData.participantId();
<< " participantId=" << participantData.participantId;
const int equipNo = m_ddsHandler->participantId2EquipNo(participantData.participantId());
const int equipNo = m_ddsHandler->participantId2EquipNo(participantData.participantId);
const int originatorEquimentNumber = m_ddsHandler->participantId2EquipNo(originatorId);
const int originatorPartyId = m_handlerParticipant->getParticipantPosition(originatorId).partyId();
DEBUG_LOG(m_logger) << " ftc sendCESHit to Participant participantId = " << participantData.participantId()
const int originatorPartyId = m_handlerParticipant->getParticipantPosition(originatorId).partyId;
DEBUG_LOG(m_logger) << " ftc sendCESHit to Participant participantId = " << participantData.participantId
<< " equipNo = " << equipNo
<< " chargeTypeId =" << chargeTypeId;
if (participantData.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
if (participantData.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
{
DEBUG_LOG(m_logger) << "participantPosition.participantId == 0 CatastrophicKill)";
return;
}
const TrainingAreaBase::TabPosition pos(participantData.pos(),
const TrainingAreaBase::TabPosition pos(participantData.pos,
Core::PositionReportingSource::Gps, // irrelevant
participantData.buildingId(),
participantData.roomId());
participantData.buildingId,
participantData.roomId);
const int aesId = 0; // not used
const int mineId = 0; // not used
TrainingAreaBase::SendCesHitRequest requestTab(
equipNo, // equipmentNumber
participantData.participantId(), // participantId
participantData.participantId, // participantId
chargeTypeId, // chargeTypeId
aesId, // aesId
originatorEquimentNumber, // originatorEquipmentNumber
@@ -220,7 +220,7 @@ void HandlerJamming::sendCesHitRequest(const int chargeTypeId,
originatorPartyId, // originPartyId
mineId
);
DEBUG_LOG(m_logger) << " participantId=" << participantData.participantId()
DEBUG_LOG(m_logger) << " participantId=" << participantData.participantId
<< " chargeTypeId=" << chargeTypeId;
m_sendCesHitRequestQueue.enqueue(requestTab);