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

Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen

Browse Source 
- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung
- 44 Export-Header Include-Pfade korrigiert (_export.h)
- 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h)
- INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros
- Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits)
- FATAL_LOG Makro hinzugefügt
- InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h)
- FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h)
- AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp)
- SymbolAppearance Klasse vollständig definiert mit content() Methode
- BuildingComponentFilter Klasse definiert mit Copy-Konstruktor
- Ftc Factory: nullptr Return (abstract class)
- AesFilter Klasse in aes.hpp hinzugefügt
- Dtc Klasse in ppm.hpp mit participantChanged Signal
- AesType Enum: alle 15 At* Werte definiert
- AesEffectState_def: EsReceived hinzugefügt
- DataModification Enum: eAdded/eModified/eRemoved
- function_reply_object.h → core_types.h Include-Pfad (72 Dateien)
- Enum-Class-Streaming Template-Operator in INGLLogger.h
- ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen
- ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge
- QRegExp → QRegularExpression in tpm_js_parser.cpp
- .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert
- Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/wls_participant.cpp
+15 -16
View File
@@ -17,7 +17,6 @@ namespace WirelessLocationSystem
WlsParticipant::WlsParticipant(QObject *parent)
: QObject(parent)
, m_wlsTeleTimeoutTimer(new QTimer(this))
, m_logger(getLogger("WlsParticipant"))
{
m_wlsTeleTimeoutTimer->setSingleShot(true);
m_wlsTeleTimeoutTimer->setTimerType(Qt::VeryCoarseTimer);
@@ -55,12 +54,12 @@ void WlsParticipant::setPosition(const RelativePosition &newPosition,
if (tsCurrentPos == m_lastSeenPosition ||
(((tsCurrentPos - m_lastSeenPosition) <= Settings::deadPosTimeout()) && comparePos(m_relativePosition, newPosition)))
{
DEBUG_LOG(m_logger) << "Check for pos Update";
DEBUG_LOG(m_logger) << "Is Outdated= " <<((tsCurrentPos - m_lastSeenPosition) <= Settings::deadPosTimeout());
DEBUG_LOG() << "Check for pos Update";
DEBUG_LOG() << "Is Outdated= " <<((tsCurrentPos - m_lastSeenPosition) <= Settings::deadPosTimeout());
if (((tsCurrentPos - m_lastSeenPosition) <= Settings::deadPosTimeout()) && comparePos(m_relativePosition, newPosition))
{
DEBUG_LOG(m_logger) << "Same Position or not older than 5000msecs " << tsCurrentPos - m_lastSeenPosition;
DEBUG_LOG() << "Same Position or not older than 5000msecs " << tsCurrentPos - m_lastSeenPosition;
return;
}
const qint64 tsNow = QDateTime::currentMSecsSinceEpoch();
@@ -100,7 +99,7 @@ void WlsParticipant::checkGpsOnOffTimeoutTimer(qint64 tNow)
if (m_lastSeenDataCommunication > tNow - s_maxWlsRetryCount * s_dataCommunicationAliveTimeout)
return;
DEBUG_LOG(m_logger) << getPlayerIdStr() << ": lastSeenDataCommunication: "
DEBUG_LOG() << getPlayerIdStr() << ": lastSeenDataCommunication: "
<< m_lastSeenDataCommunication << ", now: "
<< (tNow - s_maxWlsRetryCount * s_dataCommunicationAliveTimeout)
<< " (" << tNow << "), "
@@ -142,14 +141,14 @@ void WlsParticipant::setWlsZone(int newWlsZone)
m_dataCommunication = (newWlsZone > 3)
? DataCommunication::On
: DataCommunication::Off;
INFO_LOG(m_logger) << getPlayerIdStr() << ": wlsZone old: " << m_wlsZone << ", new: " << newWlsZone
INFO_LOG() << getPlayerIdStr() << ": wlsZone old: " << m_wlsZone << ", new: " << newWlsZone
<< ", new gps mode: " << m_gpsMode
<< ", new data comm mode: " << m_dataCommunication
<< ", " << this;
}
else
{
INFO_LOG(m_logger) << getPlayerIdStr() << ": Reset zone/data comunication status - sfm was restarted";
INFO_LOG() << getPlayerIdStr() << ": Reset zone/data comunication status - sfm was restarted";
m_gpsMode = GpsMode::On;
m_dataCommunication = DataCommunication::Unknown;
m_lastSeenPosition = -1;
@@ -170,7 +169,7 @@ bool WlsParticipant::handleSfmRxData(const SfmMsgTetra_rx *sfmTele)
{
if (!isRecvCounterCorrect(sfmTele->sendCounter()))
{
WARNING_LOG(m_logger) << "Got data telegram with counter " << int(sfmTele->sendCounter())
WARNING_LOG() << "Got data telegram with counter " << int(sfmTele->sendCounter())
<< " last one was " << int(m_lastRecvCounter) << " - ignoring";
return false;
}
@@ -180,7 +179,7 @@ bool WlsParticipant::handleSfmRxData(const SfmMsgTetra_rx *sfmTele)
{
if (m_sfmRxPayloadFragmentNumber + 1 != sfmTele->fragmentNumber())
{
WARNING_LOG(m_logger) << getPlayerIdStr() << ": Missing a fragment (waiting for "
WARNING_LOG() << getPlayerIdStr() << ": Missing a fragment (waiting for "
<< (m_sfmRxPayloadFragmentNumber + 1)
<< ", got " << sfmTele->fragmentNumber() << ")";
if (sfmTele->fragmentNumber() != 1)
@@ -201,7 +200,7 @@ bool WlsParticipant::handleSfmRxData(const SfmMsgTetra_rx *sfmTele)
{
if (m_sfmRxPayloadFragmentNumber != 0)
WARNING_LOG(m_logger) << getPlayerIdStr()
WARNING_LOG() << getPlayerIdStr()
<< ": Got unfragmented telegram but currently waiting for next fragment of a fragmented telegram";
m_sfmRxPayloadFragmentNumber = 0;
m_sfmRxPayloadData = sfmTele->payload();
@@ -266,7 +265,7 @@ void WlsParticipant::sendBinarySfmData(const std::vector<unsigned char> &data)
const QByteArray ba = LtsUtils::toQByteArray(data);
if (!calcChunkCountAndLen(ba, chunkCount, chunkLen))
{
WARNING_LOG(m_logger) << getPlayerIdStr()
WARNING_LOG() << getPlayerIdStr()
<< ": Internal error calculating chunk size for payload size " << data.size();
return;
}
@@ -291,7 +290,7 @@ void WlsParticipant::handleWlsAck(const Acknowledge_rx *ack)
if (ack->recvCounter() != m_nextSendCounter)
{
WARNING_LOG(m_logger) << "Got ack for telegram with counter " << int(ack->recvCounter())
WARNING_LOG() << "Got ack for telegram with counter " << int(ack->recvCounter())
<< " but expected " << int(m_nextSendCounter) << " - ignoring";
return;
}
@@ -299,7 +298,7 @@ void WlsParticipant::handleWlsAck(const Acknowledge_rx *ack)
{
if (m_wlsQueue.isEmpty())
{
ERROR_LOG(m_logger) << "got an ack but nothing was sent - something went terribly wrong - resetting send/recv counter";
ERROR_LOG() << "got an ack but nothing was sent - something went terribly wrong - resetting send/recv counter";
m_nextSendCounter = 0;
m_lastRecvCounter = 0;
return;
@@ -344,7 +343,7 @@ void WlsParticipant::sendNextWlsTelegram(bool bIsResend)
m_wlsQueue.clear();
return;
}
WARNING_LOG(m_logger) << getPlayerIdStr()
WARNING_LOG() << getPlayerIdStr()
<< ": Trying to send a wls telegram but no data communication possible";
Q_ASSERT(false);
@@ -365,14 +364,14 @@ void WlsParticipant::sendNextWlsTelegram(bool bIsResend)
void WlsParticipant::onWlsTeleTimeout()
{
++m_wlsTeleTimeoutCounter;
DEBUG_LOG(m_logger) << getPlayerIdStr()
DEBUG_LOG() << getPlayerIdStr()
<< ": Resend WLS connection to participant " << m_equipmentNumber
<< "(" << m_tagId << ")"
<< " m_wlsTeleTimeoutCounter =" << m_wlsTeleTimeoutCounter
<< " s_maxWlsRetryCount=" << s_maxWlsRetryCount;
if (m_wlsTeleTimeoutCounter == s_maxWlsRetryCount)
{
WARNING_LOG(m_logger) << getPlayerIdStr()
WARNING_LOG() << getPlayerIdStr()
<< ": Lost WLS connection to participant " << m_equipmentNumber
<< "(" << m_tagId << ")";
m_lastSeenDataCommunication = -1;