Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen
- 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:
2785 files changed
+18754
-18316
No files matched your search
@@ -10,16 +10,15 @@ namespace WirelessLocationSystem
|
||||
|
||||
DdsHandler::DdsHandler(int domainId, int exerciseId)
|
||||
: m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Global, exerciseId))
|
||||
, m_logger(getLogger("DdsHandler"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
}
|
||||
|
||||
bool DdsHandler::init(const QStringList &qosFileList)
|
||||
{
|
||||
if (!m_ddsConnector->init(qosFileList))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
|
||||
ERROR_LOG() << "Error initializing dds connections - aborting";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -33,8 +33,6 @@ public:
|
||||
private:
|
||||
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
|
||||
std::shared_ptr<Core::Pacemaker> m_pacemaker;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
@@ -8,7 +8,6 @@ namespace WirelessLocationSystem
|
||||
{
|
||||
IsmHandler::IsmHandler(QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_logger(getLogger("IsmHandler"))
|
||||
{}
|
||||
|
||||
bool IsmHandler::init(MainHandler *mainHandler)
|
||||
@@ -22,7 +21,7 @@ bool IsmHandler::init(MainHandler *mainHandler)
|
||||
|
||||
if (!m_dtcIsm->enableMainStructureElement())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Can not read data from ISM";
|
||||
ERROR_LOG() << "Can not read data from ISM";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -37,8 +37,6 @@ private:
|
||||
|
||||
QHash<int, QMap<int, int>> m_mseId2RoomId;
|
||||
std::shared_ptr<InfrastructureManagement::Interface::Dtc> m_dtcIsm;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
@@ -11,7 +11,6 @@ namespace WirelessLocationSystem
|
||||
MainHandler::MainHandler(QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_ddsHandler(nullptr)
|
||||
, m_logger(getLogger("MainHandler"))
|
||||
{}
|
||||
|
||||
MainHandler::~MainHandler()
|
||||
|
||||
@@ -51,7 +51,5 @@ private:
|
||||
std::shared_ptr<WlsHandler> m_wlsHandler;
|
||||
std::shared_ptr<WebSocketHandler> m_wsHandler;
|
||||
std::shared_ptr<IsmHandler> m_ismHandler;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
+14
-15
@@ -25,7 +25,6 @@ WebSocketHandler::WebSocketHandler(QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_webSocketServer(new QWebSocketServer(QStringLiteral("WLS"), QWebSocketServer::NonSecureMode, this))
|
||||
, m_basePoint(LtsCoordTrans::UtmCoordinate::fromMgrs(Settings::wlsMgrsBasePoint()))
|
||||
, m_logger(getLogger("WebSocketHandler"))
|
||||
{}
|
||||
|
||||
WebSocketHandler::~WebSocketHandler()
|
||||
@@ -38,7 +37,7 @@ bool WebSocketHandler::init(std::shared_ptr<WlsHandler> wlsHandler,
|
||||
{
|
||||
if (!m_webSocketServer->listen(QHostAddress::Any, listenPort))
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Can not listen on port " << listenPort << " - aborting" << m_webSocketServer->errorString();
|
||||
WARNING_LOG() << "Can not listen on port " << listenPort << " - aborting" << m_webSocketServer->errorString();
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -59,7 +58,7 @@ void WebSocketHandler::onNewConnection()
|
||||
if (ws == nullptr)
|
||||
return;
|
||||
|
||||
DEBUG_LOG(m_logger) << "New websocket connection from " << ws->peerAddress().toString() << ":" << ws->peerPort();
|
||||
DEBUG_LOG() << "New websocket connection from " << ws->peerAddress().toString() << ":" << ws->peerPort();
|
||||
|
||||
connect(ws, &QWebSocket::textMessageReceived,
|
||||
this, &WebSocketHandler::onTextMessageReceived);
|
||||
@@ -69,14 +68,14 @@ void WebSocketHandler::onNewConnection()
|
||||
connect(this, &WebSocketHandler::signalBroadcastMessage,
|
||||
ws, [this, ws](const QString &msg, int exerciseId)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "broadcast: exercise property is valid? " << ws->property(exerciseIdProperty).isValid() << " for " << ws->peerPort();
|
||||
DEBUG_LOG() << "broadcast: exercise property is valid? " << ws->property(exerciseIdProperty).isValid() << " for " << ws->peerPort();
|
||||
|
||||
bool exerciseIdAvailable = false;
|
||||
int wsExerciseId = ws->property(exerciseIdProperty).toInt(&exerciseIdAvailable);
|
||||
|
||||
if (exerciseIdAvailable && wsExerciseId != exerciseId)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "broadcast: websocket has " << wsExerciseId << ", but " << exerciseId << " was requested";
|
||||
DEBUG_LOG() << "broadcast: websocket has " << wsExerciseId << ", but " << exerciseId << " was requested";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -103,7 +102,7 @@ void WebSocketHandler::sendTelegramInternal(const TrainingAreaBase::TetraIcd::Tr
|
||||
|
||||
|
||||
const QString jsonStr(QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact)));
|
||||
DEBUG_LOG(m_logger) << "jsonStr: " << jsonStr;
|
||||
DEBUG_LOG() << "jsonStr: " << jsonStr;
|
||||
|
||||
emit signalBroadcastMessage(jsonStr, exerciseId);
|
||||
}
|
||||
@@ -140,7 +139,7 @@ void WebSocketHandler::onTextMessageReceived(const QString &baJson)
|
||||
{
|
||||
using namespace TrainingAreaBase::TetraIcd;
|
||||
|
||||
TRACE_LOG(m_logger) << "WebSocketHandler::onTextMessageReceived: " << baJson;
|
||||
TRACE_LOG() << "WebSocketHandler::onTextMessageReceived: " << baJson;
|
||||
QWebSocket *ws = qobject_cast<QWebSocket*>(sender());
|
||||
|
||||
if (ws == nullptr)
|
||||
@@ -154,7 +153,7 @@ void WebSocketHandler::onTextMessageReceived(const QString &baJson)
|
||||
|
||||
if (err.error != QJsonParseError::NoError)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "received invalid json from websocket at " << err.offset << ": " << err.errorString();
|
||||
ERROR_LOG() << "received invalid json from websocket at " << err.offset << ": " << err.errorString();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -173,7 +172,7 @@ void WebSocketHandler::onTextMessageReceived(const QString &baJson)
|
||||
const QJsonValue typeId(obj.value(QStringLiteral("typeId")));
|
||||
if (!typeId.isDouble())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Can not read type id: " << baJson;
|
||||
ERROR_LOG() << "Can not read type id: " << baJson;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -192,7 +191,7 @@ void WebSocketHandler::onTextMessageReceived(const QString &baJson)
|
||||
{
|
||||
int exerciseId = ExerciseStateData::fromJson(data).exerciseId;
|
||||
ws->setProperty(exerciseIdProperty, exerciseId);
|
||||
DEBUG_LOG(m_logger) << "set exercise id " << exerciseId << " for ws with peer port " << ws->peerPort();
|
||||
DEBUG_LOG() << "set exercise id " << exerciseId << " for ws with peer port " << ws->peerPort();
|
||||
sendParticipantConnectionStates(exerciseId);
|
||||
break;
|
||||
}
|
||||
@@ -203,14 +202,14 @@ void WebSocketHandler::onTextMessageReceived(const QString &baJson)
|
||||
m_participantHandler->handleWlsBinarySfmData(WlsBinarySfmData::fromJson(data));
|
||||
break;
|
||||
default:
|
||||
WARNING_LOG(m_logger) << "Handler for telegram Id " << typeId.toInt()
|
||||
WARNING_LOG() << "Handler for telegram Id " << typeId.toInt()
|
||||
<< " not yet implemented (" << baJson << ")";
|
||||
return;
|
||||
}
|
||||
}
|
||||
catch (const std::exception &e)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Could not parse json: " << e.what() << " (" << baJson << ")";
|
||||
WARNING_LOG() << "Could not parse json: " << e.what() << " (" << baJson << ")";
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -272,16 +271,16 @@ void WebSocketHandler::setPosition(T &tele, const WlsParticipant *participant)
|
||||
|
||||
void WebSocketHandler::sendPosition(const WlsParticipant *participant)
|
||||
{
|
||||
INFO_LOG(m_logger) << "sendPosition equipmentNumber=" << participant->equipmentNumber();
|
||||
INFO_LOG() << "sendPosition equipmentNumber=" << participant->equipmentNumber();
|
||||
if (!participant || !participant->positionIsValid() || participant->equipmentNumber() == 0)
|
||||
{
|
||||
INFO_LOG(m_logger) << "not send - participant is not yet fully initialized";
|
||||
INFO_LOG() << "not send - participant is not yet fully initialized";
|
||||
return;
|
||||
}
|
||||
|
||||
if (participant->isGpsMode())
|
||||
{
|
||||
INFO_LOG(m_logger) << "not send - participant is in gps mode";
|
||||
INFO_LOG() << "not send - participant is in gps mode";
|
||||
return;
|
||||
}
|
||||
TrainingAreaBase::TetraIcd::PositionReport posValue;
|
||||
|
||||
@@ -74,7 +74,6 @@ private:
|
||||
std::shared_ptr<WlsParticipantHandler> m_participantHandler;
|
||||
|
||||
LtsCoordTrans::UtmCoordinate m_basePoint;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -34,10 +34,9 @@ static inline QByteArray escapeData(const QByteArray &bufferData)
|
||||
|
||||
WlsHandler::WlsHandler(QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_logger(getLogger("WlsHandler"))
|
||||
{
|
||||
if (Settings::wlsMgrsBasePoint().size() <= 15)
|
||||
WARNING_LOG(m_logger) << "WLS basepoint is not defined precise enough: " << Settings::wlsMgrsBasePoint();
|
||||
WARNING_LOG() << "WLS basepoint is not defined precise enough: " << Settings::wlsMgrsBasePoint();
|
||||
}
|
||||
|
||||
WlsHandler::~WlsHandler()
|
||||
@@ -51,14 +50,14 @@ bool WlsHandler::init(WlsParticipantHandler *participantHandler,
|
||||
{
|
||||
m_participantHandler = participantHandler;
|
||||
m_wsHandler = wsHandler;
|
||||
INFO_LOG(m_logger) << "WlsHandler::init";
|
||||
INFO_LOG() << "WlsHandler::init";
|
||||
delete m_tcpServer;
|
||||
m_tcpServer = new QTcpServer(this);
|
||||
connect(m_tcpServer, &QTcpServer::newConnection,
|
||||
this, &WlsHandler::onIncomingConnection);
|
||||
if (!m_tcpServer->listen(QHostAddress::Any, listenPort))
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Error listening on port " << listenPort;
|
||||
WARNING_LOG() << "Error listening on port " << listenPort;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -88,7 +87,7 @@ bool WlsHandler::sendWlsMessage(const QByteArray &tagId, WlsTelegramId telId, co
|
||||
auto itSocket = m_tcpSocketByTagId.constFind(tagId);
|
||||
if (itSocket == m_tcpSocketByTagId.constEnd())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Can't find a TCP-socket for tag id: " << tagId;
|
||||
ERROR_LOG() << "Can't find a TCP-socket for tag id: " << tagId;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -113,7 +112,7 @@ bool WlsHandler::sendWlsMessage(const QByteArray &tagId, WlsTelegramId telId, co
|
||||
data.append(s_endMark);
|
||||
|
||||
(*itSocket)->write(data);
|
||||
DEBUG_LOG(m_logger) << "Sending telegram to wls: " << escapeData(data);
|
||||
DEBUG_LOG() << "Sending telegram to wls: " << escapeData(data);
|
||||
}
|
||||
(*itSocket)->flush();
|
||||
return true;
|
||||
@@ -121,7 +120,7 @@ bool WlsHandler::sendWlsMessage(const QByteArray &tagId, WlsTelegramId telId, co
|
||||
|
||||
void WlsHandler::onIncomingConnection()
|
||||
{
|
||||
INFO_LOG(m_logger) << "WlsHandler::onIncomingConnection";
|
||||
INFO_LOG() << "WlsHandler::onIncomingConnection";
|
||||
QTcpSocket *tcpSocket = m_tcpServer->nextPendingConnection();
|
||||
if (!tcpSocket)
|
||||
return;
|
||||
@@ -146,7 +145,7 @@ void WlsHandler::onIncomingData()
|
||||
return;
|
||||
auto &tcpBuffer = m_tcpSockets[s];
|
||||
const QByteArray bufferData = tcpBuffer + s->readAll();
|
||||
TRACE_LOG(m_logger) << "WlsHandler::onIncomingData bufferData='" << escapeData(bufferData) << "'";
|
||||
TRACE_LOG() << "WlsHandler::onIncomingData bufferData='" << escapeData(bufferData) << "'";
|
||||
|
||||
tcpBuffer = parseBuffer(bufferData, s);
|
||||
|
||||
@@ -157,7 +156,7 @@ void WlsHandler::onSocketDisconnected()
|
||||
QTcpSocket *s = qobject_cast<QTcpSocket *>(sender());
|
||||
if (!s)
|
||||
return;
|
||||
INFO_LOG(m_logger) << "Socket disconnected";
|
||||
INFO_LOG() << "Socket disconnected";
|
||||
m_tcpSockets.remove(s);
|
||||
|
||||
|
||||
@@ -203,7 +202,7 @@ void WlsHandler::parseWlsTelegram(const QByteArray &baTele, QTcpSocket *socket)
|
||||
const WlsTelegramId telegramId = static_cast<WlsTelegramId>(parts.at(0).toInt());
|
||||
const QDateTime timestamp = QDateTime::fromString(QString::fromUtf8(parts.at(1)), QStringLiteral("yyyy-MM-dd hh:mm:ss.zzz"));
|
||||
if (telegramId != WlsTelegramId::PlayerPosition)
|
||||
DEBUG_LOG(m_logger) << "Handling " << telegramId
|
||||
DEBUG_LOG() << "Handling " << telegramId
|
||||
<< ", data: '" << escapeData(baTele) << "'";
|
||||
bool bOk = true;
|
||||
switch (telegramId)
|
||||
@@ -221,11 +220,11 @@ void WlsHandler::parseWlsTelegram(const QByteArray &baTele, QTcpSocket *socket)
|
||||
bOk = handleDataPayloadMobileToHost(parts);
|
||||
break;
|
||||
case WlsTelegramId::PayloadHostToMobile:
|
||||
WARNING_LOG(m_logger) << "Protocol error - got a message which should not be sent from Wls (PayloadHostToMobile)";
|
||||
WARNING_LOG() << "Protocol error - got a message which should not be sent from Wls (PayloadHostToMobile)";
|
||||
break;
|
||||
}
|
||||
if (!bOk)
|
||||
WARNING_LOG(m_logger) << "Error handling telegram: '" << baTele << "'";
|
||||
WARNING_LOG() << "Error handling telegram: '" << baTele << "'";
|
||||
}
|
||||
|
||||
bool WlsHandler::findNextSyncStartByte(const QByteArray &buffer, int &iCurReadPos)
|
||||
@@ -258,7 +257,7 @@ bool WlsHandler::handleVersionsinformation(const QList<QByteArray> &data)
|
||||
{
|
||||
if (data.size() < 4)
|
||||
return false;
|
||||
DEBUG_LOG(m_logger) << "TX(WLS): Version = " << data.at(3);
|
||||
DEBUG_LOG() << "TX(WLS): Version = " << data.at(3);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -291,7 +290,7 @@ bool WlsHandler::handlePlayerPosition(const QList<QByteArray> &data, const QDate
|
||||
pos.z += m_wlsZOffset;
|
||||
p->setPosition(pos, timestamp.toMSecsSinceEpoch());
|
||||
|
||||
INFO_LOG(m_logger) << p->getPlayerIdStr() << ": handlePlayerPosition"
|
||||
INFO_LOG() << p->getPlayerIdStr() << ": handlePlayerPosition"
|
||||
<< " x=" << pos.x << ", y=" << pos.y << ", z=" << pos.z
|
||||
<< ", wlsAreaId=" << pos.wlsAreaId
|
||||
<< ", wlsBuildingId=" << pos.wlsBuildingId
|
||||
@@ -325,7 +324,7 @@ bool WlsHandler::handlePlayerState(const QList<QByteArray> &data)
|
||||
|
||||
p->voltage = voltage / 10.;
|
||||
|
||||
INFO_LOG(m_logger) << p->getPlayerIdStr() << ": handlePlayerState"
|
||||
INFO_LOG() << p->getPlayerIdStr() << ": handlePlayerState"
|
||||
<< " timeout=" << timeout
|
||||
<< " ,tacticalState=" << tacticalState
|
||||
<< " ,voltage=" << p->voltage;
|
||||
@@ -341,7 +340,7 @@ bool WlsHandler::checkPayloadIsHex(const QByteArray &payload) const
|
||||
(c < 'a' || c > 'f') &&
|
||||
(c < 'A' || c > 'F'))
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Payload data is not hex coded ...";
|
||||
WARNING_LOG() << "Payload data is not hex coded ...";
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -361,7 +360,7 @@ bool WlsHandler::handleDataPayloadMobileToHost(const QList<QByteArray> &data)
|
||||
QSharedPointer<SfmMessage_rx> msg = SfmMessageConverter::generateRxMessage(payload);
|
||||
if (!msg)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Can not convert payload to SfmMessage ... ";
|
||||
WARNING_LOG() << "Can not convert payload to SfmMessage ... ";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -388,7 +387,7 @@ bool WlsHandler::handleDataPayloadMobileToHost(const QList<QByteArray> &data)
|
||||
case SfmMessage::MsgId::LicenseState:
|
||||
case SfmMessage::MsgId::TacticalState:
|
||||
default:
|
||||
WARNING_LOG(m_logger) << "RX(WLS): MessageID(" << static_cast<int>(msg->getId()) << ")";
|
||||
WARNING_LOG() << "RX(WLS): MessageID(" << static_cast<int>(msg->getId()) << ")";
|
||||
break;
|
||||
}
|
||||
return true;
|
||||
@@ -398,7 +397,7 @@ bool WlsHandler::handleDataPayloadMobileToHost(const QList<QByteArray> &data)
|
||||
void WlsHandler::handlePayload(WlsParticipant *participant, const SfmMsgEquipmentId *sfmTele)
|
||||
{
|
||||
const int equipmentNumber = sfmTele->getEquipmentNumber();
|
||||
INFO_LOG(m_logger) << participant->getPlayerIdStr() << ": handlePayload"
|
||||
INFO_LOG() << participant->getPlayerIdStr() << ": handlePayload"
|
||||
<< " - new equipmentNumber = " << equipmentNumber;
|
||||
if (participant->equipmentNumber() == 0 ||
|
||||
participant->equipmentNumber() != equipmentNumber)
|
||||
@@ -415,7 +414,7 @@ void WlsHandler::handlePayload(WlsParticipant *participant, const SfmMsgRequestG
|
||||
|
||||
void WlsHandler::handlePayload(WlsParticipant *participant, const SfmMsgSfmRestart_rx *sfmTele)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Restart notification ... " << participant->tagId();
|
||||
WARNING_LOG() << "Restart notification ... " << participant->tagId();
|
||||
Q_UNUSED(sfmTele)
|
||||
|
||||
participant->setWlsZone(-1);
|
||||
@@ -442,7 +441,7 @@ void WlsHandler::sendGpsMode(WlsParticipant *participant)
|
||||
return;
|
||||
SfmMsgGpsControl_tx msg;
|
||||
msg.setGpsOn(participant->isGpsMode());
|
||||
INFO_LOG(m_logger) << participant->getPlayerIdStr() << ": sendGpsMode"
|
||||
INFO_LOG() << participant->getPlayerIdStr() << ": sendGpsMode"
|
||||
<< " GpsMode = " << participant->isGpsMode();
|
||||
sendWlsMessage(participant->tagId(), msg);
|
||||
}
|
||||
@@ -453,7 +452,7 @@ bool WlsHandler::parseDoubleCm(const QByteArray &data, double &num) const
|
||||
num = data.toDouble(&bOk);
|
||||
if (!bOk)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Error parsing floating point number '" << data << "'";
|
||||
WARNING_LOG() << "Error parsing floating point number '" << data << "'";
|
||||
return false;
|
||||
}
|
||||
num /= 100;
|
||||
@@ -466,7 +465,7 @@ bool WlsHandler::parseInteger(const QByteArray &data, int &num) const
|
||||
num = data.toInt(&bOk);
|
||||
if (!bOk)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Error parsing number '" << data << "'";
|
||||
WARNING_LOG() << "Error parsing number '" << data << "'";
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
@@ -494,7 +493,7 @@ WlsParticipant *WlsHandler::participantFromTagId(const QByteArray &tagId, bool b
|
||||
|
||||
|
||||
SfmMsgRequestEquipmentId_tx getEqId;
|
||||
INFO_LOG(m_logger) << "Requesting Equipment number for tag " << tagId;
|
||||
INFO_LOG() << "Requesting Equipment number for tag " << tagId;
|
||||
sendWlsMessage(tagId, getEqId);
|
||||
p->lastEquipmentNumberRequest = tNow;
|
||||
}
|
||||
|
||||
@@ -82,8 +82,6 @@ private:
|
||||
QHash<QByteArray, QTcpSocket *> m_tcpSocketByTagId;
|
||||
|
||||
double m_wlsZOffset = 0;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+15
-16
@@ -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;
|
||||
|
||||
@@ -190,8 +190,6 @@ private:
|
||||
int m_wlsTeleTimeoutCounter = 0;
|
||||
uint8_t m_nextSendCounter = 0;
|
||||
uint8_t m_lastRecvCounter = 0;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
std::ostream &operator<<(std::ostream &stream, WlsParticipant::GpsMode gm);
|
||||
|
||||
+1
-2
@@ -13,7 +13,6 @@ namespace WirelessLocationSystem
|
||||
WlsParticipantHandler::WlsParticipantHandler(QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_gpsOnOffTimeoutTimer(new QTimer(this))
|
||||
, m_logger(getLogger("WlsParticipantHandler"))
|
||||
{
|
||||
connect(m_gpsOnOffTimeoutTimer, &QTimer::timeout, this, &WlsParticipantHandler::onGpsOnOffTimeoutTimer);
|
||||
m_gpsOnOffTimeoutTimer->setSingleShot(false);
|
||||
@@ -95,7 +94,7 @@ void WlsParticipantHandler::handleWlsBinarySfmData(const TrainingAreaBase::Tetra
|
||||
WlsParticipant *p = m_participantsByEqId.value(data.header.equipmentNumber);
|
||||
if (!p)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Got binary sfm data for participant with eqId " << data.header.equipmentNumber
|
||||
WARNING_LOG() << "Got binary sfm data for participant with eqId " << data.header.equipmentNumber
|
||||
<< " but could not find this participant!";
|
||||
return;
|
||||
}
|
||||
|
||||
-1
@@ -47,6 +47,5 @@ private:
|
||||
QHash<int, int> m_equipNo2ExerciseId;
|
||||
|
||||
QTimer *m_gpsOnOffTimeoutTimer;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
}
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <WirelessLocationSystem/sfmconverter_export.h>
|
||||
#include "sv_export.h"
|
||||
|
||||
#include <QByteArray>
|
||||
|
||||
|
||||
Reference in new issue
Block a user