Complete Qt6/rtiddsgen migration of residual Lts service sources
This commit is contained in:
86 files changed
+1235
-1128
No files matched your search
@@ -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;
|
||||
|
||||
@@ -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:
|
||||
|
||||
Reference in new issue
Block a user