Migrates EffectShow and AssetManagement to generated rtiddsgen API
Converts accessor calls to plain member access across esc and asm services.
This commit is contained in:
39 files changed
+818
-818
No files matched your search
+7
-7
@@ -78,9 +78,9 @@ void HandlerPpmData::onParticipantChanged(const ParticipantManagement::Participa
|
||||
if (modType != DataModification::eRemoved)
|
||||
{
|
||||
auto m_ppmDtc = m_mainHandler->dds()->dtcPpm();
|
||||
ParticipantManagement::TypeClass typeClass = m_ppmDtc->type(data.typeId()).typeClass();
|
||||
ParticipantManagement::TypeClass typeClass = m_ppmDtc->type(data.typeId).typeClass;
|
||||
DEBUG_LOG(m_logger) << "support entity / equipment number set " << (typeClass == ParticipantManagement::TypeClass::SupportEntity)
|
||||
<< " / " << data.equipmentNumber().is_set() << ", typeId: " << data.typeId()
|
||||
<< " / " << data.equipmentNumber.is_set() << ", typeId: " << data.typeId
|
||||
<< ", cnt: " << m_ppmDtc->types().size();
|
||||
|
||||
if (typeClass != ParticipantManagement::TypeClass::SupportEntity)
|
||||
@@ -91,7 +91,7 @@ void HandlerPpmData::onParticipantChanged(const ParticipantManagement::Participa
|
||||
else
|
||||
{
|
||||
// does not exists or has no longer an equipment number -> remove
|
||||
if (!data.equipmentNumber().is_set())
|
||||
if (!data.equipmentNumber.is_set())
|
||||
modType = DataModification::eRemoved;
|
||||
}
|
||||
|
||||
@@ -102,7 +102,7 @@ void HandlerPpmData::onParticipantChanged(const ParticipantManagement::Participa
|
||||
case DataModification::eAdded:
|
||||
case DataModification::eModified:
|
||||
{
|
||||
auto &val = m_participant[data.id()];
|
||||
auto &val = m_participant[data.id];
|
||||
val = Participant_t(data);
|
||||
m_mainHandler->handlerEffectShowVehicleStatus()->effectShowActorChanged(val, modType);
|
||||
break;
|
||||
@@ -110,17 +110,17 @@ void HandlerPpmData::onParticipantChanged(const ParticipantManagement::Participa
|
||||
case DataModification::eRemoved:
|
||||
{
|
||||
// remove if participant exists
|
||||
auto it = m_participant.constFind(data.id());
|
||||
auto it = m_participant.constFind(data.id);
|
||||
if (it != m_participant.constEnd())
|
||||
{
|
||||
m_mainHandler->handlerEffectShowVehicleStatus()->effectShowActorChanged(it.value(), modType);
|
||||
m_participant.remove(data.id());
|
||||
m_participant.remove(data.id);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "onParticipantChanged: " << data.id() << ' ' << data.name() << ' ' << modType;
|
||||
DEBUG_LOG(m_logger) << "onParticipantChanged: " << data.id << ' ' << data.name << ' ' << modType;
|
||||
|
||||
|
||||
} // end of onParticipantChanged()
|
||||
Reference in new issue
Block a user