Migrates remaining proxies to generated rtiddsgen API
Converts accessor calls to plain member access in bld, cmo, gna, hla, whg and wls.
This commit is contained in:
34 files changed
+218
-214
No files matched your search
@@ -29,14 +29,14 @@ NasatAircraftParticipantEx::NasatAircraftParticipantEx(const NasatAircraftPartic
|
||||
, m_publisher(publisher)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
|
||||
m_publisher->addParticipantToWatch(m_nap.participantId());
|
||||
m_publisher->addParticipantToWatch(m_nap.participantId);
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
NasatAircraftParticipantEx::~NasatAircraftParticipantEx()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
|
||||
m_publisher->removeParticipantToWatch(m_nap.participantId());
|
||||
m_publisher->removeParticipantToWatch(m_nap.participantId);
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
@@ -51,6 +51,7 @@ int NasatAircraftParticipantEx::partyId() const
|
||||
|
||||
HandlerParticipant::HandlerParticipant(Initialization *mainHandler)
|
||||
: m_mainHandler(mainHandler)
|
||||
, m_logger(getLogger("ParticipantPositionPublisher"))
|
||||
{}
|
||||
|
||||
HandlerParticipant::~HandlerParticipant()
|
||||
@@ -66,30 +67,30 @@ QHash<ExerciseParticipantKey, NasatAircraftParticipantEx *> HandlerParticipant::
|
||||
|
||||
void HandlerParticipant::onNasatAircraftParticipantCreated(const NasatAircraftParticipant &nap)
|
||||
{
|
||||
const int nasatId = m_mainHandler->nasatAircraft()->nasatIdFromNasatAircraftId(nap.nasatAircraftId());
|
||||
const int nasatId = m_mainHandler->nasatAircraft()->nasatIdFromNasatAircraftId(nap.nasatAircraftId);
|
||||
auto it = m_activePublisher.find(nasatId);
|
||||
if (it == m_activePublisher.end())
|
||||
return createNasatAircraftParticipant(nap, nasatId);
|
||||
|
||||
auto itParticipants = it.value().find(ExerciseParticipantKey(nap.exerciseId(), nap.participantId()));
|
||||
auto itParticipants = it.value().find(ExerciseParticipantKey(nap.exerciseId, nap.participantId));
|
||||
if (itParticipants == it.value().end())
|
||||
return createNasatAircraftParticipant(nap, nasatId);
|
||||
}
|
||||
|
||||
void HandlerParticipant::onNasatAircraftParticipantRemoved(const NasatAircraftParticipant &nap)
|
||||
{
|
||||
const int nasatId = m_mainHandler->nasatAircraft()->nasatIdFromNasatAircraftId(nap.nasatAircraftId());
|
||||
const int nasatId = m_mainHandler->nasatAircraft()->nasatIdFromNasatAircraftId(nap.nasatAircraftId);
|
||||
auto it = m_activePublisher.find(nasatId);
|
||||
if (it == m_activePublisher.end())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "No publisher for NasatAircraftParticipant " << nasatId << "(" << nap.nasatAircraftId() << ") found !?";
|
||||
WARNING_LOG(m_logger) << "No publisher for NasatAircraftParticipant " << nasatId << "(" << nap.nasatAircraftId << ") found !?";
|
||||
return;
|
||||
}
|
||||
auto itParticipants = it.value().find(ExerciseParticipantKey(nap.exerciseId(), nap.participantId()));
|
||||
auto itParticipants = it.value().find(ExerciseParticipantKey(nap.exerciseId, nap.participantId));
|
||||
if (itParticipants == it.value().end())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "No participant entry for NasatAircraftParticipant " << nasatId << "("
|
||||
<< nap.exerciseId() << "," << nap.participantId() << ") found !?";
|
||||
<< nap.exerciseId << "," << nap.participantId << ") found !?";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -154,11 +155,11 @@ void HandlerParticipant::onNasatAircraftPosition(int nasatId, const Core::GeoPos
|
||||
|
||||
const auto &h = it.value();
|
||||
TrainingAreaBase::EquipmentPosition tabPos;
|
||||
tabPos.position().position(pos);
|
||||
tabPos.sampleTime(ts);
|
||||
tabPos.position.position = pos;
|
||||
tabPos.sampleTime = ts;
|
||||
for (const NasatAircraftParticipantEx *napEx : h)
|
||||
{
|
||||
tabPos.equipmentNumber(-napEx->participantId());
|
||||
tabPos.equipmentNumber = -napEx->participantId();
|
||||
int success = napEx->publisher()->publish(tabPos);
|
||||
if (success)
|
||||
DEBUG_LOG(m_logger) << "Publishing positon: " << tabPos << " to exercise " << napEx->exerciseId()
|
||||
@@ -183,8 +184,8 @@ void HandlerParticipant::createNasatAircraftParticipant(const NasatAircraftParti
|
||||
DEBUG_LOG(m_logger) << "Creating position publisher for " << nap
|
||||
<< ", nasatId=" << nasatId;
|
||||
auto *napEx = new NasatAircraftParticipantEx(nap,
|
||||
m_mainHandler->dds()->ddsParticipant(nap.exerciseId()));
|
||||
m_activePublisher[nasatId][ExerciseParticipantKey(nap.exerciseId(), nap.participantId())] = napEx;
|
||||
m_mainHandler->dds()->ddsParticipant(nap.exerciseId));
|
||||
m_activePublisher[nasatId][ExerciseParticipantKey(nap.exerciseId, nap.participantId)] = napEx;
|
||||
connect(napEx->publisher().get(), &Participant2Dds::participantRemoved,
|
||||
m_mainHandler->nasatAircraftParticipant().get(), &HandlerNasatAircraftParticipant::participantRemoved,
|
||||
Qt::QueuedConnection);
|
||||
|
||||
Reference in new issue
Block a user