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
-1
@@ -20,7 +20,6 @@ MainDispatcher::MainDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
|
||||
, m_recvFromTabCb(recvFromTabCb)
|
||||
, m_mainHandlerTx(std::make_shared<MainHandlerTx>(std::dynamic_pointer_cast<WlsHandlerTx>(m_wlsDispatcher->sendToTab()),
|
||||
std::dynamic_pointer_cast<TetraHandlerTx>(m_tetraDispatcher->sendToTab())))
|
||||
, m_logger(getLogger("MainDispatcher"))
|
||||
{
|
||||
N_CoPrtCnv::CoPrtCnvTelegramConverter::setUse2BytesForSingleFireDiameter(
|
||||
settings->settings()->value(QLatin1String("AES/use2BytesForSingleFireDiameter"), true).toBool());
|
||||
|
||||
+1
-3
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <QObject>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include "logger.h"
|
||||
|
||||
namespace WlsTetra
|
||||
@@ -37,7 +37,5 @@ private:
|
||||
|
||||
std::shared_ptr<TrainingAreaBase::RecvFromTab> m_recvFromTabCb;
|
||||
std::shared_ptr<TrainingAreaBase::SendToTab> m_mainHandlerTx;
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
}
|
||||
+1
-2
@@ -40,7 +40,6 @@ MainHandlerTx::MainHandlerTx(const std::shared_ptr<WlsHandlerTx> &wlsTx,
|
||||
const std::shared_ptr<TetraHandlerTx> &tetraTx)
|
||||
: m_wlsHandlerTx(wlsTx)
|
||||
, m_tetraHandlerTx(tetraTx)
|
||||
, m_logger(getLogger("MainHandlerTx"))
|
||||
{}
|
||||
|
||||
SendToTab::HandleState MainHandlerTx::canHandleTelegram(int equipmentNumber, int telegramId) const
|
||||
@@ -251,7 +250,7 @@ bool MainHandlerTx::txData(const TetraIcd::Sanitation &data)
|
||||
|
||||
bool MainHandlerTx::txData(const TetraIcd::SelectiveReammunition &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "MainHandlerTx::txData SelectiveReammunition";
|
||||
DEBUG_LOG() << "MainHandlerTx::txData SelectiveReammunition";
|
||||
return sendToTxMixin(&data);
|
||||
}
|
||||
bool MainHandlerTx::txData(const TetraIcd::SetDevicePowerRequest &data)
|
||||
|
||||
-1
@@ -69,6 +69,5 @@ private:
|
||||
private:
|
||||
std::shared_ptr<WlsHandlerTx> m_wlsHandlerTx;
|
||||
std::shared_ptr<TetraHandlerTx> m_tetraHandlerTx;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
+1
-2
@@ -18,7 +18,6 @@ TetraDispatcher::TetraDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
|
||||
, m_txHandler(std::make_shared<TetraHandlerTx>())
|
||||
, m_tetraPrtCnv(new TetraPrtCnv(pdp, this))
|
||||
, m_dataProvider(pdp)
|
||||
, m_logger(getLogger("TetraDispatcher"))
|
||||
{
|
||||
connect(m_tetraPrtCnv, &TetraPrtCnv::tetraConnectionChanged,
|
||||
this, &TetraDispatcher::onTetraConnectionChanged);
|
||||
@@ -91,7 +90,7 @@ void TetraDispatcher::onSendInitialData()
|
||||
m_txHandler->setConnected(true);
|
||||
if (m_dataProvider)
|
||||
{
|
||||
INFO_LOG(m_logger) << "sending initial data";
|
||||
INFO_LOG() << "sending initial data";
|
||||
|
||||
if (m_dataProvider->exerciseId() > 0)
|
||||
{
|
||||
|
||||
+1
-3
@@ -9,7 +9,7 @@
|
||||
#include <QTimer>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <PrtCnv/PrtCnvApplication.hpp>
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include "tetra_prtcnv.h"
|
||||
#include "logger.h"
|
||||
|
||||
@@ -53,8 +53,6 @@ private:
|
||||
std::shared_ptr<TetraHandlerTx> m_txHandler;
|
||||
TetraPrtCnv *m_tetraPrtCnv;
|
||||
TrainingAreaBase::Plugin::DataProvider *m_dataProvider;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+6
-7
@@ -16,7 +16,6 @@ TetraHandlerRx::TetraHandlerRx(const std::shared_ptr<TrainingAreaBase::RecvFromT
|
||||
, m_receiveCounter(0)
|
||||
, m_bWarnedOnce(false)
|
||||
, m_bWaitForInitialAck(true)
|
||||
, m_logger(getLogger("TetraHandlerRx"))
|
||||
{
|
||||
m_ackTimer->setInterval(1000);
|
||||
m_ackTimer->setSingleShot(false);
|
||||
@@ -38,14 +37,14 @@ bool TetraHandlerRx::handleTelegram(const QByteArray &baJson)
|
||||
if (!sendCounter.isDouble())
|
||||
return false;
|
||||
m_receiveCounter = sendCounter.toInt(-1);
|
||||
DEBUG_LOG(m_logger) << "Incoming telegram with Id " << obj.value(QStringLiteral("type")).toString();
|
||||
DEBUG_LOG() << "Incoming telegram with Id " << obj.value(QStringLiteral("type")).toString();
|
||||
if (m_receiveCounter < 0)
|
||||
return false;
|
||||
}
|
||||
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 false;
|
||||
}
|
||||
const QJsonObject data = obj.value(QStringLiteral("data")).toObject();
|
||||
@@ -168,14 +167,14 @@ bool TetraHandlerRx::handleTelegram(const QByteArray &baJson)
|
||||
emit participantLicenseChange(ParticipantLicenseChange::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 false;
|
||||
}
|
||||
}
|
||||
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 false;
|
||||
}
|
||||
return true;
|
||||
@@ -183,7 +182,7 @@ bool TetraHandlerRx::handleTelegram(const QByteArray &baJson)
|
||||
|
||||
void TetraHandlerRx::handleAcknowledge(qint64 timeStamp, int counter)
|
||||
{
|
||||
TRACE_LOG(m_logger) << "Ack from Socket for time " << timeStamp
|
||||
TRACE_LOG() << "Ack from Socket for time " << timeStamp
|
||||
<< " with counter " << counter
|
||||
<< ", initial: " << m_bWaitForInitialAck;
|
||||
if (m_bWaitForInitialAck)
|
||||
@@ -210,7 +209,7 @@ void TetraHandlerRx::rxData(const T &data)
|
||||
{
|
||||
if (!m_bWarnedOnce)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "No RecvFromTab available";
|
||||
ERROR_LOG() << "No RecvFromTab available";
|
||||
m_bWarnedOnce = true;
|
||||
}
|
||||
return;
|
||||
|
||||
-1
@@ -38,7 +38,6 @@ protected:
|
||||
int m_receiveCounter;
|
||||
bool m_bWarnedOnce;
|
||||
bool m_bWaitForInitialAck;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+4
-5
@@ -10,7 +10,6 @@ namespace WlsTetra
|
||||
TetraHandlerTx::TetraHandlerTx()
|
||||
: QObject()
|
||||
, SendToTab()
|
||||
, m_logger(getLogger("TetraHandlerTx"))
|
||||
{
|
||||
resetSendCounter();
|
||||
}
|
||||
@@ -41,14 +40,14 @@ bool TetraHandlerTx::sendTele(const QByteArray &ba)
|
||||
const QJsonValue typeId = obj[QStringLiteral("typeId")];
|
||||
if (typeId.toInt() == TrainingAreaBase::TetraIcd::TelegramId::BESTAETIGUNG)
|
||||
{
|
||||
TRACE_LOG(m_logger) << "Outgoing ack";
|
||||
TRACE_LOG() << "Outgoing ack";
|
||||
emit outgoingMessage(ba);
|
||||
return true;
|
||||
}
|
||||
|
||||
obj[QStringLiteral("counter")] = m_sendCounter++;
|
||||
const QByteArray baToSend = QJsonDocument(obj).toJson(QJsonDocument::Compact);
|
||||
DEBUG_LOG(m_logger) << "Outgoing message: " << typeId.toInt();
|
||||
DEBUG_LOG() << "Outgoing message: " << typeId.toInt();
|
||||
emit outgoingMessage(baToSend);
|
||||
return true;
|
||||
}
|
||||
@@ -235,7 +234,7 @@ bool TetraHandlerTx::txData(const TrainingAreaBase::TetraIcd::Sanitation &data)
|
||||
|
||||
bool TetraHandlerTx::txData(const TrainingAreaBase::TetraIcd::SelectiveReammunition &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << " TetraHandlerTx::txData: SelectiveReammunition";
|
||||
DEBUG_LOG() << " TetraHandlerTx::txData: SelectiveReammunition";
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
@@ -262,7 +261,7 @@ bool TetraHandlerTx::sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTele
|
||||
obj[QStringLiteral("counter")] = m_sendCounter++;
|
||||
const QByteArray ba = QJsonDocument(obj).toJson(QJsonDocument::Compact);
|
||||
if (data->id() != TrainingAreaBase::TetraIcd::TelegramId::BESTAETIGUNG)
|
||||
DEBUG_LOG(m_logger) << "Sending tele: " << ba;
|
||||
DEBUG_LOG() << "Sending tele: " << ba;
|
||||
emit outgoingMessage(ba);
|
||||
return true;
|
||||
}
|
||||
|
||||
-1
@@ -70,7 +70,6 @@ protected:
|
||||
protected:
|
||||
int m_sendCounter = 1;
|
||||
bool m_bConnected = false;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
|
||||
|
||||
+4
-5
@@ -20,7 +20,6 @@ TetraPrtCnv::TetraPrtCnv(TrainingAreaBase::Plugin::DataProvider *pdp,
|
||||
, m_prtCnvApp(nullptr)
|
||||
, m_exerciseId(0)
|
||||
, m_radioGrpId(0)
|
||||
, m_logger(getLogger("TetraPrtCnv"))
|
||||
{}
|
||||
|
||||
TetraPrtCnv::~TetraPrtCnv()
|
||||
@@ -44,7 +43,7 @@ void TetraPrtCnv::onExerciseChanged()
|
||||
{
|
||||
if (m_pdp->exerciseRadioGroup().id() != m_radioGrpId)
|
||||
if (!updatePrtCnv())
|
||||
ERROR_LOG(m_logger) << "Error changing PrtCnv state from radio grp id: "
|
||||
ERROR_LOG() << "Error changing PrtCnv state from radio grp id: "
|
||||
<< m_radioGrpId
|
||||
<< " to " << m_pdp->exerciseRadioGroup().id();
|
||||
}
|
||||
@@ -73,7 +72,7 @@ bool TetraPrtCnv::updatePrtCnv()
|
||||
if (!QFile::copy(QStringLiteral(":/PrtCnv.dat"), iniFileOut()) ||
|
||||
!QFile::setPermissions(iniFileOut(), QFile::ReadOwner | QFile::WriteOwner))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error creating ini file for PrtCnv: " << iniFileOut();
|
||||
ERROR_LOG() << "Error creating ini file for PrtCnv: " << iniFileOut();
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -113,10 +112,10 @@ bool TetraPrtCnv::checkConfigTemplates()
|
||||
{
|
||||
if (!QFile::exists(playerIdsFile()))
|
||||
{
|
||||
INFO_LOG(m_logger) << "Creating " << playerIdsFile();
|
||||
INFO_LOG() << "Creating " << playerIdsFile();
|
||||
if (!QFile::copy(QStringLiteral(":/playerIds.dat"), playerIdsFile()))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error creating " << playerIdsFile();
|
||||
ERROR_LOG() << "Error creating " << playerIdsFile();
|
||||
return false;
|
||||
}
|
||||
else
|
||||
|
||||
-1
@@ -46,6 +46,5 @@ private:
|
||||
PrtCnv::PrtCnvApplication *m_prtCnvApp;
|
||||
int m_exerciseId;
|
||||
int m_radioGrpId;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
}
|
||||
+3
-4
@@ -22,7 +22,6 @@ WlsDispatcher::WlsDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
|
||||
, m_webSocket(new QWebSocket(QString(), QWebSocketProtocol::VersionLatest, this))
|
||||
, m_webSocketReconnectTimer(new QTimer(this))
|
||||
, m_bWarnedOnce(false)
|
||||
, m_logger(getLogger("WlsDispatcher"))
|
||||
{
|
||||
connect(m_webSocket, QOverload<QAbstractSocket::SocketError>::of(&QWebSocket::error),
|
||||
this, &WlsDispatcher::onWebSocketError);
|
||||
@@ -68,7 +67,7 @@ void WlsDispatcher::onWlsConnected()
|
||||
|
||||
void WlsDispatcher::onWlsDisconnected()
|
||||
{
|
||||
INFO_LOG(m_logger) << "Wls socket disconnected";
|
||||
INFO_LOG() << "Wls socket disconnected";
|
||||
m_webSocketReconnectTimer->start(5000);
|
||||
m_sendToWls->onWlsDisconnected();
|
||||
|
||||
@@ -86,7 +85,7 @@ void WlsDispatcher::onWebSocketError()
|
||||
if (!m_webSocket)
|
||||
return;
|
||||
if (!m_bWarnedOnce)
|
||||
WARNING_LOG(m_logger) << "Error connecting to " << webSocketUrl().toString() << ": " << m_webSocket->errorString();
|
||||
WARNING_LOG() << "Error connecting to " << webSocketUrl().toString() << ": " << m_webSocket->errorString();
|
||||
m_webSocket->close();
|
||||
m_webSocketReconnectTimer->start(5000);
|
||||
m_bWarnedOnce = true;
|
||||
@@ -102,7 +101,7 @@ void WlsDispatcher::onTextMessageReceived(const QString &message)
|
||||
|
||||
void WlsDispatcher::onParticipantLicenseChange(const TrainingAreaBase::TetraIcd::ParticipantLicenseChange &lc)
|
||||
{
|
||||
INFO_LOG(m_logger) << "onParticipantLicenseChange id=" << lc.id()
|
||||
INFO_LOG() << "onParticipantLicenseChange id=" << lc.id()
|
||||
<< " equipmentNumber=" << lc.equipmentNumber;
|
||||
m_recvFromWls->participantLicenseChange(lc);
|
||||
}
|
||||
|
||||
+1
-3
@@ -6,7 +6,7 @@
|
||||
#include <QObject>
|
||||
#include <QWebSocket>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include "logger.h"
|
||||
|
||||
class QTimer;
|
||||
@@ -52,8 +52,6 @@ private:
|
||||
QWebSocket *m_webSocket;
|
||||
QTimer *m_webSocketReconnectTimer;
|
||||
bool m_bWarnedOnce;
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
+7
-8
@@ -19,7 +19,6 @@ WlsHandlerRx::WlsHandlerRx(const std::shared_ptr<TrainingAreaBase::RecvFromTab>
|
||||
: m_rxHandler(recvFromTabCb)
|
||||
, m_dispatcher(dispatcher)
|
||||
, m_bWarnedOnce(false)
|
||||
, m_logger(getLogger("WlsHandlerRx"))
|
||||
{}
|
||||
|
||||
bool WlsHandlerRx::handleTelegram(const QByteArray &baJson)
|
||||
@@ -29,7 +28,7 @@ bool WlsHandlerRx::handleTelegram(const QByteArray &baJson)
|
||||
if (baJson.isEmpty())
|
||||
return false;
|
||||
const QJsonObject obj = QJsonDocument::fromJson(baJson).object();
|
||||
TRACE_LOG(m_logger) << "incoming telegram: " << baJson;
|
||||
TRACE_LOG() << "incoming telegram: " << baJson;
|
||||
|
||||
|
||||
|
||||
@@ -44,7 +43,7 @@ bool WlsHandlerRx::handleTelegram(const QByteArray &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 false;
|
||||
}
|
||||
const QJsonObject data = obj.value(QStringLiteral("data")).toObject();
|
||||
@@ -71,7 +70,7 @@ bool WlsHandlerRx::handleTelegram(const QByteArray &baJson)
|
||||
}
|
||||
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 false;
|
||||
}
|
||||
return true;
|
||||
@@ -188,7 +187,7 @@ bool WlsHandlerRx::handleTelegram(TrainingAreaBase::TetraIcd::TrainingAreaTelegr
|
||||
rxData(toSpecialized<ParticipantConfigurationReport>(tabTele));
|
||||
break;
|
||||
default:
|
||||
ERROR_LOG(m_logger) << "WlsHandlerRx::handleTelegram no Handler for " << tabTele->id();
|
||||
ERROR_LOG() << "WlsHandlerRx::handleTelegram no Handler for " << tabTele->id();
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
@@ -211,7 +210,7 @@ void WlsHandlerRx::sfmData(const TrainingAreaBase::TetraIcd::WlsBinarySfmData &d
|
||||
{
|
||||
if (data.payload.size() < 2)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Invalid binary data from WLS: " << QJsonDocument(data.toJson()).toJson(QJsonDocument::Compact);
|
||||
ERROR_LOG() << "Invalid binary data from WLS: " << QJsonDocument(data.toJson()).toJson(QJsonDocument::Compact);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -223,7 +222,7 @@ void WlsHandlerRx::sfmData(const TrainingAreaBase::TetraIcd::WlsBinarySfmData &d
|
||||
TrainingAreaBase::TetraIcd::TrainingAreaTelegram *tabTele = CoPrtCnvTelegramConverter::convertToTabTele(&radio);
|
||||
if (!tabTele)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Can not convert binary sfm data to a valid tetra telegram - ignoring ("
|
||||
WARNING_LOG() << "Can not convert binary sfm data to a valid tetra telegram - ignoring ("
|
||||
<< data.header.equipmentNumber << "): " << QByteArray::fromRawData(reinterpret_cast<const char *>(data.payload.data()),
|
||||
data.payload.size()).toHex();
|
||||
return;
|
||||
@@ -239,7 +238,7 @@ void WlsHandlerRx::rxData(const T &data)
|
||||
{
|
||||
if (!m_bWarnedOnce)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "No RecvFromTab available";
|
||||
ERROR_LOG() << "No RecvFromTab available";
|
||||
m_bWarnedOnce = true;
|
||||
}
|
||||
return;
|
||||
|
||||
-1
@@ -36,6 +36,5 @@ private:
|
||||
QSet<int> m_licensedEquipmentNumbers;
|
||||
WlsDispatcher *m_dispatcher;
|
||||
bool m_bWarnedOnce;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
+2
-3
@@ -19,7 +19,6 @@ WlsHandlerTx::WlsHandlerTx(TrainingAreaBase::Plugin::DataProvider *pdp, WlsDispa
|
||||
, m_webSocket(nullptr)
|
||||
, m_dispatcher(dispatcher)
|
||||
, m_bWlsConnectedToExternalSystem(false)
|
||||
, m_logger(getLogger("WlsHandlerTx"))
|
||||
{}
|
||||
|
||||
void WlsHandlerTx::onWlsConnected(QWebSocket *webSocket)
|
||||
@@ -302,7 +301,7 @@ bool WlsHandlerTx::txData(const TrainingAreaBase::TetraIcd::UAVPerformMission &d
|
||||
|
||||
void WlsHandlerTx::onParticipantConnectionState(int equipmentNumber, bool dataCommunicationPossible)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onParticipantConnectionState - " << equipmentNumber
|
||||
DEBUG_LOG() << "onParticipantConnectionState - " << equipmentNumber
|
||||
<< ", communication possible: " << dataCommunicationPossible;
|
||||
m_dataCommunicationPossible[equipmentNumber] = dataCommunicationPossible;
|
||||
}
|
||||
@@ -343,7 +342,7 @@ bool WlsHandlerTx::sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTelegr
|
||||
|
||||
const QByteArray ba = QJsonDocument(obj).toJson(QJsonDocument::Compact);
|
||||
if (data->id() != TrainingAreaBase::TetraIcd::TelegramId::BESTAETIGUNG)
|
||||
DEBUG_LOG(m_logger) << "Sending tele: " << ba;
|
||||
DEBUG_LOG() << "Sending tele: " << ba;
|
||||
m_webSocket->sendTextMessage(QString::fromUtf8(ba));
|
||||
if (!bIsAlreadyLogged)
|
||||
emit m_dispatcher->wlsTelegramSent(data);
|
||||
|
||||
-3
@@ -79,8 +79,5 @@ private:
|
||||
QWebSocket *m_webSocket;
|
||||
WlsDispatcher *m_dispatcher;
|
||||
bool m_bWlsConnectedToExternalSystem;
|
||||
LOGGER_T m_logger;
|
||||
|
||||
|
||||
};
|
||||
}
|
||||
Reference in new issue
Block a user