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/GuezIedManagement/handler_ied.cpp
+41 -41
View File
@@ -107,14 +107,14 @@ bool HandlerIed::init()
for (auto it = latestPositions.begin(); it != latestPositions.end(); ++it)
{
const auto &pos = it.value();
ObjectIed *currentIed = m_iedObjMap.value(pos.id());
ObjectIed *currentIed = m_iedObjMap.value(pos.id);
if (currentIed == nullptr)
{
INFO_LOG(m_logger) << "Got position for non existing IED-Id: " << pos.id();
INFO_LOG(m_logger) << "Got position for non existing IED-Id: " << pos.id;
continue;
}
DEBUG_LOG(m_logger) << "Setting position for IED-Id " << pos.id();
DEBUG_LOG(m_logger) << "Setting position for IED-Id " << pos.id;
currentIed->setPosition(it.value());
}
@@ -166,10 +166,10 @@ static inline IedTacticalState toTacticalState(int tacticalState)
static void assignBaseData(const TrainingAreaBase::IedBaseData &inData, Database::GimIed &outData)
{
outData.equipmentNumber = inData.iedId();
outData.tacticalStateId = toTacticalState(inData.tacticalState());
outData.pyrotechnics = inData.statePyrotechnics();
outData.sampleTime = inData.sampleTime();
outData.equipmentNumber = inData.iedId;
outData.tacticalStateId = toTacticalState(inData.tacticalState);
outData.pyrotechnics = inData.statePyrotechnics;
outData.sampleTime = inData.sampleTime;
}
void HandlerIed::onDefinitionIed(const TrainingAreaBase::DefinitionIed &data, DataModification modType)
@@ -182,26 +182,26 @@ void HandlerIed::onDefinitionIed(const TrainingAreaBase::DefinitionIed &data, Da
Database::GimIed newData;
assignBaseData(data, newData);
newData.typeId = static_cast<IedType>(data.type());
newData.remoteTrigger = data.remoteTrigger();
newData.switchTrigger = data.switchTrigger();
newData.lightBarrierTrigger = data.lightBarrierTrigger();
newData.tautWireTrigger = data.tautWireTrigger();
newData.explosiveForce = data.explosiveForce();
newData.typeId = static_cast<IedType>(data.type);
newData.remoteTrigger = data.remoteTrigger;
newData.switchTrigger = data.switchTrigger;
newData.lightBarrierTrigger = data.lightBarrierTrigger;
newData.tautWireTrigger = data.tautWireTrigger;
newData.explosiveForce = data.explosiveForce;
if (m_ppmDtc->party(data.partyId()).id() > 0)
newData.partyId = data.partyId(); // use party from telegram
if (m_ppmDtc->party(data.partyId).id > 0)
newData.partyId = data.partyId; // use party from telegram
else
newData.partyId = getPartyIdFromParticipantEquipmentNumber(data.equipmentNumber()); // use party from equipmentNumber
newData.partyId = getPartyIdFromParticipantEquipmentNumber(data.equipmentNumber); // use party from equipmentNumber
newData.pairingStateId = static_cast<IedPairingState>(data.pairingState());
switch (newData.pairingStateId.underlying())
newData.pairingStateId = static_cast<IedPairingState>(data.pairingState);
switch (newData.pairingStateId)
{
case IedPairingState::PairedToParticipant:
newData.pairedParticipantId.setValue(data.pairedId().get());
newData.pairedParticipantId.setValue(data.pairedId.get());
break;
case IedPairingState::PairedToOps:
newData.pairedOpsId.setValue(data.pairedId().get());
newData.pairedOpsId.setValue(data.pairedId.get());
break;
case IedPairingState::NotPaired:
break;
@@ -215,7 +215,7 @@ void HandlerIed::onDefinitionIed(const TrainingAreaBase::DefinitionIed &data, Da
// ^
// | -> Therefore suppress Injury
// handled at guez_ied_to_map.cpp and gim_info_dialog.cpp
switch (newData.typeId.underlying())
switch (newData.typeId)
{
case IedType::SuicideIed:
newData.symbol = QStringLiteral("AP6D|CMPL|10014000001103040000"); //SIDC for suicide bomber
@@ -241,21 +241,21 @@ void HandlerIed::onDefinitionIed(const TrainingAreaBase::DefinitionIed &data, Da
return;
}
m_iedObjMap.insert(ifs->getId(), ifs);
auto it = m_orphanedStateIed.find(data.iedId());
auto it = m_orphanedStateIed.find(data.iedId);
if (it != m_orphanedStateIed.end())
{
auto defState = it.value();
m_orphanedStateIed.erase(it);
defState.tacticalState(data.tacticalState());
defState.statePyrotechnics(data.statePyrotechnics());
defState.sampleTime(data.sampleTime());
defState.tacticalState = data.tacticalState;
defState.statePyrotechnics = data.statePyrotechnics;
defState.sampleTime = data.sampleTime;
onStateIed(defState, DataModification::eAdded);
}
id = ifs->getId();
}
m_iedObjMap[id]->setPosition(newData.sampleTime, Core::GeoPosition(data.position().lon(), data.position().lat(), 0));
m_iedObjMap[id]->setPosition(newData.sampleTime, Core::GeoPosition(data.position.lon, data.position.lat, 0));
}
static inline IedError toIedError(int err)
@@ -279,23 +279,23 @@ void HandlerIed::onStateIed(const TrainingAreaBase::StateIed &data, DataModifica
DEBUG_LOG(m_logger) << "onStateIed: " << data;
// only overwrite state for existing IEDs
if (m_iedObjMap.contains(getIdByEquipmentnumber(data.iedId())))
if (m_iedObjMap.contains(getIdByEquipmentnumber(data.iedId)))
{
Database::GimIed newData;
assignBaseData(data, newData);
newData.batterywarnings = data.batteryWarnings();
newData.electronicsErrorStateId = toIedError(data.errorStateElectronics());
newData.pyrotechnics1ErrorStateId = toIedError(data.errorStatePyrotechnics1());
newData.pyrotechnics2ErrorStateId = toIedError(data.errorStatePyrotechnics2());
newData.pyrotechnics3ErrorStateId = toIedError(data.errorStatePyrotechnics3());
newData.batterywarnings = data.batteryWarnings;
newData.electronicsErrorStateId = toIedError(data.errorStateElectronics);
newData.pyrotechnics1ErrorStateId = toIedError(data.errorStatePyrotechnics1);
newData.pyrotechnics2ErrorStateId = toIedError(data.errorStatePyrotechnics2);
newData.pyrotechnics3ErrorStateId = toIedError(data.errorStatePyrotechnics3);
m_iedObjMap[getIdByEquipmentnumber(newData.equipmentNumber)]->updateState(newData);
}
else
{
WARNING_LOG(m_logger) << "StateIed without an existing IED - got no DefinitionIED? " << data;
m_orphanedStateIed.insert(data.iedId(), data);
m_orphanedStateIed.insert(data.iedId, data);
}
}
@@ -304,25 +304,25 @@ void HandlerIed::onPairIedRequest(const rti::core::SampleIdentity &cookie,
{
Core::FunctionReplyObject ret;
INFO_LOG(m_logger) << "onPairIedRequest id = " << request.id();
INFO_LOG(m_logger) << "onPairIedRequest id = " << request.id;
ObjectIed *ifs = m_iedObjMap.value(request.id());
ObjectIed *ifs = m_iedObjMap.value(request.id);
if (ifs == nullptr)
{
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "IED with id %1 not found")).arg(request.id());
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "IED with id %1 not found")).arg(request.id);
m_ddsHandler->fts()->pairIedReply(cookie, ret);
return;
}
Database::GimIed data;
data.pairingStateId = request.pairingState();
data.pairingStateId = request.pairingState;
switch (request.pairingState().underlying())
switch (request.pairingState)
{
case IedPairingState::PairedToParticipant:
{
data.pairedParticipantId.setValue(request.pairedParticipantId.get());
data.partyId = m_ppmDtc->participant(request.pairedParticipantId.get()).partyId();
data.partyId = m_ppmDtc->participant(request.pairedParticipantId.get()).partyId;
break;
}
case IedPairingState::PairedToOps:
@@ -357,8 +357,8 @@ int HandlerIed::getPartyIdFromParticipantEquipmentNumber(const int equipmentNumb
for (const auto &participant : participants)
{
if (participant.equipmentNumber() == equipmentNumber)
return participant.partyId();
if (participant.equipmentNumber == equipmentNumber)
return participant.partyId;
}
return 0;