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:
berrux-dev committed 2026-09-21 02:47:26 +02:00
1 parent 3ec4208139
commit 6a8c31b735
34 files changed
+218 -214

No files matched your search

@@ -35,7 +35,7 @@ static Nasat9Liner createDds9Liner(const NasatNineLiner &nasatNineLiner)
{
Nasat9Liner nl;
const qint64 tsMSec = nasatNineLiner.timestamp <= 0 ? QDateTime::currentMSecsSinceEpoch() : qRound64(nasatNineLiner.timestamp * 1000);
nl.sampleTime(tsMSec);
nl.sampleTime = tsMSec;
if (nasatNineLiner.initialPointMode != 0)
nl.initialPoint(Core::GeoPosition2D(LtsCoordTrans::deg2rad() * nasatNineLiner.initialPoint.lon,
@@ -43,19 +43,19 @@ static Nasat9Liner createDds9Liner(const NasatNineLiner &nasatNineLiner)
if (nasatNineLiner.heading2InitialPointMode != Heading2InitialPointMode::Undefined)
{
nl.hdg2InitialPointMode(static_cast<Hdg2InitialPointMode::inner_enum>(nasatNineLiner.heading2InitialPointMode));
nl.hdgInitialPoint2Target(nasatNineLiner.headingInitialPoint2Target);
nl.hdg2InitialPointMode = static_cast<Hdg2InitialPointMode>(nasatNineLiner.heading2InitialPointMode);
nl.hdgInitialPoint2Target = nasatNineLiner.headingInitialPoint2Target;
}
else
{
nl.hdg2InitialPointMode(Hdg2InitialPointMode_def::Undefined);
nl.hdgInitialPoint2Target(-1);
nl.hdg2InitialPointMode = Hdg2InitialPointMode::Undefined;
nl.hdgInitialPoint2Target = -1;
}
if (nasatNineLiner.distance2InitialPointMode != 0)
nl.distanceInitialPoint2Target(nasatNineLiner.distanceInitialPoint2Target);
nl.distanceInitialPoint2Target = nasatNineLiner.distanceInitialPoint2Target;
else
nl.distanceInitialPoint2Target(-1);
nl.distanceInitialPoint2Target = -1;
if (nasatNineLiner.targetPositionMode != 0)
{
@@ -66,41 +66,41 @@ static Nasat9Liner createDds9Liner(const NasatNineLiner &nasatNineLiner)
}
else
{
nl.targetPosition(Core::GeoPosition(std::nan(""), std::nan(""), std::nan("")));
nl.targetPosition = Core::GeoPosition(std::nan(""), std::nan(""), std::nan(""));
}
if (nasatNineLiner.modeFriendlies != 0)
{
nl.friendliesBearing(nasatNineLiner.friendlies.bearing);
nl.friendliesDistance(nasatNineLiner.friendlies.distance);
nl.friendliesBearing = nasatNineLiner.friendlies.bearing;
nl.friendliesDistance = nasatNineLiner.friendlies.distance;
}
else
{
nl.friendliesBearing(-1);
nl.friendliesDistance(-1);
nl.friendliesBearing = -1;
nl.friendliesDistance = -1;
}
if (nasatNineLiner.finalAttackHeadingMode != FinalAttackHeadingMode::None)
{
nl.finalAttackHeading(nasatNineLiner.finalAttackHeading.heading);
nl.finalAttackHeading = nasatNineLiner.finalAttackHeading.heading;
if (nasatNineLiner.finalAttackHeadingMode == FinalAttackHeadingMode::HeadingWithSector)
{
nl.finalAttackHeadingLow(nasatNineLiner.finalAttackHeading.headingLow);
nl.finalAttackHeadingHigh(nasatNineLiner.finalAttackHeading.headingHigh);
nl.finalAttackHeadingLow = nasatNineLiner.finalAttackHeading.headingLow;
nl.finalAttackHeadingHigh = nasatNineLiner.finalAttackHeading.headingHigh;
}
else
{
nl.finalAttackHeadingLow(-1);
nl.finalAttackHeadingHigh(-1);
nl.finalAttackHeadingLow = -1;
nl.finalAttackHeadingHigh = -1;
}
}
else
nl.finalAttackHeading(-1);
nl.finalAttackHeading = -1;
if (nasatNineLiner.timeForTargetMode != TimeForTargetMode::None)
nl.timeForTarget(nasatNineLiner.timeForTargetMode == TimeForTargetMode::TimeToTarget ? -nl.timeForTarget() : nl.timeForTarget());
nl.timeForTarget = nasatNineLiner.timeForTargetMode == TimeForTargetMode::TimeToTarget ? -nl.timeForTarget : nl.timeForTarget;
else
nl.timeForTarget(0);
nl.timeForTarget = 0;
return nl;
}
@@ -125,7 +125,7 @@ void HandlerNasatNineLiner::nineLinerReceived(const NasatNineLiner &nasatNineLin
Nasat9Liner nl = createDds9Liner(nasatNineLiner);
for (auto it = participants.begin(); it != participants.end(); ++it)
{
nl.id(s_id++);
nl.id = s_id++;
const auto &exerciseParticipantId = it.key();
auto nape = it.value();
@@ -134,8 +134,8 @@ void HandlerNasatNineLiner::nineLinerReceived(const NasatNineLiner &nasatNineLin
<< ", exerciseParticipantId.participantId=" << exerciseParticipantId.participantId;
auto &nineLinerParticipant = m_nineLiner[exerciseParticipantId];
nl.isCurrent(true);
nl.participantId(exerciseParticipantId.participantId);
nl.isCurrent = true;
nl.participantId = exerciseParticipantId.participantId;
nineLinerParticipant.push_back(nl);
@@ -170,7 +170,7 @@ void HandlerNasatNineLiner::onNasatAircraftParticipantRemoved(const NasatAircraf
const int nasatId = m_mainHandler->nasatAircraft()->nasatIdFromNasatAircraftId(nap.nasatAircraftId());
const int nasatId = m_mainHandler->nasatAircraft()->nasatIdFromNasatAircraftId(nap.nasatAircraftId);
INFO_LOG(m_logger) << " onNasatAircraftParticipantRemoved, nap = " << nap << ", nasatId = " << nasatId;
if (nasatId < 0)
{
@@ -182,7 +182,7 @@ void HandlerNasatNineLiner::onNasatAircraftParticipantRemoved(const NasatAircraf
if (participants.isEmpty())
{
INFO_LOG(m_logger) << "No exercise participants found to publish 9-liner for nasat aircraft with id "
<< nap.nasatAircraftId();
<< nap.nasatAircraftId;
return;
}
@@ -200,13 +200,13 @@ void HandlerNasatNineLiner::onNasatAircraftParticipantRemoved(const NasatAircraf
if (!nineLinerParticipant.isEmpty())
{
auto &oldLast = nineLinerParticipant.last();
if (oldLast.isCurrent())
if (oldLast.isCurrent)
{
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " updating for removing "
<< ", exerciseParticipantId.exerciseId=" << exerciseParticipantId.exerciseId
<< ", exerciseParticipantId.participantId=" << exerciseParticipantId.participantId;
oldLast.sampleTime(QDateTime::currentMSecsSinceEpoch());
oldLast.isCurrent(false);
oldLast.sampleTime = QDateTime::currentMSecsSinceEpoch();
oldLast.isCurrent = false;
nape->publisher()->publish(oldLast);
}
}