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

Complete Qt6/rtiddsgen migration of residual Lts service sources

Browse Source
This commit is contained in:
berrux-dev committed 2026-09-25 20:23:37 +02:00
1 parent e748e82c84
commit a410019553
86 files changed
+1235 -1128
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/handler_participant.cpp
+83 -83
View File
@@ -113,12 +113,12 @@ void HandlerParticipant::onParticipantPositionChanged(const ParticipantManagemen
DEBUG_LOG(m_logger) << "onParticipantPositionChanged: " << data;
if (modType == DataModification::eRemoved)
{
DEBUG_LOG(m_logger) << "m_participantsOutsideMap.remove participantId: " << data.participantId();
//m_participantsOutsideMap.remove(data.participantId());
DEBUG_LOG(m_logger) << "m_participantsOutsideMap.remove participantId: " << data.participantId;
//m_participantsOutsideMap.remove(data.participantId);
}
else
{
ParticipantManagement::TypeClass typeClass = typeClassFromTypeId(data.participantTypeId());
ParticipantManagement::TypeClass typeClass = typeClassFromTypeId(data.participantTypeId);
if (typeClass == ParticipantManagement::TypeClass::SupportEntity
|| typeClass == ParticipantManagement::TypeClass::SupportUnit
|| typeClass == ParticipantManagement::TypeClass::Unit
@@ -128,15 +128,15 @@ void HandlerParticipant::onParticipantPositionChanged(const ParticipantManagemen
// [GUEZE-3102] Aufgesessene Teilnehmer bekommen den Schaden vom Fahrzeug, auf dem sie aufgesessen sind.
if (data.mountedOn.is_set())
return;
int floorId = m_handlerBuildingData->getFloorIdFromRoomId(data.roomId());
int floorId = m_handlerBuildingData->getFloorIdFromRoomId(data.roomId);
int lastFloorId;
CesParticipantData partPos(data);
// update LtsPosition/LtsCoordinate: (created as new master, with Z, geo and utm)
LtsCoordTrans::LtsCoordinate &ltsCoordRef = partPos.ltsCoordinate();
ltsCoordRef = LtsCoordTrans::LtsCoordinate(data.pos());
ltsCoordRef = LtsCoordTrans::LtsCoordinate(data.pos);
// ltsPosRef.setGeoPosition(data.pos(), 0.0); // hier wird 0.0 zu NaN umgewandelt ...
// ltsPosRef.setGeoPosition(data.pos, 0.0); // hier wird 0.0 zu NaN umgewandelt ...
// ltsPosRef.setZValueAccordingElevation(0.0); // hier wird implizit der LtsElevationManager genutzt
// DEBUG_LOG(m_logger) << "- ltsPosRef: " << ltsPosRef;
@@ -145,16 +145,16 @@ void HandlerParticipant::onParticipantPositionChanged(const ParticipantManagemen
bool lastGeoPositionValid = false;
auto it = m_positionsMap.find(partPos.participantId());
auto it = m_positionsMap.find(partPos.participantId);
if (it != m_positionsMap.end())
{
const CesParticipantData &partPosOld = *it;
lastGeoPositionValid = partPosOld.lastPositionValid;
lastFloorId = m_handlerBuildingData->getFloorIdFromRoomId(partPosOld.roomId());
lastFloorId = m_handlerBuildingData->getFloorIdFromRoomId(partPosOld.roomId);
partPos.vulnerabilityState = partPosOld.vulnerabilityState;
partPos.lastGeoPosition = partPosOld.pos(); // save previous position
partPos.lastGeoPosition = partPosOld.pos; // save previous position
partPos.lastPositionValid = true;
if (floorId < 0 )
partPos.insideBuildingValue = false;
@@ -168,21 +168,21 @@ void HandlerParticipant::onParticipantPositionChanged(const ParticipantManagemen
INFO_LOG(m_logger) << "m_positionsMap.insert="
<< partPos;
m_positionsMap.insert(data.participantId(), partPos);
m_positionsMap.insert(data.participantId, partPos);
}
//
if (lastGeoPositionValid)
{
if (floorId < 0)
{
partPos.buildingId(0);
partPos.roomId(0);
partPos.buildingId = 0;
partPos.roomId = 0;
DEBUG_LOG(m_logger) << "emit and insert newOutdoorPosition:"
<< partPos;
m_positionsMap.insert(data.participantId(), partPos);
m_positionsMap.insert(data.participantId, partPos);
emit newOutdoorPosition(partPos);
if (lastFloorId > 0)
emit participantLeavesBuilding(partPos.participantId());
emit participantLeavesBuilding(partPos.participantId);
}
else
{
@@ -195,18 +195,18 @@ void HandlerParticipant::onParticipantPositionChanged(const ParticipantManagemen
while (i.hasNext())
{
i.next();
DEBUG_LOG(m_logger) << i.key() << ": " << i.value().participantId();
DEBUG_LOG(m_logger) << i.key() << ": " << i.value().participantId;
}
if (m_positionsCheatingMap.contains(data.participantId()))
if (m_positionsCheatingMap.contains(data.participantId))
{
DEBUG_LOG(m_logger) << "checkCheatingPosition participantId=" << data.participantId();
checkCheatingPosition(data.participantId());
DEBUG_LOG(m_logger) << "checkCheatingPosition participantId=" << data.participantId;
checkCheatingPosition(data.participantId);
}
INFO_LOG(m_logger) << "onParticipantPositionChanged()"
<< " participantId; " << data.participantId()
<< " participantTypeId: " << data.participantTypeId()
<< " partyId: " << data.partyId()
<< " participantId; " << data.participantId
<< " participantTypeId: " << data.participantTypeId
<< " partyId: " << data.partyId
<< " vulnerabilityState: " << partPos.vulnerabilityState
<< " insideBuilding: " << partPos.insideBuilding();
INFO_LOG(m_logger) << partPos;
@@ -222,24 +222,24 @@ void HandlerParticipant::onDynamicParticipantDataChanged(const ParticipantManage
if (modType == DataModification::eRemoved)
return;
CesParticipantData &participantPosition = m_positionsMap[data.participantId()]; // reference!
CesParticipantData &participantPosition = m_positionsMap[data.participantId]; // reference!
// save vulnerabilityState in participantHandler
ProjectDataManagement::VulnerabilityState newVulnerabilityState = ProjectDataManagement::VulnerabilityState::CombatReady;
if (data.stateHistory().size() > 0)
ProjectDataManagement::VulnerabilityState newVulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady;
if (data.stateHistory.size() > 0)
{
const ParticipantManagement::StateInformation &vul = ParticipantManagement::youngestStateInformation(data.stateHistory());
newVulnerabilityState = vul.vulnerabilityState();
DEBUG_LOG(m_logger) << "newVulnerabilityState" << vul.vulnerabilityState();
const ParticipantManagement::StateInformation &vul = ParticipantManagement::youngestStateInformation(data.stateHistory);
newVulnerabilityState = vul.vulnerabilityState;
DEBUG_LOG(m_logger) << "newVulnerabilityState" << vul.vulnerabilityState;
if (newVulnerabilityState == ProjectDataManagement::VulnerabilityState::CombatReady)
if (newVulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady)
{
emit participantDecontaminated(participantPosition.participantId());
DEBUG_LOG(m_logger) << "emit participantDecontaminated id=" << participantPosition.participantId();
emit participantDecontaminated(participantPosition.participantId);
DEBUG_LOG(m_logger) << "emit participantDecontaminated id=" << participantPosition.participantId;
}
}
if (participantPosition.vulnerabilityState != newVulnerabilityState)
{
checkCheating(data.participantId(), participantPosition, newVulnerabilityState);
checkCheating(data.participantId, participantPosition, newVulnerabilityState);
participantPosition.vulnerabilityState = newVulnerabilityState;
emit newParticipantState(participantPosition);
}
@@ -249,31 +249,31 @@ void HandlerParticipant::onParticipantChanged(const ParticipantManagement::Parti
{
// Remove Participant:
if (modType == DataModification::eRemoved || data.isDeleted())
if (modType == DataModification::eRemoved || data.isDeleted)
{
DEBUG_LOG(m_logger) << "onParticipantChanged m_positionsMap.remove id=" << data.id();
m_participantData.remove(data.id());
m_positionsMap.remove(data.id());
DEBUG_LOG(m_logger) << "onParticipantChanged m_positionsMap.remove id=" << data.id;
m_participantData.remove(data.id);
m_positionsMap.remove(data.id);
return;
}
// No OC in CES
ParticipantManagement::TypeClass typeClass = typeClassFromTypeId(data.typeId());
ParticipantManagement::TypeClass typeClass = typeClassFromTypeId(data.typeId);
if (typeClass == ParticipantManagement::TypeClass::SupportEntity
|| typeClass == ParticipantManagement::TypeClass::SupportUnit
|| typeClass == ParticipantManagement::TypeClass::Unit
|| typeClass == ParticipantManagement::TypeClass::Unknown)
return;
m_participantData[data.id()] = data;
m_participantData[data.id] = data;
CesParticipantData &pos = m_positionsMap[data.id()];
pos.partyId(data.partyId());
pos.participantId(data.id());
pos.participantTypeId(data.typeId());
CesParticipantData &pos = m_positionsMap[data.id];
pos.partyId = data.partyId;
pos.participantId = data.id;
pos.participantTypeId = data.typeId;
DEBUG_LOG(m_logger) << "onParticipantChanged"
<< " id=" << data.id()
<< " typeId=" << data.typeId()
<< " designator=" << data.designator();
<< " id=" << data.id
<< " typeId=" << data.typeId
<< " designator=" << data.designator;
}
void HandlerParticipant::onTypeChanged(const ParticipantManagement::Type &data, DataModification modType)
@@ -281,10 +281,10 @@ void HandlerParticipant::onTypeChanged(const ParticipantManagement::Type &data,
if (modType == DataModification::eRemoved)
return;
m_typeMap.insert(data.id(), data.typeClass());
m_typeMap.insert(data.id, data.typeClass);
DEBUG_LOG(m_logger) << "m_typeMap.size()" << m_typeMap.size()
<< " equipmentTypeId=" << data.id()
<< " typeClass=" << data.typeClass();
<< " equipmentTypeId=" << data.id
<< " typeClass=" << data.typeClass;
}
void HandlerParticipant::onRestoreRadioReadinessChanged(const TrainingAreaBase::RestoreRadioReadiness &data, DataModification modType)
@@ -296,9 +296,9 @@ void HandlerParticipant::onRestoreRadioReadinessChanged(const TrainingAreaBase::
}
auto dtcPpm = m_ddsHandler->dtcPpm();
int participantId = dtcPpm->participantIdByEquipmentNumber(data.equipmentNumber());
int participantId = dtcPpm->participantIdByEquipmentNumber(data.equipmentNumber);
DEBUG_LOG(m_logger) << "onRestoreRadioReadinessChanged"
<< " data.equipmentNumber=" << data.equipmentNumber()
<< " data.equipmentNumber=" << data.equipmentNumber
<< " participantId=" << participantId;
emit restoreRadioReadinessChanged(participantId);
auto partPos = m_positionsMap.value(participantId);
@@ -306,8 +306,8 @@ void HandlerParticipant::onRestoreRadioReadinessChanged(const TrainingAreaBase::
emit newIndoorPosition(partPos);
else
{
partPos.buildingId(0);
partPos.roomId(0);
partPos.buildingId = 0;
partPos.roomId = 0;
m_positionsMap.insert(participantId, partPos);
emit newOutdoorPosition(partPos);
}
@@ -322,9 +322,9 @@ QPolygonF HandlerParticipant::getParticipantStep(int participantId, int zone) co
return {};
const CesParticipantData &partPos = it.value();
QPointF p1 = CentralEffectSimulation::geographic2Utm(partPos.lastGeoPosition, &zone);
QPointF p2 = CentralEffectSimulation::geographic2Utm(partPos.pos(), &zone);
QPointF p2 = CentralEffectSimulation::geographic2Utm(partPos.pos, &zone);
//return {CentralEffectSimulation::geographic2Utm(partPos.lastGeoPosition, &zone), CentralEffectSimulation::geographic2Utm(partPos.pos(), &zone)};
//return {CentralEffectSimulation::geographic2Utm(partPos.lastGeoPosition, &zone), CentralEffectSimulation::geographic2Utm(partPos.pos, &zone)};
result << p1 << p2 ;
return result;
}
@@ -336,7 +336,7 @@ QPointF HandlerParticipant::getParticipantPositionUtm(int participantId, int zon
if (m_positionsMap.contains(participantId))
{
const CesParticipantData &partPos = m_positionsMap.value(participantId);
result = CentralEffectSimulation::geographic2Utm(partPos.pos(), &zone);
result = CentralEffectSimulation::geographic2Utm(partPos.pos, &zone);
}
return result;
}
@@ -352,12 +352,12 @@ QHash<int, HandlerParticipant::CesParticipantData> HandlerParticipant::positions
QHash<int, HandlerParticipant::CesParticipantData> result;
for (const HandlerParticipant::CesParticipantData &pos : m_positionsMap)
{
ParticipantManagement::TypeClass typeClass = typeClassFromTypeId(pos.participantTypeId());
ParticipantManagement::TypeClass typeClass = typeClassFromTypeId(pos.participantTypeId);
if (typeClass != ParticipantManagement::TypeClass::Aircraft)
continue;
if (!m_participantData.contains(pos.participantId()))
if (!m_participantData.contains(pos.participantId))
continue;
result.insert(pos.participantId(), pos);
result.insert(pos.participantId, pos);
}
return result;
}
@@ -368,10 +368,10 @@ QVector<int32_t> HandlerParticipant::getParticipantsBuilding(const int32_t build
DEBUG_LOG(m_logger) << "getParticipantsBuilding:" << buildingId;
for (const HandlerParticipant::CesParticipantData &pos : m_positionsMap)
{
if (buildingId == pos.buildingId())
if (buildingId == pos.buildingId)
{
DEBUG_LOG(m_logger) << "result.append " << pos.participantId();
result.append(pos.participantId());
DEBUG_LOG(m_logger) << "result.append " << pos.participantId;
result.append(pos.participantId);
}
}
return result;
@@ -413,9 +413,9 @@ void HandlerParticipant::checkCheating(const int participantId,
{
DEBUG_LOG(m_logger) << "checkCheating state =" << newVulnerabilityState
<< " participantId=" << participantId;
if (!m_typeMap.contains(participantPosition.participantTypeId()))
WARNING_LOG(m_logger) << "!m_typeMap.contains(" << participantPosition.participantTypeId() << ")";
ParticipantManagement::TypeClass typeClass = m_typeMap[participantPosition.participantTypeId()];
if (!m_typeMap.contains(participantPosition.participantTypeId))
WARNING_LOG(m_logger) << "!m_typeMap.contains(" << participantPosition.participantTypeId << ")";
ParticipantManagement::TypeClass typeClass = m_typeMap[participantPosition.participantTypeId];
if (handleCheating(typeClass, newVulnerabilityState))
{
@@ -449,15 +449,15 @@ void HandlerParticipant::checkCheatingPosition(const int participantId)
}
// Check, if valid position is available
if (posMobilityKill.participantId() == 0)
if (posMobilityKill.participantId == 0)
{
DEBUG_LOG(m_logger) << "position participantId=" << participantId << " not valid";
m_positionsCheatingMap.insert(participantId, posActual);
return;
}
QPointF posUtmMobilityKill = CentralEffectSimulation::geographic2Utm(posMobilityKill.pos());
QPointF posUtmActual = CentralEffectSimulation::geographic2Utm(posActual.pos());
QPointF posUtmMobilityKill = CentralEffectSimulation::geographic2Utm(posMobilityKill.pos);
QPointF posUtmActual = CentralEffectSimulation::geographic2Utm(posActual.pos);
DEBUG_LOG(m_logger) << "posUtmMobilityKill=" << posUtmMobilityKill.rx() << "/" << posUtmMobilityKill.ry();
DEBUG_LOG(m_logger) << "posUtmActual=" << posUtmActual.rx() << "/" << posUtmActual.ry();
@@ -488,9 +488,9 @@ void HandlerParticipant::onSendParticipantBeStillWarningReply(const Core::Functi
void HandlerParticipant::sendBeStillWarning(const int32_t participantId)
{
TrainingAreaBase::SendParticipantBeStillWarningRequest pba;
pba.equipmentNumber(m_ddsHandler->participantId2EquipNo(participantId));
pba.participantId(participantId);
pba.data(0);
pba.equipmentNumber = m_ddsHandler->participantId2EquipNo(participantId);
pba.participantId = participantId;
pba.data = 0;
m_ddsHandler->ftcTab()->sendParticipantBeStillWarningRequest(pba, this);
}
@@ -509,10 +509,10 @@ void HandlerParticipant::modifyStateRequest(
std::vector<int32_t> participantIds;
participantIds.push_back(participantId);
ParticipantManagement::ModifyStateRequest msr;
msr.participantIds(participantIds);
msr.vulnerabilityState(state);
msr.vulnerabilityKind(kind);
msr.vitality(vitality);
msr.participantIds = participantIds;
msr.vulnerabilityState = state;
msr.vulnerabilityKind = kind;
msr.vitality = vitality;
m_ddsHandler->ftcPpm()->modifyStateRequest(msr, this);
}
@@ -520,8 +520,8 @@ long HandlerParticipant::getDirection(int originatorParticipantId, int targetPar
{
CesParticipantData originatorPos = m_positionsMap[originatorParticipantId];
CesParticipantData targetPos = m_positionsMap[targetParticipantId];
const Core::GeoPosition2D originatorGeoPos = originatorPos.pos();
const Core::GeoPosition2D targetGeoPos = targetPos.pos();
const Core::GeoPosition2D originatorGeoPos = originatorPos.pos;
const Core::GeoPosition2D targetGeoPos = targetPos.pos;
int zone = -1;
@@ -541,8 +541,8 @@ long HandlerParticipant::getDistance(int originatorParticipantId, int targetPart
{
CesParticipantData originatorPos = m_positionsMap[originatorParticipantId];
CesParticipantData targetPos = m_positionsMap[targetParticipantId];
const Core::GeoPosition2D originatorGeoPos = originatorPos.pos();
const Core::GeoPosition2D targetGeoPos = targetPos.pos();
const Core::GeoPosition2D originatorGeoPos = originatorPos.pos;
const Core::GeoPosition2D targetGeoPos = targetPos.pos;
int zone = -1;
@@ -563,8 +563,8 @@ int HandlerParticipant::getParticipantId(int equipentNumber)
while (i.hasNext())
{
i.next();
if (i.value().equipmentNumber() == equipentNumber)
return i.value().id();
if (i.value().equipmentNumber == equipentNumber)
return i.value().id;
}
return 0;
}
@@ -594,12 +594,12 @@ std::ostream &operator<<(std::ostream &stream,
<< ", ltsCoordinate = " << value.ltsCoordinate()
<< ", insideWlsArea = " << value.insideWlsArea()
<< ", insideBuilding = " << value.insideBuilding()
<< ", buildingId = " << value.buildingId()
<< ", buildingId = " << value.buildingId
<< ", notfightMode = " << value.notfightMode
<< ", partyId = " << value.partyId()
<< ", partyId = " << value.partyId
<< ", vulnerabilityState= " << value.vulnerabilityState
<< ", participantTypeId = " << value.participantTypeId()
<< ", participantId = " << value.participantId()
<< ", participantTypeId = " << value.participantTypeId
<< ", participantId = " << value.participantId
<< ")";
return stream;
}