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/TargetManagement/shootback_controller.cpp
+31 -31
View File
@@ -245,7 +245,7 @@ void ShootbackController::onParticipantPositionChanged(const ParticipantManageme
return;
}
const int participantId = posData.participantId();
const int participantId = posData.participantId;
bool bIsTarget = false;
if (isTarget(participantId, bIsTarget) && bIsTarget)
@@ -258,7 +258,7 @@ void ShootbackController::onParticipantPositionChanged(const ParticipantManageme
ERROR_LOG(m_logger) << LOGFUNCTION << " ObjectShootbackTarget not found for participantId=" << participantId;
return;
}
osbTarget->updateVolatileData(posData.pos());
osbTarget->updateVolatileData(posData.pos);
}
INFO_LOG(m_logger) << LOGFUNCTION << " participantId=" << participantId << ", isTarget=" << bIsTarget;
@@ -310,9 +310,9 @@ bool ShootbackController::participantPositionTopicIsValid(const ParticipantManag
// (!LtsUtils::isPositionTimeOutdated(ddsHandler->currentPartitionTime(), sampleTime)) &&
// participantTypeId // maybe check: typeId -> typeClassId...
return ((posData.participantId() > 0) &&
(posData.partyId() >= 2) && // 0->POOLS ; 1 -> O/C Service ; 2 RED...
(!LtsUtils::isPositionTimeOutdated(QDateTime::currentDateTimeUtc().toMSecsSinceEpoch(), posData.sampleTime()))
return ((posData.participantId > 0) &&
(posData.partyId >= 2) && // 0->POOLS ; 1 -> O/C Service ; 2 RED...
(!LtsUtils::isPositionTimeOutdated(QDateTime::currentDateTimeUtc().toMSecsSinceEpoch(), posData.sampleTime))
);
}
@@ -328,20 +328,20 @@ bool ShootbackController::isTarget(qint32 participantId, bool &bIsTarget) const
}
const ParticipantManagement::Participant &participant = dtcPpm->participant(participantId);
if (participant.id() != participantId)
if (participant.id != participantId)
return false;
const int typeId = participant.typeId();
const int typeId = participant.typeId;
const ParticipantManagement::Type &type = dtcPpm->type(typeId);
if (type.id() != typeId)
if (type.id != typeId)
return false;
const int equipmentTypeId = type.equipmentTypeId();
const int equipmentTypeId = type.equipmentTypeId;
const ParticipantManagement::EquipmentType &eqType = dtcPpm->equipmentType(equipmentTypeId);
if (eqType.id() != equipmentTypeId)
if (eqType.id != equipmentTypeId)
return false;
switch (eqType.wmsTypeClass().underlying())
switch (eqType.wmsTypeClass)
{
case ParticipantManagement::WmsTypeClass::None:
case ParticipantManagement::WmsTypeClass::Building:
@@ -366,7 +366,7 @@ void ShootbackController::updateInternal_participantPerArea(const ObjectShootbac
const ParticipantManagement::ParticipantPosition &posData)
{
const int areaId = area.getId();
const int participantId = posData.participantId();
const int participantId = posData.participantId;
bool contains = areaContainsPosition(area, posData);
@@ -378,7 +378,7 @@ void ShootbackController::updateInternal_participantPerArea(const ObjectShootbac
DEBUG_LOG(m_logger) << LOGFUNCTION << " "
<< " shootbackAreaId=" << areaId
<< " shootbackAreaName=" << area.getName()
<< " area.position=" << area.getData().position()
<< " area.position=" << area.getData().position
<< " participantId=" << participantId
<< " ParticipantPosition=" << posData
<< " contains=" << contains
@@ -406,15 +406,15 @@ bool ShootbackController::areaContainsPosition(const TargetManagement::ObjectSho
{
const ShootbackArea &sbArea = area.getData();
const LtsCoordTrans::UtmCoordinate &utmCoordCenter =
LtsCoordTrans::UtmCoordinate::fromGeographic(sbArea.position().lon(), sbArea.position().lat());
LtsCoordTrans::UtmCoordinate::fromGeographic(sbArea.position.lon, sbArea.position.lat);
double xMin = utmCoordCenter.x - (sbArea.width() / 2.0);
double xMax = utmCoordCenter.x + (sbArea.width() / 2.0);
double yMin = utmCoordCenter.y - (sbArea.height() / 2.0);
double yMax = utmCoordCenter.y + (sbArea.height() / 2.0);
double xMin = utmCoordCenter.x - (sbArea.width / 2.0);
double xMax = utmCoordCenter.x + (sbArea.width / 2.0);
double yMin = utmCoordCenter.y - (sbArea.height / 2.0);
double yMax = utmCoordCenter.y + (sbArea.height / 2.0);
const LtsCoordTrans::UtmCoordinate &utmCoordParticipant =
LtsCoordTrans::UtmCoordinate::fromGeographic(posData.pos().lon(), posData.pos().lat());
LtsCoordTrans::UtmCoordinate::fromGeographic(posData.pos.lon, posData.pos.lat);
if (
(xMin <= utmCoordParticipant.x) && (utmCoordParticipant.x <= xMax) &&
@@ -464,7 +464,7 @@ QSet<int> ShootbackController::assignmentsWithTargetParticipantId(qint32 targetP
if (!targetAreaAssignment)
continue;
if (targetAreaAssignment->getData().targetParticipantId() == targetParticipantId)
if (targetAreaAssignment->getData().targetParticipantId == targetParticipantId)
ret += targetAreaAssignment->getId();
} // for
@@ -513,7 +513,7 @@ void ShootbackController::updateInternalLos(const QSet<int> &changingAssignmentI
const TargetAreaAssignment &assignmentData = assignment->getData();
// 2. check changingAreaIds
const int areaId = assignmentData.areaId();
const int areaId = assignmentData.areaId;
if (!idIsRelevantHelper(changingAreaIds, areaId))
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " continue, curAssignment " << assignment->getId();
@@ -521,7 +521,7 @@ void ShootbackController::updateInternalLos(const QSet<int> &changingAssignmentI
}
// 3. check changingTartgetIds
const int targetParticpantId = assignmentData.targetParticipantId();
const int targetParticpantId = assignmentData.targetParticipantId;
const int targetDataId = m_handlerShootbackTarget->targetDataIdForTargetParticipantId(targetParticpantId);
if (!idIsRelevantHelper(changingTartgetIds, targetDataId))
{
@@ -572,8 +572,8 @@ bool ShootbackController::updateInternalLosSingleAssignment(ObjectTargetAreaAssi
const TargetAreaAssignment &assignmentData = assignment->getData();
const int areaId = assignmentData.areaId();
const int targetParticipantId = assignmentData.targetParticipantId();
const int areaId = assignmentData.areaId;
const int targetParticipantId = assignmentData.targetParticipantId;
DEBUG_LOG(m_logger) << LOGFUNCTION << " START, assignmentId=" << assignmentId
<< ", areaId = " << areaId
@@ -612,18 +612,18 @@ bool ShootbackController::updateInternalLosSingleAssignment(ObjectTargetAreaAssi
// 1 targetGeoPos
ShootbackTarget sbTarget = target->getData();
const Core::GeoPosition &sbTargetGeoPos = sbTarget.position();
const Core::GeoPosition &sbTargetGeoPos = sbTarget.position;
// 2 participantId -> geoPos:
const ParticipantManagement::ParticipantPosition &participantPos =
m_mainHandler->dds()->dtcPpm()->participantPosition(participantId);
if (participantPos.participantId() != participantId)
if (participantPos.participantId != participantId)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " no position for participantId=" << participantId;
return false;
}
const Core::GeoPosition &participantGeoPos = participantPos.pos();
const Core::GeoPosition &participantGeoPos = participantPos.pos;
bool visi = lineOfSight(sbTargetGeoPos, participantGeoPos);
DEBUG_LOG(m_logger) << LOGFUNCTION << " current targetId = " << target->getId() << " visi = " << visi;
@@ -687,11 +687,11 @@ void ShootbackController::syncExternal()
const ShootbackTarget &sbTarget = target->getData();
if (visiPartPerTargetStd != sbTarget.visibleParticipants())
if (visiPartPerTargetStd != sbTarget.visibleParticipants)
{
// data has changed
INFO_LOG(m_logger) << LOGFUNCTION << " targetId differ -> updateObject..";
INFO_LOG(m_logger) << LOGFUNCTION << " visiOld =" << toString(sbTarget.visibleParticipants());
INFO_LOG(m_logger) << LOGFUNCTION << " visiOld =" << toString(sbTarget.visibleParticipants);
INFO_LOG(m_logger) << LOGFUNCTION << " visiNew =" << toString(visiPartPerTargetStd);
target->updateVolatileData(visiPartPerTargetStd); // update and publish
}
@@ -713,8 +713,8 @@ bool ShootbackController::lineOfSight(const Core::GeoPosition &observerPos, cons
return false;
}
SituationMap::ObserverTargetData observerTarget(Point3D(observerPos.lon(), observerPos.lat(), observerPos.z() + 2.0), // 2.0m als Augenhöhe
Point3D(targetPos.lon(), targetPos.lat(), observerPos.z() + 2.0) // 2.0m als Augenhöhe
SituationMap::ObserverTargetData observerTarget(Point3D(observerPos.lon, observerPos.lat, observerPos.z + 2.0), // 2.0m als Augenhöhe
Point3D(targetPos.lon, targetPos.lat, observerPos.z + 2.0) // 2.0m als Augenhöhe
);
bool success = m_losCalculation->calculate(observerTarget);