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:
commit
cfe15c72c4
521 files changed
+37159
-36635
No files matched your search
@@ -16,9 +16,6 @@ else()
|
||||
endif()
|
||||
|
||||
|
||||
INCLUDE(MacroRTIDDSGen)
|
||||
INCLUDE(MacroCodeGenIdl)
|
||||
|
||||
ADD_SUBDIRECTORY(Plugins)
|
||||
|
||||
SET(xml_FILE tab_service.xml)
|
||||
@@ -36,6 +33,9 @@ SET(SRCS_telegrams
|
||||
training_area_telegrams.h
|
||||
)
|
||||
NGL_ADD_LIBRARY(AAR SV WS HLA tabTelegrams STATIC ${SRCS_telegrams})
|
||||
|
||||
# tabTelegrams is a STATIC lib linked into shared/MODULE targets
|
||||
SET_TARGET_PROPERTIES(tabTelegrams PROPERTIES POSITION_INDEPENDENT_CODE ON)
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(tabTelegrams
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/..
|
||||
@@ -70,34 +70,17 @@ SET(SRCS_common
|
||||
tab_export.h
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
# Generate tab_enums.idl / tab.idl
|
||||
CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
|
||||
# Generate tab_db_impl.cpp/.h, tab_db.h
|
||||
CODEGEN_DATABASE(SRCS_common ${xml_FILE})
|
||||
# Generate *.cpp/*.hpp from idl (only with BUILD_RTI)
|
||||
RTIDDSGEN(SRCS_common tab_enums.idl)
|
||||
# tab.idl includes pdm.idl, so add explicit dependency on pdm.idl generation
|
||||
RTIDDSGEN(SRCS_common tab.idl DEPENDS ${CMAKE_BINARY_DIR}/Lts/Services/ProjectDataManagement/pdm.idl)
|
||||
# Generate tab_dt[s,c]_types.h, tab_ft[s,c]_types.h
|
||||
CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
|
||||
# generate tab_[d|f]tc.h
|
||||
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
|
||||
ELSE()
|
||||
# Stub files for BUILD_RTI=OFF - NO code generation
|
||||
LIST(APPEND SRCS_common
|
||||
stubs/tab_enums_stub.hpp
|
||||
stubs/tab_stub.hpp
|
||||
stubs/tab_db_stub.hpp
|
||||
stubs/tab_topic_type_plugin_stub.cpp
|
||||
)
|
||||
ENDIF()
|
||||
# Stub files (no RTI code generation in the release scope)
|
||||
LIST(APPEND SRCS_common
|
||||
stubs/tab_enums_stub.hpp
|
||||
stubs/tab_stub.hpp
|
||||
stubs/tab_db_stub.hpp
|
||||
stubs/tab_topic_type_plugin_stub.cpp
|
||||
)
|
||||
|
||||
# Create target only if component flags allow
|
||||
NGL_ADD_LIBRARY2(AAR SV WS HLA svcTabCommon SHARED ${SRCS_common})
|
||||
|
||||
# Generate export header ALWAYS (needed for logger.h even if target not built)
|
||||
# Use custom command to create minimal export header if target wasn't created
|
||||
IF(NOT TARGET svcTabCommon)
|
||||
# Create a dummy static library just for export header generation
|
||||
ADD_LIBRARY(svcTabCommon STATIC ${SRCS_common})
|
||||
@@ -121,211 +104,8 @@ NGL_TARGET_LINK_LIBRARIES(svcTabCommon
|
||||
$<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,>
|
||||
LtsUtilsCoreHeaderOnly
|
||||
)
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcTabCommon
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
PUBLIC
|
||||
ddscore
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcTabCommon)
|
||||
|
||||
#
|
||||
# --- Library svcTabClient --------------------------------------------------------------------------------
|
||||
#
|
||||
SET(SRCS_client
|
||||
tab_export.h
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
# generate tab_[d|f]tc_impl.[cpp|h]
|
||||
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
|
||||
ENDIF()
|
||||
|
||||
NGL_ADD_LIBRARY2(AAR SV WS HLA svcTabClient SHARED ${SRCS_client})
|
||||
# NGL_ADD_LIBRARY2 (unlike NGL_ADD_LIBRARY) does not define the
|
||||
# MAKE_<SYMBOL>_LIB compile guard, but the generated tab_[d|f]tc_impl.h
|
||||
# headers require MAKE_SVCTABCLIENT_LIB — same situation as
|
||||
# svcCoreClient/ddscore, which define their guards explicitly.
|
||||
TARGET_COMPILE_DEFINITIONS(svcTabClient PRIVATE MAKE_SVCTABCLIENT_LIB)
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcTabClient
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcTabClient
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
ddsconnector
|
||||
PUBLIC
|
||||
svcTabCommon
|
||||
ddsftc
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcTabClient)
|
||||
|
||||
#
|
||||
# --- Library svcTabServer --------------------------------------------------------------------------------
|
||||
#
|
||||
SET(SRCS_server
|
||||
tx_mixin.cpp
|
||||
tx_mixin.h
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
# generate tab_[d|f]ts.h, tab_[d|f]ts_impl.[cpp|h]
|
||||
CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
|
||||
ENDIF()
|
||||
|
||||
NGL_ADD_LIBRARY2(AAR HLA SV svcTabServer SHARED ${SRCS_server}) # NGL_ADD_LIBRARY2 won't work here - no time for investigations
|
||||
# Generated tab_[d|f]ts_impl.h require MAKE_SVCTABSERVER_LIB (see svcTabClient above).
|
||||
TARGET_COMPILE_DEFINITIONS(svcTabServer PRIVATE MAKE_SVCTABSERVER_LIB)
|
||||
if(BUILD_SV OR BUILD_HLA)
|
||||
GENERATE_EXPORT_HEADER(svcTabServer) # FIXME: quick workaround
|
||||
endif()
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcTabServer
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(svcTabServer
|
||||
PUBLIC
|
||||
svcTabCommon
|
||||
ngldb
|
||||
${_QT_CORE_TARGET}
|
||||
$<IF:$<AND:$<BOOL:${QT6_GUI_AVAILABLE}>,$<TARGET_EXISTS:Qt6::Gui>>,Qt6::Gui,>
|
||||
${_QT_NETWORK_TARGET}
|
||||
)
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcTabServer
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
ddsconnector
|
||||
ddsfts
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcTabServer)
|
||||
|
||||
#
|
||||
# --- Topic Type Plugin --------------------------------------------------------------
|
||||
#
|
||||
IF(BUILD_RTI)
|
||||
CREATE_TOPIC_TYPE_PLUGIN(${xml_FILE})
|
||||
ENDIF()
|
||||
|
||||
#
|
||||
# --- RecordReplayPlugin --------------------------------------------------------------
|
||||
#
|
||||
IF(BUILD_RTI)
|
||||
CREATE_RECORD_REPLAY_PLUGIN_SHARED(${xml_FILE})
|
||||
IF (TARGET tabRecordReplayPlugin)
|
||||
TARGET_SOURCES(tabRecordReplayPlugin
|
||||
PRIVATE
|
||||
tab_record_replay_plugin_custom.cpp
|
||||
tab_record_replay_plugin_custom.h
|
||||
)
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
#
|
||||
# --- Executable svcTrainingAreaBase (sTAB) -------------------------------------------------
|
||||
#
|
||||
SET(SRCS_exe
|
||||
dds_handler.cpp
|
||||
dds_handler.h
|
||||
exm_handler.cpp
|
||||
exm_handler.h
|
||||
ism_handler.cpp
|
||||
ism_handler.h
|
||||
main.cpp
|
||||
main_handler.cpp
|
||||
main_handler.h
|
||||
pdm_handler.cpp
|
||||
pdm_handler.h
|
||||
ppm_handler.cpp
|
||||
ppm_handler.h
|
||||
position_handler.cpp
|
||||
position_handler.h
|
||||
recv_from_dds_aes.cpp
|
||||
recv_from_dds_aes.h
|
||||
recv_from_dds_fts.cpp
|
||||
recv_from_dds_fts.h
|
||||
recv_from_tab.h
|
||||
send_to_dds.cpp
|
||||
send_to_dds.h
|
||||
send_to_tab.h
|
||||
settings.cpp
|
||||
settings.h
|
||||
tab_export.h
|
||||
tab_plugin_interface.h
|
||||
|
||||
WebSocketInterface/data_manager.cpp
|
||||
WebSocketInterface/data_manager.h
|
||||
WebSocketInterface/json_keys.h
|
||||
WebSocketInterface/websocket_interface_handler.cpp
|
||||
WebSocketInterface/websocket_interface_handler.h
|
||||
WebSocketInterface/Messages/client_message.cpp
|
||||
WebSocketInterface/Messages/client_message.h
|
||||
WebSocketInterface/Messages/reply_message.cpp
|
||||
WebSocketInterface/Messages/reply_message.h
|
||||
# tx_mixin.cpp
|
||||
# tx_mixin.h
|
||||
|
||||
log4cxx_tab.props
|
||||
${xml_FILE}
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
# Generate tab.sql, tab.xml
|
||||
CODEGEN_SQL(SRCS_exe ${xml_FILE})
|
||||
ENDIF()
|
||||
|
||||
NGL_ADD_SVC_ICON(SRCS_exe)
|
||||
NGL_ADD_EXECUTABLE(AAR SV svcTrainingAreaBase ${SRCS_exe})
|
||||
NGL_TARGET_LINK_LIBRARIES(svcTrainingAreaBase
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
LtsCoordTrans
|
||||
LtsWebSocketServer
|
||||
LtsCommandLineParser
|
||||
LtsPluginLoader
|
||||
LtsUtilsCoreHeaderOnly
|
||||
LtsUtilsCore
|
||||
svcTabCommon
|
||||
svcTabServer
|
||||
# main_handler.cpp includes the generated <TrainingAreaBase/tab_record_replay_plugin.h>
|
||||
# and directly instantiates TrainingAreaBase::RecordReplayPluginCustom (whose methods
|
||||
# live in the plugin .so). Linking the plugin target (rather than relying on a full
|
||||
# `make all` having generated the header first) makes this a proper build dependency:
|
||||
# the plugin's codegen runs before the exe compiles (so the generated header exists),
|
||||
# the plugin's PUBLIC build-tree include dir is inherited (so the include resolves),
|
||||
# and the plugin .so is linked (so the RecordReplayPluginCustom symbols resolve).
|
||||
$<IF:$<TARGET_EXISTS:tabRecordReplayPlugin>,tabRecordReplayPlugin,>
|
||||
svcNomClient
|
||||
svcAesClient
|
||||
svcOpmClient
|
||||
svcCoreClient
|
||||
svcAsmClient
|
||||
svcExmClient
|
||||
$<IF:$<TARGET_EXISTS:svcIsmClient>,svcIsmClient,>
|
||||
svcPdmClient
|
||||
svcPpmClient
|
||||
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
|
||||
nglsettings
|
||||
ProjectConfig
|
||||
NGLLogger
|
||||
nglcoreapplication
|
||||
ngltools
|
||||
tabTelegrams
|
||||
)
|
||||
NGL_INSTALL_TARGET(svcTrainingAreaBase)
|
||||
NGL_INSTALL(AAR SV FILES log4cxx_tab.props DESTINATION bin)
|
||||
NGL_ADD_TARGET_LINK(svcTrainingAreaBase sTAB)
|
||||
|
||||
# clientPluginInterface
|
||||
ADD_LIBRARY(tabPluginInterface INTERFACE)
|
||||
TARGET_SOURCES(tabPluginInterface INTERFACE
|
||||
|
||||
+7
-2
@@ -1,5 +1,10 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* $Id: $
|
||||
* $HeadURL: $
|
||||
* $Author: $
|
||||
* Created by Steve K., ESZS 12-01-2026
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
|
||||
+8
-2
@@ -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
|
||||
|
||||
|
||||
+8
-2
@@ -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
|
||||
|
||||
|
||||
+8
-2
@@ -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
|
||||
|
||||
|
||||
+8
-2
@@ -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"
|
||||
|
||||
|
||||
+8
-2
@@ -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
|
||||
|
||||
|
||||
+8
-2
@@ -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
|
||||
|
||||
|
||||
+8
-2
@@ -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"
|
||||
|
||||
+8
-2
@@ -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
|
||||
|
||||
|
||||
+8
-2
@@ -1,5 +1,11 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Building Config - logging facility
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Christian Ehrlicher, SLSE, 2016-04-14
|
||||
*/
|
||||
|
||||
#include "logger.h"
|
||||
|
||||
|
||||
+8
-2
@@ -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)
|
||||
+8
-2
@@ -1,5 +1,11 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Building Config - logging facility
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Christian Ehrlicher, SLSE, 2016-04-14
|
||||
*/
|
||||
|
||||
#include "logger.h"
|
||||
|
||||
|
||||
+8
-2
@@ -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
|
||||
|
||||
|
||||
+1
@@ -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
|
||||
|
||||
Executable → Regular
+21
-21
@@ -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;
|
||||
};
|
||||
|
||||
}
|
||||
Executable → Regular
+69
-65
@@ -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;
|
||||
};
|
||||
|
||||
|
||||
}
|
||||
Executable → Regular
+51
-53
@@ -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;
|
||||
};
|
||||
}
|
||||
Executable → Regular
+104
-115
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Executable → Regular
+34
-31
@@ -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;
|
||||
};
|
||||
|
||||
}
|
||||
+8
-2
@@ -1,5 +1,11 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Logger
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Mike Wille, ESZS, 2025-10-27
|
||||
*/
|
||||
|
||||
#include "logger.h"
|
||||
|
||||
|
||||
+8
-2
@@ -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
|
||||
|
||||
|
||||
+8
-2
@@ -1,5 +1,11 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Building Config - logging facility
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Christian Ehrlicher, SLSE, 2016-04-14
|
||||
*/
|
||||
|
||||
#include "logger.h"
|
||||
|
||||
|
||||
+8
-2
@@ -1,5 +1,11 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Logging for TrainingAreaBase
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Christian Ehrlicher, SLSE, 2016-04-14
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
|
||||
+8
-2
@@ -1,5 +1,11 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* The ClientMessage class is an abstract base class for concrete ClientMessage objects
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Philipp Dassow, SLST, 2017-12-05
|
||||
*/
|
||||
#include "client_message.h"
|
||||
|
||||
#include "WebSocketInterface/Messages/reply_message.h"
|
||||
|
||||
+8
-2
@@ -1,5 +1,11 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* The ClientMessage class is an abstract base class for concrete ClientMessage objects
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Philipp Dassow, SLST, 2017-12-05
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QJsonObject>
|
||||
|
||||
+8
-2
@@ -1,5 +1,11 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* The ReplyMessage class is an abstract base class for all possible messages which are sent to the client
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Hannes Fritsche, SLSE, 2017-09-07
|
||||
*/
|
||||
#include "WebSocketInterface/Messages/reply_message.h"
|
||||
#include "WebSocketInterface/json_keys.h"
|
||||
|
||||
|
||||
+8
-2
@@ -1,5 +1,11 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* The ReplyMessage class is an abstract base class for all possible messages which are sent to the client
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Hannes Fritsche, SLSE, 2017-09-07
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QVector>
|
||||
|
||||
+8
-2
@@ -1,5 +1,11 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* The DataManager class handles data to be send to the websocket
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Philipp Dassow, SLST, 2017-12-05
|
||||
*/
|
||||
#include "data_manager.h"
|
||||
#include "Messages/reply_message.h"
|
||||
#include "main_handler.h"
|
||||
|
||||
+8
-2
@@ -1,5 +1,11 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* The DataManager class handles data to be send to the websocket
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Philipp Dassow, SLST, 2017-12-05
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <LtsWebSocket/data_manager_base_dl.h>
|
||||
|
||||
+8
-2
@@ -1,5 +1,11 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Header file which holds all occuring JSON keys
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Philipp Dassow, SLST, 2017-12-05
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QString>
|
||||
|
||||
+8
-2
@@ -1,5 +1,11 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Handler for the WebSocket Interface
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Philipp Dassow, SLST, 2017-12-05
|
||||
*/
|
||||
#include "websocket_interface_handler.h"
|
||||
|
||||
#include "main_handler.h"
|
||||
|
||||
+8
-2
@@ -1,5 +1,11 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Handler for the WebSocket Interface
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Philipp Dassow, SLST, 2017-12-05
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QObject>
|
||||
|
||||
Executable → Regular
+18
-19
@@ -8,25 +8,24 @@
|
||||
namespace TrainingAreaBase
|
||||
{
|
||||
|
||||
LOGGER_T getLogger(const char *name)
|
||||
{
|
||||
static const char ns[] = "TAB.";
|
||||
std::string loggerName;
|
||||
const size_t len = strlen(name);
|
||||
loggerName.reserve(sizeof(ns) + len);
|
||||
loggerName.append(ns, sizeof(ns) - 1);
|
||||
loggerName.append(name, len);
|
||||
LOGGER_T getLogger(const char *name)
|
||||
{
|
||||
static const char ns[] = "TAB.";
|
||||
std::string loggerName;
|
||||
const size_t len = strlen(name);
|
||||
loggerName.reserve(sizeof(ns) + len);
|
||||
loggerName.append(ns, sizeof(ns) - 1);
|
||||
loggerName.append(name, len);
|
||||
|
||||
try
|
||||
{
|
||||
return NGL::NGLLoggerBootstrap::getNGLRootLogger().
|
||||
getNGLLogger(loggerName);
|
||||
}
|
||||
catch (const std::exception &ex)
|
||||
{
|
||||
fprintf(stderr, "Error retrieving logger: %s", ex.what());
|
||||
abort();
|
||||
try
|
||||
{
|
||||
return NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger(loggerName);
|
||||
}
|
||||
catch (const std::exception &ex)
|
||||
{
|
||||
fprintf(stderr, "Error retrieving logger: %s", ex.what());
|
||||
abort();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
Executable → Regular
+6
-6
@@ -8,11 +8,11 @@
|
||||
|
||||
namespace TrainingAreaBase
|
||||
{
|
||||
using LOGGER_T = NGL::INGLLogger &;
|
||||
using LOGGER_T = NGL::INGLLogger &;
|
||||
|
||||
SVCTABCOMMON_EXPORT LOGGER_T getLogger(const char *name);
|
||||
inline LOGGER_T getLogger(const QString &loggerName)
|
||||
{
|
||||
return getLogger(loggerName.toUtf8().constData());
|
||||
SVCTABCOMMON_EXPORT LOGGER_T getLogger(const char *name);
|
||||
inline LOGGER_T getLogger(const QString &loggerName)
|
||||
{
|
||||
return getLogger(loggerName.toUtf8().constData());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,11 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* main for TetraRadio
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Christian Ehrlicher, SLSE, 2016-04-14
|
||||
*/
|
||||
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
||||
|
||||
Executable → Regular
+49
-49
@@ -6,53 +6,53 @@
|
||||
|
||||
namespace TrainingAreaBase
|
||||
{
|
||||
class RecvFromTab
|
||||
{
|
||||
public:
|
||||
RecvFromTab() = default;
|
||||
virtual ~RecvFromTab() = default;
|
||||
class RecvFromTab
|
||||
{
|
||||
public:
|
||||
RecvFromTab() = default;
|
||||
virtual ~RecvFromTab() = default;
|
||||
|
||||
virtual void rxData(const TetraIcd::ManipulationReport &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::EquipmentOperationalState &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::EquipmentConfigurationReport &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::CtaDataError &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::PositionReport &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::PositionReportWithMountedEquipments &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::MineTriggered &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::DefinitionIed &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::StateIed &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::DusSingleMineState &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::StateChangeDirect &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::StateChangeIndirect &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::OperatorAction &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::StateChange &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::FunctionalAreaEntry &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::SpecialSensorData &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::MinelayerTrailerData &indata) = 0;
|
||||
virtual void rxData(const TetraIcd::MinelayerThrowerData &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::MinelayerTrailerPosition &indata) = 0;
|
||||
virtual void rxData(const TetraIcd::BiteReport &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::EquipmentEvent &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::EquipmentGearAssignment &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::EquipmentGearChargeState &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::EquipmentGearEvent &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::ParticipantSwVersions &data) = 0;
|
||||
virtual void rxData(const TetraIcd::EquipmentMessageOC &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::OpaquePayloadDataIn &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::ParticipantModeReport &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::ParticipantConfigurationReport & inData) = 0;
|
||||
virtual void rxData(const TetraIcd::EmergencyCall &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::SanitationRepair &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::SanitaryMaterialStockReport &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::Sanitation &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::ApacheLaserDesignation &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::SelectiveReammunition &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::BatteryInfo &inData) {Q_UNUSED(inData)}
|
||||
virtual void rxData(const TetraIcd::BatteryAlarm &inData){Q_UNUSED(inData)}
|
||||
virtual void rxData(const TetraIcd::ServiceControl &inData){Q_UNUSED(inData)}
|
||||
virtual void rxData(const TetraIcd::RestoreRadioReadiness &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::UAVStatus &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::UAVRadioLinkConnectionStatus &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::UAVMissionStatus &inData) = 0;
|
||||
};
|
||||
}
|
||||
virtual void rxData(const TetraIcd::ManipulationReport &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::EquipmentOperationalState &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::EquipmentConfigurationReport &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::CtaDataError &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::PositionReport &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::PositionReportWithMountedEquipments &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::MineTriggered &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::DefinitionIed &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::StateIed &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::DusSingleMineState &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::StateChangeDirect &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::StateChangeIndirect &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::OperatorAction &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::StateChange &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::FunctionalAreaEntry &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::SpecialSensorData &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::MinelayerTrailerData &indata) = 0;
|
||||
virtual void rxData(const TetraIcd::MinelayerThrowerData &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::MinelayerTrailerPosition &indata) = 0;
|
||||
virtual void rxData(const TetraIcd::BiteReport &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::EquipmentEvent &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::EquipmentGearAssignment &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::EquipmentGearChargeState &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::EquipmentGearEvent &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::ParticipantSwVersions &data) = 0;
|
||||
virtual void rxData(const TetraIcd::EquipmentMessageOC &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::OpaquePayloadDataIn &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::ParticipantModeReport &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::ParticipantConfigurationReport &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::EmergencyCall &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::SanitationRepair &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::SanitaryMaterialStockReport &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::Sanitation &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::ApacheLaserDesignation &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::SelectiveReammunition &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::BatteryInfo &inData) { Q_UNUSED(inData) }
|
||||
virtual void rxData(const TetraIcd::BatteryAlarm &inData) { Q_UNUSED(inData) }
|
||||
virtual void rxData(const TetraIcd::ServiceControl &inData) { Q_UNUSED(inData) }
|
||||
virtual void rxData(const TetraIcd::RestoreRadioReadiness &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::UAVStatus &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::UAVRadioLinkConnectionStatus &inData) = 0;
|
||||
virtual void rxData(const TetraIcd::UAVMissionStatus &inData) = 0;
|
||||
};
|
||||
}
|
||||
Executable → Regular
+64
-64
@@ -6,70 +6,70 @@
|
||||
|
||||
namespace TrainingAreaBase
|
||||
{
|
||||
class SendToTab
|
||||
{
|
||||
protected:
|
||||
SendToTab() = default;
|
||||
virtual ~SendToTab() = default;
|
||||
public:
|
||||
virtual const char *name() const = 0;
|
||||
enum class HandleState
|
||||
class SendToTab
|
||||
{
|
||||
No,
|
||||
YesFallback,
|
||||
YesShare,
|
||||
Debug,
|
||||
YesConsume
|
||||
protected:
|
||||
SendToTab() = default;
|
||||
virtual ~SendToTab() = default;
|
||||
|
||||
public:
|
||||
virtual const char *name() const = 0;
|
||||
enum class HandleState
|
||||
{
|
||||
No,
|
||||
YesFallback,
|
||||
YesShare,
|
||||
Debug,
|
||||
YesConsume
|
||||
};
|
||||
virtual HandleState canHandleTelegram(int equipmentNumber, int telegramId) const = 0;
|
||||
virtual void resetSendCounter() = 0;
|
||||
virtual bool txData(const TetraIcd::Acknowledge &data) = 0;
|
||||
virtual bool txData(const TetraIcd::DemandBite &data) = 0;
|
||||
virtual bool txData(const TetraIcd::Init &data) = 0;
|
||||
virtual bool txData(const TetraIcd::SetVulnerabilityModel &data) = 0;
|
||||
virtual bool txData(const TetraIcd::DemandEquipmentConfigurationReport &data) = 0;
|
||||
virtual bool txData(const TetraIcd::DemandVulnerabilityStateChange &data) = 0;
|
||||
virtual bool txData(const TetraIcd::LanguageSelection &data) = 0;
|
||||
virtual bool txData(const TetraIcd::EquipmentMessage &data) = 0;
|
||||
virtual bool txData(const TetraIcd::EquipmentMessageOC &data) = 0;
|
||||
virtual bool txData(const TetraIcd::CreateSingleExplosion &data) = 0;
|
||||
virtual bool txData(const TetraIcd::CreateAreaExplosion &data) = 0;
|
||||
virtual bool txData(const TetraIcd::CreateMineArea &data) = 0;
|
||||
virtual bool txData(const TetraIcd::MineAreaSingleMineState &data) = 0;
|
||||
virtual bool txData(const TetraIcd::CreateNContamination &data) = 0;
|
||||
virtual bool txData(const TetraIcd::CreateCContamination &data) = 0;
|
||||
virtual bool txData(const TetraIcd::DeactivateEffectSimulation &data) = 0;
|
||||
virtual bool txData(const TetraIcd::ModifyAreaEffectSimulationName &data) = 0;
|
||||
virtual bool txData(const TetraIcd::PauseEffectSimulation &data) = 0;
|
||||
virtual bool txData(const TetraIcd::ResumeEffectSimulation &data) = 0;
|
||||
virtual bool txData(const TetraIcd::MineTriggered &data) = 0;
|
||||
virtual bool txData(const TetraIcd::DusMineReactivation &data) = 0;
|
||||
virtual bool txData(const TetraIcd::CreateFunctionalArea &data) = 0;
|
||||
virtual bool txData(const TetraIcd::CreateDusSingleMine &data) = 0;
|
||||
virtual bool txData(const TetraIcd::ExerciseEnvironmentData &data) = 0;
|
||||
virtual bool txData(const TetraIcd::ExerciseStateData &data) = 0;
|
||||
virtual bool txData(const TetraIcd::ParticipantSwVersionsRequest &data) = 0;
|
||||
virtual bool txData(const TetraIcd::OpaquePayloadDataOut &data) = 0;
|
||||
virtual bool txData(const TetraIcd::TechnicalArea &data) = 0;
|
||||
virtual bool txData(const TetraIcd::CesHitInformation &data) = 0;
|
||||
virtual bool txData(const TetraIcd::CesHitRequest &data) = 0;
|
||||
virtual bool txData(const TetraIcd::ParticipantMode &data) = 0;
|
||||
virtual bool txData(const TetraIcd::DemandParticipantMode &data) = 0;
|
||||
virtual bool txData(const TetraIcd::ParticipantConfiguration &data) = 0;
|
||||
virtual bool txData(const TetraIcd::DemandParticipantConfiguration &data) = 0;
|
||||
virtual bool txData(const TetraIcd::ExerciseEquipmentAssignmentComplete &data) = 0;
|
||||
virtual bool txData(const TetraIcd::Sanitation &data) = 0;
|
||||
virtual bool txData(const TetraIcd::SelectiveReammunition &data) = 0;
|
||||
virtual bool txData(const TetraIcd::SetDevicePowerRequest &data) = 0;
|
||||
virtual bool txData(const TetraIcd::OcCommand &data) = 0;
|
||||
|
||||
virtual bool txData(const TrainingAreaBase::TetraIcd::ExFireReadiness &data) = 0;
|
||||
virtual bool txData(const TrainingAreaBase::TetraIcd::ExFiredReport &data) = 0;
|
||||
virtual bool txData(const TrainingAreaBase::TetraIcd::ExConfirmationReport &data) = 0;
|
||||
|
||||
|
||||
virtual bool txData(const TetraIcd::UAVPerformMission &data) = 0;
|
||||
virtual bool txData(const TetraIcd::UAVChangeState &data) = 0;
|
||||
};
|
||||
virtual HandleState canHandleTelegram(int equipmentNumber, int telegramId) const = 0;
|
||||
virtual void resetSendCounter() = 0;
|
||||
virtual bool txData(const TetraIcd::Acknowledge &data) = 0;
|
||||
virtual bool txData(const TetraIcd::DemandBite &data) = 0;
|
||||
virtual bool txData(const TetraIcd::Init &data) = 0;
|
||||
virtual bool txData(const TetraIcd::SetVulnerabilityModel &data) = 0;
|
||||
virtual bool txData(const TetraIcd::DemandEquipmentConfigurationReport & data) = 0;
|
||||
virtual bool txData(const TetraIcd::DemandVulnerabilityStateChange &data) = 0;
|
||||
virtual bool txData(const TetraIcd::LanguageSelection &data) = 0;
|
||||
virtual bool txData(const TetraIcd::EquipmentMessage &data) = 0;
|
||||
virtual bool txData(const TetraIcd::EquipmentMessageOC &data) = 0;
|
||||
virtual bool txData(const TetraIcd::CreateSingleExplosion &data) = 0;
|
||||
virtual bool txData(const TetraIcd::CreateAreaExplosion &data) = 0;
|
||||
virtual bool txData(const TetraIcd::CreateMineArea &data) = 0;
|
||||
virtual bool txData(const TetraIcd::MineAreaSingleMineState &data) = 0;
|
||||
virtual bool txData(const TetraIcd::CreateNContamination &data) = 0;
|
||||
virtual bool txData(const TetraIcd::CreateCContamination &data) = 0;
|
||||
virtual bool txData(const TetraIcd::DeactivateEffectSimulation &data) = 0;
|
||||
virtual bool txData(const TetraIcd::ModifyAreaEffectSimulationName &data) = 0;
|
||||
virtual bool txData(const TetraIcd::PauseEffectSimulation &data) = 0;
|
||||
virtual bool txData(const TetraIcd::ResumeEffectSimulation &data) = 0;
|
||||
virtual bool txData(const TetraIcd::MineTriggered &data) = 0;
|
||||
virtual bool txData(const TetraIcd::DusMineReactivation &data) = 0;
|
||||
virtual bool txData(const TetraIcd::CreateFunctionalArea &data) = 0;
|
||||
virtual bool txData(const TetraIcd::CreateDusSingleMine &data) = 0;
|
||||
virtual bool txData(const TetraIcd::ExerciseEnvironmentData &data) = 0;
|
||||
virtual bool txData(const TetraIcd::ExerciseStateData &data) = 0;
|
||||
virtual bool txData(const TetraIcd::ParticipantSwVersionsRequest &data) = 0;
|
||||
virtual bool txData(const TetraIcd::OpaquePayloadDataOut &data) = 0;
|
||||
virtual bool txData(const TetraIcd::TechnicalArea &data) = 0;
|
||||
virtual bool txData(const TetraIcd::CesHitInformation &data) = 0;
|
||||
virtual bool txData(const TetraIcd::CesHitRequest &data) = 0;
|
||||
virtual bool txData(const TetraIcd::ParticipantMode &data) = 0;
|
||||
virtual bool txData(const TetraIcd::DemandParticipantMode & data) = 0;
|
||||
virtual bool txData(const TetraIcd::ParticipantConfiguration &data) = 0;
|
||||
virtual bool txData(const TetraIcd::DemandParticipantConfiguration &data) = 0;
|
||||
virtual bool txData(const TetraIcd::ExerciseEquipmentAssignmentComplete &data) = 0;
|
||||
virtual bool txData(const TetraIcd::Sanitation &data) = 0;
|
||||
virtual bool txData(const TetraIcd::SelectiveReammunition &data) = 0;
|
||||
virtual bool txData(const TetraIcd::SetDevicePowerRequest &data) = 0;
|
||||
virtual bool txData(const TetraIcd::OcCommand &data) = 0;
|
||||
|
||||
virtual bool txData(const TrainingAreaBase::TetraIcd::ExFireReadiness &data) = 0;
|
||||
virtual bool txData(const TrainingAreaBase::TetraIcd::ExFiredReport&data) = 0;
|
||||
virtual bool txData(const TrainingAreaBase::TetraIcd::ExConfirmationReport &data) = 0;
|
||||
|
||||
|
||||
virtual bool txData(const TetraIcd::UAVPerformMission &data) = 0;
|
||||
virtual bool txData(const TetraIcd::UAVChangeState &data) = 0;
|
||||
|
||||
};
|
||||
}
|
||||
@@ -1,21 +1,22 @@
|
||||
// Stub file for tab_db - BUILD_RTI=OFF
|
||||
// Auto-generated stub to replace RTI IDL-generated database code
|
||||
|
||||
#ifndef TAB_DB_STUB_HPP
|
||||
#define TAB_DB_STUB_HPP
|
||||
|
||||
#include "tab_enums_stub.hpp"
|
||||
|
||||
namespace tab {
|
||||
namespace db {
|
||||
namespace tab
|
||||
{
|
||||
namespace db
|
||||
{
|
||||
|
||||
// Stub class to replace RTI IDL-generated database types
|
||||
class TrainingDatabase {
|
||||
public:
|
||||
virtual ~TrainingDatabase() = default;
|
||||
};
|
||||
// Stub class to replace RTI IDL-generated database types
|
||||
class TrainingDatabase
|
||||
{
|
||||
public:
|
||||
virtual ~TrainingDatabase() = default;
|
||||
};
|
||||
|
||||
} // namespace db
|
||||
} // namespace db
|
||||
} // namespace tab
|
||||
|
||||
#endif // TAB_DB_STUB_HPP
|
||||
#endif // TAB_DB_STUB_HPP
|
||||
+10
-9
@@ -1,24 +1,25 @@
|
||||
// Stub file for tab_enums - BUILD_RTI=OFF
|
||||
// Auto-generated stub to replace RTI IDL-generated enums
|
||||
|
||||
#ifndef TAB_ENUMS_STUB_HPP
|
||||
#define TAB_ENUMS_STUB_HPP
|
||||
|
||||
namespace tab {
|
||||
namespace tab
|
||||
{
|
||||
|
||||
// Stub enums to replace RTI IDL-generated enums
|
||||
enum class TrainingAreaType {
|
||||
// Stub enums to replace RTI IDL-generated enums
|
||||
enum class TrainingAreaType
|
||||
{
|
||||
Unknown = 0,
|
||||
Standard = 1,
|
||||
Advanced = 2
|
||||
};
|
||||
};
|
||||
|
||||
enum class TrainingStatus {
|
||||
enum class TrainingStatus
|
||||
{
|
||||
Inactive = 0,
|
||||
Active = 1,
|
||||
Completed = 2
|
||||
};
|
||||
};
|
||||
|
||||
} // namespace tab
|
||||
|
||||
#endif // TAB_ENUMS_STUB_HPP
|
||||
#endif // TAB_ENUMS_STUB_HPP
|
||||
@@ -1,44 +1,44 @@
|
||||
// Stub file for tab types - BUILD_RTI=OFF
|
||||
// Auto-generated stub to replace RTI IDL-generated types
|
||||
|
||||
#ifndef TAB_STUB_HPP
|
||||
#define TAB_STUB_HPP
|
||||
|
||||
#include "tab_enums_stub.hpp"
|
||||
#include <string>
|
||||
|
||||
namespace tab {
|
||||
namespace tab
|
||||
{
|
||||
|
||||
// Stub class to replace RTI IDL-generated TrainingArea type
|
||||
class TrainingArea {
|
||||
public:
|
||||
// Stub class to replace RTI IDL-generated TrainingArea type
|
||||
class TrainingArea
|
||||
{
|
||||
public:
|
||||
TrainingArea() = default;
|
||||
virtual ~TrainingArea() = default;
|
||||
|
||||
|
||||
std::string getName() const { return m_name; }
|
||||
void setName(const std::string& name) { m_name = name; }
|
||||
|
||||
void setName(const std::string &name) { m_name = name; }
|
||||
|
||||
TrainingAreaType getType() const { return m_type; }
|
||||
void setType(TrainingAreaType type) { m_type = type; }
|
||||
|
||||
private:
|
||||
|
||||
private:
|
||||
std::string m_name;
|
||||
TrainingAreaType m_type = TrainingAreaType::Unknown;
|
||||
};
|
||||
};
|
||||
|
||||
// Stub class to replace RTI IDL-generated TrainingSession type
|
||||
class TrainingSession {
|
||||
public:
|
||||
// Stub class to replace RTI IDL-generated TrainingSession type
|
||||
class TrainingSession
|
||||
{
|
||||
public:
|
||||
TrainingSession() = default;
|
||||
virtual ~TrainingSession() = default;
|
||||
|
||||
|
||||
TrainingStatus getStatus() const { return m_status; }
|
||||
void setStatus(TrainingStatus status) { m_status = status; }
|
||||
|
||||
private:
|
||||
|
||||
private:
|
||||
TrainingStatus m_status = TrainingStatus::Inactive;
|
||||
};
|
||||
};
|
||||
|
||||
} // namespace tab
|
||||
|
||||
#endif // TAB_STUB_HPP
|
||||
#endif // TAB_STUB_HPP
|
||||
+22
-20
@@ -1,27 +1,29 @@
|
||||
// Stub file for tab_topic_type_plugin - BUILD_RTI=OFF
|
||||
// Auto-generated stub to replace RTI IDL-generated plugin code
|
||||
|
||||
#include "tab_enums_stub.hpp"
|
||||
|
||||
namespace tab {
|
||||
namespace plugin {
|
||||
namespace tab
|
||||
{
|
||||
namespace plugin
|
||||
{
|
||||
|
||||
// Stub class to replace RTI IDL-generated topic type plugin
|
||||
class TopicTypePlugin {
|
||||
public:
|
||||
virtual ~TopicTypePlugin() = default;
|
||||
|
||||
virtual bool initialize() { return true; }
|
||||
virtual void shutdown() {}
|
||||
};
|
||||
// Stub class to replace RTI IDL-generated topic type plugin
|
||||
class TopicTypePlugin
|
||||
{
|
||||
public:
|
||||
virtual ~TopicTypePlugin() = default;
|
||||
|
||||
} // namespace plugin
|
||||
virtual bool initialize() { return true; }
|
||||
virtual void shutdown() {}
|
||||
};
|
||||
|
||||
} // namespace plugin
|
||||
} // namespace tab
|
||||
|
||||
// Export stub function
|
||||
extern "C" {
|
||||
tab::plugin::TopicTypePlugin* createTopicTypePlugin() {
|
||||
static tab::plugin::TopicTypePlugin instance;
|
||||
return &instance;
|
||||
}
|
||||
}
|
||||
extern "C"
|
||||
{
|
||||
tab::plugin::TopicTypePlugin *createTopicTypePlugin()
|
||||
{
|
||||
static tab::plugin::TopicTypePlugin instance;
|
||||
return &instance;
|
||||
}
|
||||
}
|
||||
Executable → Regular
+33
-33
@@ -5,43 +5,43 @@
|
||||
#include <QtCore/qglobal.h>
|
||||
|
||||
#ifndef TAB_COMMON_EXPORT
|
||||
# ifdef BUILD_STATIC_LIBRARIES
|
||||
# define TAB_COMMON_EXPORT
|
||||
# else
|
||||
# if defined(MAKE_SVCTABCOMMON_LIB)
|
||||
# define TAB_COMMON_EXPORT Q_DECL_EXPORT
|
||||
# ifndef WIN32
|
||||
# ifdef NDDSUSERDllExport
|
||||
# undef NDDSUSERDllExport
|
||||
# endif
|
||||
# define NDDSUSERDllExport Q_DECL_EXPORT
|
||||
# endif
|
||||
# else
|
||||
# define TAB_COMMON_EXPORT Q_DECL_IMPORT
|
||||
# endif
|
||||
# endif
|
||||
#ifdef BUILD_STATIC_LIBRARIES
|
||||
#define TAB_COMMON_EXPORT
|
||||
#else
|
||||
#if defined(MAKE_SVCTABCOMMON_LIB)
|
||||
#define TAB_COMMON_EXPORT Q_DECL_EXPORT
|
||||
#ifndef WIN32
|
||||
#ifdef NDDSUSERDllExport
|
||||
#undef NDDSUSERDllExport
|
||||
#endif
|
||||
#define NDDSUSERDllExport Q_DECL_EXPORT
|
||||
#endif
|
||||
#else
|
||||
#define TAB_COMMON_EXPORT Q_DECL_IMPORT
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef TAB_CLIENT_EXPORT
|
||||
# ifdef BUILD_STATIC_LIBRARIES
|
||||
# define TAB_CLIENT_EXPORT
|
||||
# else
|
||||
# if defined(MAKE_SVCTABCLIENT_LIB)
|
||||
# define TAB_CLIENT_EXPORT Q_DECL_EXPORT
|
||||
# else
|
||||
# define TAB_CLIENT_EXPORT Q_DECL_IMPORT
|
||||
# endif
|
||||
# endif
|
||||
#ifdef BUILD_STATIC_LIBRARIES
|
||||
#define TAB_CLIENT_EXPORT
|
||||
#else
|
||||
#if defined(MAKE_SVCTABCLIENT_LIB)
|
||||
#define TAB_CLIENT_EXPORT Q_DECL_EXPORT
|
||||
#else
|
||||
#define TAB_CLIENT_EXPORT Q_DECL_IMPORT
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef TAB_SERVER_EXPORT
|
||||
# ifdef BUILD_STATIC_LIBRARIES
|
||||
# define TAB_SERVER_EXPORT
|
||||
# else
|
||||
# if defined(MAKE_SVCTABSERVER_LIB)
|
||||
# define TAB_SERVER_EXPORT Q_DECL_EXPORT
|
||||
# else
|
||||
# define TAB_SERVER_EXPORT Q_DECL_IMPORT
|
||||
# endif
|
||||
# endif
|
||||
#ifdef BUILD_STATIC_LIBRARIES
|
||||
#define TAB_SERVER_EXPORT
|
||||
#else
|
||||
#if defined(MAKE_SVCTABSERVER_LIB)
|
||||
#define TAB_SERVER_EXPORT Q_DECL_EXPORT
|
||||
#else
|
||||
#define TAB_SERVER_EXPORT Q_DECL_IMPORT
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
Executable → Regular
+61
-57
@@ -12,71 +12,75 @@
|
||||
class QSqlDatabase;
|
||||
namespace NGL
|
||||
{
|
||||
class Settings;
|
||||
class Settings;
|
||||
}
|
||||
namespace TrainingAreaBase
|
||||
{
|
||||
class DdsHandler;
|
||||
class SendToTab;
|
||||
class TxMixin;
|
||||
class DdsHandler;
|
||||
class SendToTab;
|
||||
class TxMixin;
|
||||
|
||||
class RecvFromTab;
|
||||
namespace Plugin
|
||||
{
|
||||
class Interface;
|
||||
class DataProvider
|
||||
{
|
||||
public:
|
||||
DataProvider() = default;
|
||||
virtual ~DataProvider() = default;
|
||||
class RecvFromTab;
|
||||
namespace Plugin
|
||||
{
|
||||
class Interface;
|
||||
class DataProvider
|
||||
{
|
||||
public:
|
||||
DataProvider() = default;
|
||||
virtual ~DataProvider() = default;
|
||||
|
||||
virtual int exerciseId() const = 0;
|
||||
virtual bool useTetraScrambling() const = 0;
|
||||
virtual ProjectDataManagement::RadioGroup exerciseRadioGroup() const = 0;
|
||||
virtual TetraIcd::ExerciseEnvironmentData exerciseEnvironmentData() const = 0;
|
||||
virtual TetraIcd::ExerciseStateData exerciseStateData() const = 0;
|
||||
|
||||
virtual TetraIcd::ExerciseEquipmentAssignmentComplete exerciseEquipmentAssignment() const = 0;
|
||||
virtual QVector<TetraIcd::TrainingAreaTelegram*> aesTelegrams() const = 0;
|
||||
virtual QSqlDatabase databaseConnection() const = 0;
|
||||
virtual QString databaseSchemaName() const = 0;
|
||||
virtual int domainId() const = 0;
|
||||
};
|
||||
virtual int exerciseId() const = 0;
|
||||
virtual bool useTetraScrambling() const = 0;
|
||||
virtual ProjectDataManagement::RadioGroup exerciseRadioGroup() const = 0;
|
||||
virtual TetraIcd::ExerciseEnvironmentData exerciseEnvironmentData() const = 0;
|
||||
virtual TetraIcd::ExerciseStateData exerciseStateData() const = 0;
|
||||
|
||||
class Plugin
|
||||
{
|
||||
Q_GADGET
|
||||
public:
|
||||
Plugin() = default;
|
||||
virtual ~Plugin() = default;
|
||||
|
||||
virtual std::shared_ptr<Interface> createInterface(DataProvider *pdp,
|
||||
const std::shared_ptr<RecvFromTab> &recvFromTabCb,
|
||||
const std::shared_ptr<TxMixin> &sendToTabCb,
|
||||
const std::shared_ptr<TrainingAreaBase::DdsHandler> &ddsHandler,
|
||||
NGL::Settings *settings) = 0;
|
||||
};
|
||||
virtual TetraIcd::ExerciseEquipmentAssignmentComplete exerciseEquipmentAssignment() const = 0;
|
||||
virtual QVector<TetraIcd::TrainingAreaTelegram *> aesTelegrams() const = 0;
|
||||
virtual QSqlDatabase databaseConnection() const = 0;
|
||||
virtual QString databaseSchemaName() const = 0;
|
||||
virtual int domainId() const = 0;
|
||||
};
|
||||
|
||||
class Interface : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
Interface() = default;
|
||||
virtual ~Interface() = default;
|
||||
class Plugin
|
||||
{
|
||||
Q_GADGET
|
||||
public:
|
||||
Plugin() = default;
|
||||
virtual ~Plugin() = default;
|
||||
|
||||
virtual bool init() = 0;
|
||||
virtual std::shared_ptr<SendToTab> sendToTab() = 0;
|
||||
virtual bool isDebugInterface() const = 0;
|
||||
virtual bool canSendData() const = 0;
|
||||
virtual void exerciseChanged () = 0;
|
||||
virtual const char *name() const = 0;
|
||||
virtual std::shared_ptr<Interface> createInterface(DataProvider *pdp,
|
||||
const std::shared_ptr<RecvFromTab> &recvFromTabCb,
|
||||
const std::shared_ptr<TxMixin> &sendToTabCb,
|
||||
const std::shared_ptr<TrainingAreaBase::DdsHandler> &ddsHandler,
|
||||
NGL::Settings *settings) = 0;
|
||||
};
|
||||
|
||||
virtual bool turnOn(bool turnOn) { Q_UNUSED(turnOn); return false; }
|
||||
class Interface : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
Interface() = default;
|
||||
virtual ~Interface() = default;
|
||||
|
||||
signals:
|
||||
void connectionState(const QString &name, bool connectionState);
|
||||
void directMessage(const QByteArray &jsonMessage);
|
||||
};
|
||||
}
|
||||
}
|
||||
virtual bool init() = 0;
|
||||
virtual std::shared_ptr<SendToTab> sendToTab() = 0;
|
||||
virtual bool isDebugInterface() const = 0;
|
||||
virtual bool canSendData() const = 0;
|
||||
virtual void exerciseChanged() = 0;
|
||||
virtual const char *name() const = 0;
|
||||
|
||||
virtual bool turnOn(bool turnOn)
|
||||
{
|
||||
Q_UNUSED(turnOn);
|
||||
return false;
|
||||
}
|
||||
|
||||
signals:
|
||||
void connectionState(const QString &name, bool connectionState);
|
||||
void directMessage(const QByteArray &jsonMessage);
|
||||
};
|
||||
}
|
||||
}
|
||||
Q_DECLARE_INTERFACE(TrainingAreaBase::Plugin::Plugin, "special:3:tetra")
|
||||
+7
-2
@@ -1,5 +1,10 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Custom record/replay functions
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
|
||||
#include "tab_record_replay_plugin_custom.h"
|
||||
|
||||
+7
-2
@@ -1,5 +1,10 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Custom record/replay functions
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <TrainingAreaBase/tab_record_replay_plugin.h>
|
||||
|
||||
+3187
-3381
File diff suppressed because it is too large.
Load diff
Executable → Regular
+2538
-2502
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user