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/object_ied.cpp
+26 -26
View File
@@ -120,28 +120,28 @@ void ObjectIed::onPublishData()
{
GuezIedManagement::Ied ddsData;
ddsData.id(m_data.id);
ddsData.equipmentNumber(m_data.equipmentNumber);
ddsData.type(IedType(m_data.typeId));
ddsData.remoteTrigger(m_data.remoteTrigger);
ddsData.switchTrigger(m_data.switchTrigger);
ddsData.lightBarrierTrigger(m_data.lightBarrierTrigger);
ddsData.tautWireTrigger(m_data.tautWireTrigger);
ddsData.explosiveForce(m_data.explosiveForce);
ddsData.partyId(m_data.partyId);
ddsData.pairingState(IedPairingState(m_data.pairingStateId));
ddsData.id = m_data.id;
ddsData.equipmentNumber = m_data.equipmentNumber;
ddsData.type = IedType(m_data.typeId);
ddsData.remoteTrigger = m_data.remoteTrigger;
ddsData.switchTrigger = m_data.switchTrigger;
ddsData.lightBarrierTrigger = m_data.lightBarrierTrigger;
ddsData.tautWireTrigger = m_data.tautWireTrigger;
ddsData.explosiveForce = m_data.explosiveForce;
ddsData.partyId = m_data.partyId;
ddsData.pairingState = IedPairingState(m_data.pairingStateId);
switch(ddsData.pairingState().underlying())
switch(ddsData.pairingState)
{
case IedPairingState::PairedToParticipant:
{
ddsData.pairedParticipantId().set(m_data.pairedParticipantId.toInt());
ddsData.pairedParticipantId.set(m_data.pairedParticipantId.toInt());
connect(m_ppmDtc.get(), &ParticipantManagement::Interface::Dtc::participantPositionChanged, this, &ObjectIed::onParticipantPositionChanged);
break;
}
case IedPairingState::PairedToOps:
{
ddsData.pairedOpsId().set(m_data.pairedOpsId.toInt());
ddsData.pairedOpsId.set(m_data.pairedOpsId.toInt());
//todo: connect to ISM for OPS-Position
disconnect(m_ppmDtc.get(), &ParticipantManagement::Interface::Dtc::participantPositionChanged, this, &ObjectIed::onParticipantPositionChanged);
break;
@@ -154,15 +154,15 @@ void ObjectIed::onPublishData()
}
}
ddsData.tacticalState(IedTacticalState(m_data.tacticalStateId));
ddsData.pyrotechnics(m_data.pyrotechnics);
ddsData.batteryWarnings(m_data.batterywarnings);
ddsData.electronicsError(IedError(m_data.electronicsErrorStateId));
ddsData.pyrotechnics1Error(IedError(m_data.pyrotechnics1ErrorStateId));
ddsData.pyrotechnics2Error(IedError(m_data.pyrotechnics2ErrorStateId));
ddsData.pyrotechnics3Error(IedError(m_data.pyrotechnics3ErrorStateId));
ddsData.symbol(m_data.symbol.toStdString());
ddsData.sampleTime(m_data.sampleTime);
ddsData.tacticalState = IedTacticalState(m_data.tacticalStateId);
ddsData.pyrotechnics = m_data.pyrotechnics;
ddsData.batteryWarnings = m_data.batterywarnings;
ddsData.electronicsError = IedError(m_data.electronicsErrorStateId);
ddsData.pyrotechnics1Error = IedError(m_data.pyrotechnics1ErrorStateId);
ddsData.pyrotechnics2Error = IedError(m_data.pyrotechnics2ErrorStateId);
ddsData.pyrotechnics3Error = IedError(m_data.pyrotechnics3ErrorStateId);
ddsData.symbol = m_data.symbol.toStdString();
ddsData.sampleTime = m_data.sampleTime;
INFO_LOG(m_logger) << "Publish IED-data to dds (" << m_data.id << ") ...";
@@ -175,8 +175,8 @@ void ObjectIed::onParticipantPositionChanged(const ParticipantManagement::Partic
if (modType != DataModification::eAdded && modType != DataModification::eModified)
return;
if (data.participantId() == m_data.pairedParticipantId.toInt())
setPosition(data.sampleTime(), data.pos());
if (data.participantId == m_data.pairedParticipantId.toInt())
setPosition(data.sampleTime, data.pos);
}
void ObjectIed::assignBaseData(const Database::GimIed &data)
@@ -193,12 +193,12 @@ void ObjectIed::assignPairingState(const Database::GimIed &data)
m_data.pairedOpsId = data.pairedOpsId;
m_data.partyId = data.partyId;
switch(data.pairingStateId.underlying())
switch(data.pairingStateId)
{
case IedPairingState::PairedToParticipant:
{
ParticipantManagement::ParticipantPosition position = m_ppmDtc->participantPosition(m_data.pairedParticipantId.toInt());
setPosition(position.sampleTime(), position.pos());
setPosition(position.sampleTime, position.pos);
break;
}
case IedPairingState::PairedToOps: