Merge story/release-validation-scope

Bring the validation-scope line (in-tree Jenkins CI copy, lcov coverage
wiring, step-by-step release-scope README, TetraIF unit tests, the
LogView runtime icon/resource fix, Dockerfile, rpmbuild and the
new_docker_build.sh driver with the DEB output path) on top of the
XmlPatterns branch pruned to the Release 2 scope.

Conflict policy:
- Out-of-scope targets/modules: keep the prune (deletion wins).
- In-scope files that validation had deleted: restored from
  story/release-2-cleanup (the Release 2 closure, with the
  pruned-module guards).
- In-scope sources carrying migration work: XmlPatterns versions
  (Qt XmlPatterns rework on QDomDocument, DDS member and logger
  fixes, first-build fixes).
- Scope-aware CMakeLists (top level, PluginInterfaces, LtsWidgets)
  and .envrc: story/release-2-cleanup / ours versions.
This commit is contained in:
berrux-dev committed 2026-11-16 18:49:14 +01:00
commit cfe15c72c4
521 files changed
+37159 -36635

No files matched your search

@@ -1,5 +1,10 @@
/**
* @RDE_HEADER@
* $Id: $
* $HeadURL: $
* $Author: $
* Created by Steve K., ESZS 12-01-2026
*/
#pragma once
@@ -1,5 +1,11 @@
/**
* @RDE_HEADER@
* FlmHandler for UFomHlaJson Plugin
* $Id: pdm_handler.h 62304 2024-03-21 08:17:45Z ewert_j $
* $HeadURL: svn://slssvn/TDS/branches/product/features/ufom/Lts/Proxies/TrainingAreaBase/Plugins/UFomHlaJson/pdm_handler.h $
* $Author: ewert_j $
* Created by Julius Ewert, ESIM, 2024-03-20
*/
#pragma once
@@ -1,5 +1,11 @@
/**
* @RDE_HEADER@
* JsonHandlerRx for AdlerJson Plugin
* $Id: hla_handler_rx.h 62304 2024-03-21 08:17:45Z ewert_j $
* $HeadURL: svn://slssvn/TDS/branches/product/features/ufom/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/hla_handler_rx.h $
* $Author: ewert_j $
* Created by Julius Ewert, ESIM, 2024-03-20
*/
#pragma once
@@ -1,5 +1,11 @@
/**
* @RDE_HEADER@
* HlaHandlerTx for AdlerJson Plugin
* $Id: hla_handler_tx.h 62304 2024-03-21 08:17:45Z ewert_j $
* $HeadURL: svn://slssvn/TDS/branches/product/features/ufom/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/hla_handler_tx.h $
* $Author: ewert_j $
* Created by Julius Ewert, ESIM, 2024-03-20
*/
#pragma once
@@ -1,5 +1,11 @@
/**
* @RDE_HEADER@
* Logger for AdlerJson Plugin
* $Id: logger.cpp 62304 2024-03-21 08:17:45Z ewert_j $
* $HeadURL: svn://slssvn/TDS/branches/product/features/ufom/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/logger.cpp $
* $Author: ewert_j $
* Created by Julius Ewert, ESIM, 2024-03-20
*/
#include "logger.h"
@@ -1,5 +1,11 @@
/**
* @RDE_HEADER@
* Logger for AdlerJson Plugin
* $Id: logger.h 62304 2024-03-21 08:17:45Z ewert_j $
* $HeadURL: svn://slssvn/TDS/branches/product/features/ufom/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/logger.h $
* $Author: ewert_j $
* Created by Julius Ewert, ESIM, 2024-03-20
*/
#pragma once
@@ -1,5 +1,11 @@
/**
* @RDE_HEADER@
* PdmHandler for AdlerJson Plugin
* $Id: pdm_handler.h 62304 2024-03-21 08:17:45Z ewert_j $
* $HeadURL: svn://slssvn/TDS/branches/product/features/ufom/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/pdm_handler.h $
* $Author: ewert_j $
* Created by Julius Ewert, ESIM, 2024-03-20
*/
#pragma once
@@ -1,5 +1,11 @@
/**
* @RDE_HEADER@
* TabAdlerPlugin for AdlerJson Plugin
* $Id: plugin.cpp 62304 2024-03-21 08:17:45Z ewert_j $
* $HeadURL: svn://slssvn/TDS/branches/product/features/ufom/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/plugin.cpp $
* $Author: ewert_j $
* Created by Julius Ewert, ESIM, 2024-03-20
*/
#include "plugin.h"
#include "main_dispatcher.h"
@@ -1,5 +1,11 @@
/**
* @RDE_HEADER@
* TabAdlerPlugin for AdlerJson Plugin
* $Id: plugin.h 62304 2024-03-21 08:17:45Z ewert_j $
* $HeadURL: svn://slssvn/TDS/branches/product/features/ufom/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/plugin.h $
* $Author: ewert_j $
* Created by Julius Ewert, ESIM, 2024-03-20
*/
#pragma once
@@ -1,5 +1,11 @@
/**
* @RDE_HEADER@
* Building Config - logging facility
* $Id$
* $HeadURL$
* $Author$
* Created by Christian Ehrlicher, SLSE, 2016-04-14
*/
#include "logger.h"
@@ -1,5 +1,11 @@
/**
* @RDE_HEADER@
* Logging for TrainingAreaBase
* $Id$
* $HeadURL$
* $Author$
* Created by Christian Ehrlicher, SLSE, 2016-04-14
*/
#pragma once
@@ -4,38 +4,5 @@
# $Author$
#
IF (NOT BUILD_RPM)
ADD_SUBDIRECTORY(DebugJsonDir)
ENDIF()
#ADD_SUBDIRECTORY(Spu)
IF (BUILD_WLS)
ADD_SUBDIRECTORY(WlsTetra)
ELSE()
ADD_SUBDIRECTORY(TetraJson)
ENDIF()
IF ("${_pname}" STREQUAL "commaster")
ADD_SUBDIRECTORY(Nmea)
ENDIF()
IF (BUILD_SV AND DEFINED _pname)
IF ("${_pname}" STREQUAL "guez")
ADD_SUBDIRECTORY(HlaJson)
ENDIF()
ENDIF()
IF (BUILD_SVC_HLA)
IF ("${_pname}" STREQUAL "ahtc")
ADD_SUBDIRECTORY(ApacheHlaJson)
ENDIF()
ENDIF()
ADD_SUBDIRECTORY(AdlerJson)
OPTION(BUILD_UAS_PROXY "Build the UAS TAB Plugin (default: OFF) [needs BUILD_SV = ON and UNIX-like OS]" OFF) # TODO: use 'pname = guez' if done
if (BUILD_SV AND BUILD_UAS_PROXY AND NOT WIN32)
add_subdirectory(UAS)
endif()
# Release scope: only the TetraJson plugin is in the tree (GUEZ project, no RTI)
ADD_SUBDIRECTORY(TetraJson)
@@ -1,5 +1,11 @@
/**
* @RDE_HEADER@
* Building Config - logging facility
* $Id$
* $HeadURL$
* $Author$
* Created by Christian Ehrlicher, SLSE, 2016-04-14
*/
#include "logger.h"
@@ -1,5 +1,11 @@
/**
* @RDE_HEADER@
* Logging for TrainingAreaBase
* $Id$
* $HeadURL$
* $Author$
* Created by Christian Ehrlicher, SLSE, 2016-04-14
*/
#pragma once
@@ -1,5 +1,11 @@
/**
* @RDE_HEADER@
* Building Config - logging facility
* $Id$
* $HeadURL$
* $Author$
* Created by Christian Ehrlicher, SLSE, 2016-04-14
*/
#include "logger.h"
@@ -1,5 +1,11 @@
/**
* @RDE_HEADER@
* Logging for TrainingAreaBase
* $Id$
* $HeadURL$
* $Author$
* Created by Christian Ehrlicher, SLSE, 2016-04-14
*/
#pragma once
@@ -32,6 +32,7 @@ NGL_ADD_LIBRARY(AAR SV tabPluginTetraJson MODULE ${SRCS})
NGL_INSTALL_TARGET(tabPluginTetraJson)
NGL_TARGET_LINK_LIBRARIES(tabPluginTetraJson
CoPrtCnv
LogViewLogger
NGLLogger
nglsettings
Qt6::Core
@@ -9,27 +9,27 @@
class XDR_Wrapper_it;
namespace TetraRadio
{
class ConvertFromJson
{
public:
explicit ConvertFromJson(const std::shared_ptr<TrainingAreaBase::RecvFromTab> &rxHandler, const char *loggerName);
virtual ~ConvertFromJson() = default;
class ConvertFromJson
{
public:
explicit ConvertFromJson(const std::shared_ptr<TrainingAreaBase::RecvFromTab> &rxHandler, const char *loggerName);
virtual ~ConvertFromJson() = default;
protected:
bool handleTelegram(const QByteArray &baJson, int &recvCounter);
virtual void handleAcknowledge(qint64 timeStamp, int counter) = 0;
virtual void handleTetraConnectionChanged(bool bConnected) = 0;
private:
template<typename T>
void rxData(const T &data);
protected:
bool handleTelegram(const QByteArray &baJson, int &recvCounter);
virtual void handleAcknowledge(qint64 timeStamp, int counter) = 0;
virtual void handleTetraConnectionChanged(bool bConnected) = 0;
private:
static TrainingAreaBase::TetraIcd::BiteError convertBiteError(const QJsonObject &obj);
std::shared_ptr<TrainingAreaBase::RecvFromTab> m_rxHandler;
protected:
NGL::INGLLogger &m_logger;
bool m_bWarnedOnce;
};
private:
template <typename T> void rxData(const T &data);
}
private:
static TrainingAreaBase::TetraIcd::BiteError convertBiteError(const QJsonObject &obj);
std::shared_ptr<TrainingAreaBase::RecvFromTab> m_rxHandler;
protected:
NGL::INGLLogger &m_logger;
bool m_bWarnedOnce;
};
}
@@ -9,74 +9,78 @@
namespace TetraRadio
{
class ConvertToJson final : public QObject, public TrainingAreaBase::SendToTab
{
Q_OBJECT
public:
explicit ConvertToJson(const char *loggerName);
~ConvertToJson();
class ConvertToJson final
: public QObject
, public TrainingAreaBase::SendToTab
{
Q_OBJECT
public:
explicit ConvertToJson(const char *loggerName);
~ConvertToJson();
const char *name() const override { return "Tetra"; }
HandleState canHandleTelegram(int equipmentNumber, int telegramId) const override;
void resetSendCounter() override;
bool sendTele(const QByteArray &ba);
const char *name() const override { return "Tetra"; }
HandleState canHandleTelegram(int equipmentNumber, int telegramId) const override;
void resetSendCounter() override;
bool sendTele(const QByteArray &ba);
void setConnected(bool bConnected) { m_bConnected = bConnected; }
public:
bool txData(const TrainingAreaBase::TetraIcd::Acknowledge &data) override;
bool txData(const TrainingAreaBase::TetraIcd::DemandBite &data) override;
bool txData(const TrainingAreaBase::TetraIcd::Init &data) override;
bool txData(const TrainingAreaBase::TetraIcd::SetVulnerabilityModel &data) override;
bool txData(const TrainingAreaBase::TetraIcd::DemandEquipmentConfigurationReport &data) override;
bool txData(const TrainingAreaBase::TetraIcd::DemandVulnerabilityStateChange &data) override;
bool txData(const TrainingAreaBase::TetraIcd::LanguageSelection &data) override;
bool txData(const TrainingAreaBase::TetraIcd::EquipmentMessage &data) override;
bool txData(const TrainingAreaBase::TetraIcd::EquipmentMessageOC &data) override;
bool txData(const TrainingAreaBase::TetraIcd::CreateSingleExplosion &data) override;
bool txData(const TrainingAreaBase::TetraIcd::CreateAreaExplosion &data) override;
bool txData(const TrainingAreaBase::TetraIcd::CreateMineArea &data) override;
bool txData(const TrainingAreaBase::TetraIcd::MineAreaSingleMineState &data) override;
bool txData(const TrainingAreaBase::TetraIcd::CreateNContamination &data) override;
bool txData(const TrainingAreaBase::TetraIcd::CreateCContamination &data) override;
bool txData(const TrainingAreaBase::TetraIcd::DeactivateEffectSimulation &data) override;
bool txData(const TrainingAreaBase::TetraIcd::ModifyAreaEffectSimulationName &data) override;
bool txData(const TrainingAreaBase::TetraIcd::PauseEffectSimulation &data) override;
bool txData(const TrainingAreaBase::TetraIcd::ResumeEffectSimulation &data) override;
bool txData(const TrainingAreaBase::TetraIcd::MineTriggered &data) override;
bool txData(const TrainingAreaBase::TetraIcd::DusMineReactivation &data) override;
bool txData(const TrainingAreaBase::TetraIcd::CreateFunctionalArea &data) override;
bool txData(const TrainingAreaBase::TetraIcd::CreateDusSingleMine &data) override;
bool txData(const TrainingAreaBase::TetraIcd::ExerciseEnvironmentData &data) override;
bool txData(const TrainingAreaBase::TetraIcd::ExerciseStateData &data) override;
bool txData(const TrainingAreaBase::TetraIcd::ParticipantSwVersionsRequest &data) override;
bool txData(const TrainingAreaBase::TetraIcd::OpaquePayloadDataOut &data) override;
bool txData(const TrainingAreaBase::TetraIcd::TechnicalArea &data) override;
bool txData(const TrainingAreaBase::TetraIcd::CesHitInformation &data) override;
bool txData(const TrainingAreaBase::TetraIcd::CesHitRequest &data) override;
bool txData(const TrainingAreaBase::TetraIcd::ParticipantMode &data) override;
bool txData(const TrainingAreaBase::TetraIcd::DemandParticipantMode &data) override;
bool txData(const TrainingAreaBase::TetraIcd::ParticipantConfiguration &data) override;
bool txData(const TrainingAreaBase::TetraIcd::DemandParticipantConfiguration &data) override;
bool txData(const TrainingAreaBase::TetraIcd::ExerciseEquipmentAssignmentComplete &data) override;
bool txData(const TrainingAreaBase::TetraIcd::Sanitation &data) override;
bool txData(const TrainingAreaBase::TetraIcd::SelectiveReammunition &data) override;
bool txData(const TrainingAreaBase::TetraIcd::SetDevicePowerRequest &data) override;
bool txData(const TrainingAreaBase::TetraIcd::OcCommand &data) override;
bool txData(const TrainingAreaBase::TetraIcd::UAVPerformMission &data) override;
bool txData(const TrainingAreaBase::TetraIcd::UAVChangeState &) override ;
bool txData(const TrainingAreaBase::TetraIcd::ExFireReadiness &) override { return false; };
bool txData(const TrainingAreaBase::TetraIcd::ExFiredReport &) override { return false; };
bool txData(const TrainingAreaBase::TetraIcd::ExConfirmationReport &) override { return false; };
void setConnected(bool bConnected) { m_bConnected = bConnected; }
bool sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *data);
Q_SIGNALS:
void outgoingMessage(const QByteArray &msg);
protected:
protected:
NGL::INGLLogger &m_logger;
int m_sendCounter;
bool m_bConnected;
};
public:
bool txData(const TrainingAreaBase::TetraIcd::Acknowledge &data) override;
bool txData(const TrainingAreaBase::TetraIcd::DemandBite &data) override;
bool txData(const TrainingAreaBase::TetraIcd::Init &data) override;
bool txData(const TrainingAreaBase::TetraIcd::SetVulnerabilityModel &data) override;
bool txData(const TrainingAreaBase::TetraIcd::DemandEquipmentConfigurationReport &data) override;
bool txData(const TrainingAreaBase::TetraIcd::DemandVulnerabilityStateChange &data) override;
bool txData(const TrainingAreaBase::TetraIcd::LanguageSelection &data) override;
bool txData(const TrainingAreaBase::TetraIcd::EquipmentMessage &data) override;
bool txData(const TrainingAreaBase::TetraIcd::EquipmentMessageOC &data) override;
bool txData(const TrainingAreaBase::TetraIcd::CreateSingleExplosion &data) override;
bool txData(const TrainingAreaBase::TetraIcd::CreateAreaExplosion &data) override;
bool txData(const TrainingAreaBase::TetraIcd::CreateMineArea &data) override;
bool txData(const TrainingAreaBase::TetraIcd::MineAreaSingleMineState &data) override;
bool txData(const TrainingAreaBase::TetraIcd::CreateNContamination &data) override;
bool txData(const TrainingAreaBase::TetraIcd::CreateCContamination &data) override;
bool txData(const TrainingAreaBase::TetraIcd::DeactivateEffectSimulation &data) override;
bool txData(const TrainingAreaBase::TetraIcd::ModifyAreaEffectSimulationName &data) override;
bool txData(const TrainingAreaBase::TetraIcd::PauseEffectSimulation &data) override;
bool txData(const TrainingAreaBase::TetraIcd::ResumeEffectSimulation &data) override;
bool txData(const TrainingAreaBase::TetraIcd::MineTriggered &data) override;
bool txData(const TrainingAreaBase::TetraIcd::DusMineReactivation &data) override;
bool txData(const TrainingAreaBase::TetraIcd::CreateFunctionalArea &data) override;
bool txData(const TrainingAreaBase::TetraIcd::CreateDusSingleMine &data) override;
bool txData(const TrainingAreaBase::TetraIcd::ExerciseEnvironmentData &data) override;
bool txData(const TrainingAreaBase::TetraIcd::ExerciseStateData &data) override;
bool txData(const TrainingAreaBase::TetraIcd::ParticipantSwVersionsRequest &data) override;
bool txData(const TrainingAreaBase::TetraIcd::OpaquePayloadDataOut &data) override;
bool txData(const TrainingAreaBase::TetraIcd::TechnicalArea &data) override;
bool txData(const TrainingAreaBase::TetraIcd::CesHitInformation &data) override;
bool txData(const TrainingAreaBase::TetraIcd::CesHitRequest &data) override;
bool txData(const TrainingAreaBase::TetraIcd::ParticipantMode &data) override;
bool txData(const TrainingAreaBase::TetraIcd::DemandParticipantMode &data) override;
bool txData(const TrainingAreaBase::TetraIcd::ParticipantConfiguration &data) override;
bool txData(const TrainingAreaBase::TetraIcd::DemandParticipantConfiguration &data) override;
bool txData(const TrainingAreaBase::TetraIcd::ExerciseEquipmentAssignmentComplete &data) override;
bool txData(const TrainingAreaBase::TetraIcd::Sanitation &data) override;
bool txData(const TrainingAreaBase::TetraIcd::SelectiveReammunition &data) override;
bool txData(const TrainingAreaBase::TetraIcd::SetDevicePowerRequest &data) override;
bool txData(const TrainingAreaBase::TetraIcd::OcCommand &data) override;
bool txData(const TrainingAreaBase::TetraIcd::UAVPerformMission &data) override;
bool txData(const TrainingAreaBase::TetraIcd::UAVChangeState &) override;
bool txData(const TrainingAreaBase::TetraIcd::ExFireReadiness &) override { return false; };
bool txData(const TrainingAreaBase::TetraIcd::ExFiredReport &) override { return false; };
bool txData(const TrainingAreaBase::TetraIcd::ExConfirmationReport &) override { return false; };
bool sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *data);
Q_SIGNALS:
void outgoingMessage(const QByteArray &msg);
protected:
protected:
NGL::INGLLogger &m_logger;
int m_sendCounter;
bool m_bConnected;
};
}
@@ -11,58 +11,56 @@
namespace TetraRadio
{
class TetraJsonPlugin : public QObject, public TrainingAreaBase::Plugin::Plugin
{
Q_OBJECT
Q_PLUGIN_METADATA(IID "special:3:tab.jsonsocket")
Q_INTERFACES(TrainingAreaBase::Plugin::Plugin)
public:
TetraJsonPlugin() = default;
~TetraJsonPlugin() = default;
std::shared_ptr<TrainingAreaBase::Plugin::Interface> createInterface(TrainingAreaBase::Plugin::DataProvider *pdp,
const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb,
const std::shared_ptr<TrainingAreaBase::TxMixin> &sendToTabCb,
const std::shared_ptr<TrainingAreaBase::DdsHandler> &,
NGL::Settings *settings) override;
};
class SocketDispatcher;
class TetraJsonInterfaceImpl final : public TrainingAreaBase::Plugin::Interface
{
Q_OBJECT
public:
TetraJsonInterfaceImpl(TrainingAreaBase::Plugin::DataProvider *pdp,
const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb,
NGL::Settings *settings);
~TetraJsonInterfaceImpl();
bool init() override;
std::shared_ptr<TrainingAreaBase::SendToTab> sendToTab() override;
bool isDebugInterface() const override
class TetraJsonPlugin
: public QObject
, public TrainingAreaBase::Plugin::Plugin
{
return false;
}
bool canSendData() const override;
void exerciseChanged() override;
const char *name() const override { return "TETRA"; }
private Q_SLOTS:
void onTetraConnectionChanged(bool bConnected);
private:
NGL::INGLLogger &m_logger;
void cleanupProcess();
static QString iniFileIn();
QString iniFileOut() const;
static QString iniPath();
static QString playerIdsFile();
bool updatePrtCnv();
bool checkConfigTemplates();
bool startPrtCnv();
Q_OBJECT
Q_PLUGIN_METADATA(IID "special:3:tab.jsonsocket")
Q_INTERFACES(TrainingAreaBase::Plugin::Plugin)
public:
TetraJsonPlugin() = default;
~TetraJsonPlugin() = default;
std::shared_ptr<TrainingAreaBase::Plugin::Interface> createInterface(TrainingAreaBase::Plugin::DataProvider *pdp,
const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb,
const std::shared_ptr<TrainingAreaBase::TxMixin> &sendToTabCb,
const std::shared_ptr<TrainingAreaBase::DdsHandler> &,
NGL::Settings *settings) override;
};
private:
std::unique_ptr<SocketDispatcher> m_socketDispatcher;
TrainingAreaBase::Plugin::DataProvider *m_pdp;
PrtCnv::PrtCnvApplication *m_prtCnvApp;
int m_exerciseId;
int m_radioGrpId;
};
}
class SocketDispatcher;
class TetraJsonInterfaceImpl final : public TrainingAreaBase::Plugin::Interface
{
Q_OBJECT
public:
TetraJsonInterfaceImpl(TrainingAreaBase::Plugin::DataProvider *pdp, const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb, NGL::Settings *settings);
~TetraJsonInterfaceImpl();
bool init() override;
std::shared_ptr<TrainingAreaBase::SendToTab> sendToTab() override;
bool isDebugInterface() const override { return false; }
bool canSendData() const override;
void exerciseChanged() override;
const char *name() const override { return "TETRA"; }
private Q_SLOTS:
void onTetraConnectionChanged(bool bConnected);
private:
NGL::INGLLogger &m_logger;
void cleanupProcess();
static QString iniFileIn();
QString iniFileOut() const;
static QString iniPath();
static QString playerIdsFile();
bool updatePrtCnv();
bool checkConfigTemplates();
bool startPrtCnv();
private:
std::unique_ptr<SocketDispatcher> m_socketDispatcher;
TrainingAreaBase::Plugin::DataProvider *m_pdp;
PrtCnv::PrtCnvApplication *m_prtCnvApp;
int m_exerciseId;
int m_radioGrpId;
};
}
@@ -10,128 +10,117 @@ namespace TetraRadio
{
SocketDispatcher::SocketDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb)
: QObject()
, ConvertFromJson(recvFromTabCb, "TAB.Plugin.SocketDispatcher")
, m_txHandler(std::make_shared<ConvertToJson>("TxSocketHandler"))
, m_dataProvider(pdp)
, m_prtCnvApp(nullptr)
, m_ackTimer(new QTimer(this))
, m_bInitialAck(false)
, m_receiveCounter(0)
{
m_ackTimer->setInterval(1000);
m_ackTimer->setSingleShot(false);
connect(m_ackTimer, &QTimer::timeout,
this, &SocketDispatcher::onAckTimeout);
}
SocketDispatcher::~SocketDispatcher()
{
delete m_ackTimer;
}
bool SocketDispatcher::init(PrtCnv::PrtCnvApplication *prtCnvApp)
{
if (m_prtCnvApp == prtCnvApp)
return true;
if (m_prtCnvApp)
m_prtCnvApp->disconnect(this);
m_prtCnvApp = prtCnvApp;
if (m_prtCnvApp)
SocketDispatcher::SocketDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp, const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb)
: QObject()
, ConvertFromJson(recvFromTabCb, "TAB.Plugin.SocketDispatcher")
, m_txHandler(std::make_shared<ConvertToJson>("TxSocketHandler"))
, m_dataProvider(pdp)
, m_prtCnvApp(nullptr)
, m_ackTimer(new QTimer(this))
, m_bInitialAck(false)
, m_receiveCounter(0)
{
connect(m_txHandler.get(), &ConvertToJson::outgoingMessage,
m_prtCnvApp, &PrtCnv::PrtCnvApplication::textMessageFromCentralToPrtCnv);
connect(m_prtCnvApp, &PrtCnv::PrtCnvApplication::textMessageFromPrtCnvToCentral,
this, &SocketDispatcher::onTextMessageReceived);
connect(m_prtCnvApp, &PrtCnv::PrtCnvApplication::warehouseMessageFromPtrCnv,
this, &SocketDispatcher::warehouseMessage);
m_ackTimer->start();
m_bInitialAck = true;
m_ackTimer->setInterval(1000);
m_ackTimer->setSingleShot(false);
connect(m_ackTimer, &QTimer::timeout, this, &SocketDispatcher::onAckTimeout);
}
else
SocketDispatcher::~SocketDispatcher()
{
m_bInitialAck = false;
m_ackTimer->stop();
delete m_ackTimer;
}
return true;
}
quint16 SocketDispatcher::randomListenPort() const
{
QTcpServer *s = new QTcpServer;
s->listen(QHostAddress::Any, 0);
while (!s->isListening())
QCoreApplication::processEvents();
quint16 port = s->serverPort();
delete s;
return port;
}
std::shared_ptr<TrainingAreaBase::SendToTab> SocketDispatcher::sendToTab()
{
return std::static_pointer_cast<TrainingAreaBase::SendToTab>(m_txHandler);
}
void SocketDispatcher::onTextMessageReceived(const QByteArray &message)
{
DEBUG_LOG(m_logger) << "TetraJson onTextMessageReceived: '" << message << "'";
int newRecvCounter = 0;
if (!handleTelegram(message, newRecvCounter))
return;
m_receiveCounter = newRecvCounter;
}
void SocketDispatcher::handleTetraConnectionChanged(bool bConnected)
{
emit tetraConnectionChanged(bConnected);
}
void SocketDispatcher::handleAcknowledge(qint64 timeStamp, int counter)
{
TRACE_LOG(m_logger) << "Ack from Socket for time " << timeStamp
<< " with counter " << counter
<< ", initial: " << m_bInitialAck;
if (m_bInitialAck)
bool SocketDispatcher::init(PrtCnv::PrtCnvApplication *prtCnvApp)
{
m_txHandler->setConnected(true);
m_bInitialAck = false;
onSendInitialData();
}
}
void SocketDispatcher::onAckTimeout()
{
TrainingAreaBase::TetraIcd::Acknowledge ack;
ack.timeStamp = time(nullptr) * 1000;
ack.ackCounter = m_receiveCounter;
m_txHandler->txData(ack);
}
void SocketDispatcher::onSendInitialData()
{
if (m_dataProvider)
{
NOTICE_LOG(m_logger) << "sending initial data exerciseId=" << m_dataProvider->exerciseId();
if (m_dataProvider->exerciseId() > 0)
if (m_prtCnvApp == prtCnvApp)
return true;
if (m_prtCnvApp)
m_prtCnvApp->disconnect(this);
m_prtCnvApp = prtCnvApp;
if (m_prtCnvApp)
{
m_txHandler->txData(m_dataProvider->exerciseEnvironmentData());
connect(m_txHandler.get(), &ConvertToJson::outgoingMessage, m_prtCnvApp, &PrtCnv::PrtCnvApplication::textMessageFromCentralToPrtCnv);
connect(m_prtCnvApp, &PrtCnv::PrtCnvApplication::textMessageFromPrtCnvToCentral, this, &SocketDispatcher::onTextMessageReceived);
connect(m_prtCnvApp, &PrtCnv::PrtCnvApplication::warehouseMessageFromPtrCnv, this, &SocketDispatcher::warehouseMessage);
m_ackTimer->start();
m_bInitialAck = true;
}
m_txHandler->txData(m_dataProvider->exerciseStateData());
m_txHandler->txData(m_dataProvider->exerciseEquipmentAssignment());
const auto &aesTeles = m_dataProvider->aesTelegrams();
for (TrainingAreaBase::TetraIcd::TrainingAreaTelegram *aesTele : aesTeles)
m_txHandler->sendToTx(aesTele);
else
{
m_bInitialAck = false;
m_ackTimer->stop();
}
return true;
}
}
}
quint16 SocketDispatcher::randomListenPort() const
{
QTcpServer *s = new QTcpServer;
s->listen(QHostAddress::Any, 0);
while (!s->isListening())
QCoreApplication::processEvents();
quint16 port = s->serverPort();
delete s;
return port;
}
std::shared_ptr<TrainingAreaBase::SendToTab> SocketDispatcher::sendToTab()
{
return std::static_pointer_cast<TrainingAreaBase::SendToTab>(m_txHandler);
}
void SocketDispatcher::onTextMessageReceived(const QByteArray &message)
{
DEBUG_LOG(m_logger) << "TetraJson onTextMessageReceived: '" << message << "'";
int newRecvCounter = 0;
if (!handleTelegram(message, newRecvCounter))
return;
m_receiveCounter = newRecvCounter;
}
void SocketDispatcher::handleTetraConnectionChanged(bool bConnected)
{
emit tetraConnectionChanged(bConnected);
}
void SocketDispatcher::handleAcknowledge(qint64 timeStamp, int counter)
{
TRACE_LOG(m_logger) << "Ack from Socket for time " << timeStamp << " with counter " << counter << ", initial: " << m_bInitialAck;
if (m_bInitialAck)
{
m_txHandler->setConnected(true);
m_bInitialAck = false;
onSendInitialData();
}
}
void SocketDispatcher::onAckTimeout()
{
TrainingAreaBase::TetraIcd::Acknowledge ack;
ack.timeStamp = time(nullptr) * 1000;
ack.ackCounter = m_receiveCounter;
m_txHandler->txData(ack);
}
void SocketDispatcher::onSendInitialData()
{
if (m_dataProvider)
{
NOTICE_LOG(m_logger) << "sending initial data exerciseId=" << m_dataProvider->exerciseId();
if (m_dataProvider->exerciseId() > 0)
{
m_txHandler->txData(m_dataProvider->exerciseEnvironmentData());
}
m_txHandler->txData(m_dataProvider->exerciseStateData());
m_txHandler->txData(m_dataProvider->exerciseEquipmentAssignment());
const auto &aesTeles = m_dataProvider->aesTelegrams();
for (TrainingAreaBase::TetraIcd::TrainingAreaTelegram *aesTele : aesTeles)
m_txHandler->sendToTx(aesTele);
}
}
}
@@ -14,36 +14,39 @@
namespace TetraRadio
{
class SocketDispatcher final : public QObject, protected ConvertFromJson
{
Q_OBJECT
public:
explicit SocketDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb);
~SocketDispatcher();
class SocketDispatcher final
: public QObject
, protected ConvertFromJson
{
Q_OBJECT
public:
explicit SocketDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp, const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb);
~SocketDispatcher();
bool init(PrtCnv::PrtCnvApplication *prtCnvApp);
std::shared_ptr<TrainingAreaBase::SendToTab> sendToTab();
quint16 randomListenPort() const;
bool canSendData() const { return m_prtCnvApp != nullptr; }
Q_SIGNALS:
void tetraConnectionChanged(bool bConnected);
void warehouseMessage(const QByteArray &jsonData);
private Q_SLOTS:
void onTextMessageReceived(const QByteArray &message);
void onAckTimeout();
void onSendInitialData();
private:
void disconnectSocket(QWebSocket *s);
void handleTetraConnectionChanged(bool bConnected) override;
void handleAcknowledge(qint64 timeStamp, int counter) override;
private:
std::shared_ptr<ConvertToJson> m_txHandler;
TrainingAreaBase::Plugin::DataProvider *m_dataProvider;
PrtCnv::PrtCnvApplication *m_prtCnvApp;
QTimer *m_ackTimer;
bool m_bInitialAck;
int m_receiveCounter;
};
bool init(PrtCnv::PrtCnvApplication *prtCnvApp);
std::shared_ptr<TrainingAreaBase::SendToTab> sendToTab();
quint16 randomListenPort() const;
bool canSendData() const { return m_prtCnvApp != nullptr; }
Q_SIGNALS:
void tetraConnectionChanged(bool bConnected);
void warehouseMessage(const QByteArray &jsonData);
private Q_SLOTS:
void onTextMessageReceived(const QByteArray &message);
void onAckTimeout();
void onSendInitialData();
}
private:
void disconnectSocket(QWebSocket *s);
void handleTetraConnectionChanged(bool bConnected) override;
void handleAcknowledge(qint64 timeStamp, int counter) override;
private:
std::shared_ptr<ConvertToJson> m_txHandler;
TrainingAreaBase::Plugin::DataProvider *m_dataProvider;
PrtCnv::PrtCnvApplication *m_prtCnvApp;
QTimer *m_ackTimer;
bool m_bInitialAck;
int m_receiveCounter;
};
}
@@ -1,5 +1,11 @@
/**
* @RDE_HEADER@
* Logger
* $Id$
* $HeadURL$
* $Author$
* Created by Mike Wille, ESZS, 2025-10-27
*/
#include "logger.h"
@@ -1,5 +1,11 @@
/**
* @RDE_HEADER@
* Logger
* $Id$
* $HeadURL$
* $Author$
* Created by Mike Wille, ESZS, 2025-10-27
*/
#pragma once
@@ -1,5 +1,11 @@
/**
* @RDE_HEADER@
* Logger
* $Id$
* $HeadURL$
* $Author$
* Created by Mike Wille, ESZS, 2025-04-17
*/
#include "logger.h"
@@ -1,5 +1,11 @@
/**
* @RDE_HEADER@
* Logger
* $Id$
* $HeadURL$
* $Author$
* Created by Mike Wille, ESZS, 2025-04-17
*/
#pragma once
@@ -1,5 +1,11 @@
/**
* @RDE_HEADER@
* Building Config - logging facility
* $Id$
* $HeadURL$
* $Author$
* Created by Christian Ehrlicher, SLSE, 2016-04-14
*/
#include "logger.h"
@@ -1,5 +1,11 @@
/**
* @RDE_HEADER@
* Logging for TrainingAreaBase
* $Id$
* $HeadURL$
* $Author$
* Created by Christian Ehrlicher, SLSE, 2016-04-14
*/
#pragma once