lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds immediate migration results in progress

Browse Source
This commit is contained in:
torsten committed 2026-08-19 11:18:24 +02:00
1 parent 8453e104c5
commit 3bb6e89496
2102 files changed
+17482 -15071
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_participant.cpp
+18 -18
View File
@@ -20,24 +20,24 @@ namespace GuezNasat
NasatAircraftParticipantEx::NasatAircraftParticipantEx()
: m_logger(getLogger("NasatAircraftParticipantEx"))
{
DEBUG_LOG() << Q_FUNC_INFO << " START";
DEBUG_LOG() << Q_FUNC_INFO << " END";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
}
NasatAircraftParticipantEx::NasatAircraftParticipantEx(const NasatAircraftParticipant &nap, const std::shared_ptr<Participant2Dds> &publisher)
: m_nap(nap)
, m_publisher(publisher)
{
DEBUG_LOG() << Q_FUNC_INFO << " START";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
m_publisher->addParticipantToWatch(m_nap.participantId());
DEBUG_LOG() << Q_FUNC_INFO << " END";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
}
NasatAircraftParticipantEx::~NasatAircraftParticipantEx()
{
DEBUG_LOG() << Q_FUNC_INFO << " START";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
m_publisher->removeParticipantToWatch(m_nap.participantId());
DEBUG_LOG() << Q_FUNC_INFO << " END";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
}
int NasatAircraftParticipantEx::partyId() const
@@ -82,23 +82,23 @@ void HandlerParticipant::onNasatAircraftParticipantRemoved(const NasatAircraftPa
auto it = m_activePublisher.find(nasatId);
if (it == m_activePublisher.end())
{
WARNING_LOG() << "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()));
if (itParticipants == it.value().end())
{
WARNING_LOG() << "No participant entry for NasatAircraftParticipant " << nasatId << "("
WARNING_LOG(m_logger) << "No participant entry for NasatAircraftParticipant " << nasatId << "("
<< nap.exerciseId() << "," << nap.participantId() << ") found !?";
return;
}
DEBUG_LOG() << " emit nasatAircraftParticipantRemoved, nap = " << nap;
DEBUG_LOG(m_logger) << " emit nasatAircraftParticipantRemoved, nap = " << nap;
emit nasatAircraftParticipantRemoved(nap);
DEBUG_LOG() << "Remove position publisher for " << nap;
DEBUG_LOG(m_logger) << "Remove position publisher for " << nap;
NasatAircraftParticipantEx* napeCopy= itParticipants.value();
@@ -119,11 +119,11 @@ void HandlerParticipant::onNasatAircraftParticipantRemoved(const NasatAircraftPa
Core::GeoPosition HandlerParticipant::nasatPosition(int nasatId) const
{
DEBUG_LOG() << Q_FUNC_INFO << " START, nasatId=" << nasatId;
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, nasatId=" << nasatId;
auto it = m_lastNasatPositionsAsCoreGeoposition.find(nasatId);
if (it == m_lastNasatPositionsAsCoreGeoposition.end())
{
INFO_LOG() << "No NasatPosition for nasat id " << nasatId << " found";
INFO_LOG(m_logger) << "No NasatPosition for nasat id " << nasatId << " found";
return {};
}
return *it;
@@ -131,7 +131,7 @@ Core::GeoPosition HandlerParticipant::nasatPosition(int nasatId) const
void HandlerParticipant::onNasatPosition(const NasatPosition &position)
{
DEBUG_LOG() << Q_FUNC_INFO << " START, position.aircraftId=" << position.aircraftId;
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, position.aircraftId=" << position.aircraftId;
const Core::GeoPosition geoPos(position.position.lon * LtsCoordTrans::deg2rad(),
position.position.lat * LtsCoordTrans::deg2rad(),
position.position.height);
@@ -144,11 +144,11 @@ void HandlerParticipant::onNasatPosition(const NasatPosition &position)
void HandlerParticipant::onNasatAircraftPosition(int nasatId, const Core::GeoPosition &pos, qint64 ts)
{
DEBUG_LOG() << Q_FUNC_INFO << " START, nasatId=" << nasatId;
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, nasatId=" << nasatId;
auto it = m_activePublisher.find(nasatId);
if (it == m_activePublisher.end())
{
INFO_LOG() << "No position publisher for nasat id " << nasatId << " found - ignoring " << m_activePublisher.size();
INFO_LOG(m_logger) << "No position publisher for nasat id " << nasatId << " found - ignoring " << m_activePublisher.size();
return;
}
@@ -161,11 +161,11 @@ void HandlerParticipant::onNasatAircraftPosition(int nasatId, const Core::GeoPos
tabPos.equipmentNumber(-napEx->participantId());
int success = napEx->publisher()->publish(tabPos);
if (success)
DEBUG_LOG() << "Publishing positon: " << tabPos << " to exercise " << napEx->exerciseId()
DEBUG_LOG(m_logger) << "Publishing positon: " << tabPos << " to exercise " << napEx->exerciseId()
<< ", napEx: " << napEx->participant()
<< " -> success = " << success;
else
ERROR_LOG() << "Error on Publishing positon: " << tabPos << " to exercise " << napEx->exerciseId()
ERROR_LOG(m_logger) << "Error on Publishing positon: " << tabPos << " to exercise " << napEx->exerciseId()
<< ", napEx: " << napEx->participant()
<< " -> success = " << success;
@@ -180,7 +180,7 @@ void HandlerParticipant::onNasatIdChanged(int oldNasatId, int newNasatId)
void HandlerParticipant::createNasatAircraftParticipant(const NasatAircraftParticipant &nap, int nasatId)
{
DEBUG_LOG() << "Creating position publisher for " << nap
DEBUG_LOG(m_logger) << "Creating position publisher for " << nap
<< ", nasatId=" << nasatId;
auto *napEx = new NasatAircraftParticipantEx(nap,
m_mainHandler->dds()->ddsParticipant(nap.exerciseId()));