Migration of Legatus codebase to Qt6 with RTI Connext DDS 7.7 integration is partially complete. Core DDS targets build successfully, but ProjectDataManagement module blocks full ddsfts compilation due to IDL definition conflicts.

This commit is contained in:
torsten committed 2026-09-07 19:30:39 +02:00
1 parent 758ae0f53f
commit ba1d9e2c04
256 files changed
+1170 -610

No files matched your search

@@ -18,25 +18,43 @@ SET(SRCS_common
)
# Generate alm_enums.idl / alm.idl
IF(BUILD_RTI)
IF(BUILD_RTI AND BUILD_GRANTLEE)
CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
ELSEIF(BUILD_RTI AND NOT BUILD_GRANTLEE)
# BUILD_GRANTLEE disabled: check for pre-generated files
IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/alm.idl" AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/alm_enums.idl")
MESSAGE(STATUS "BUILD_GRANTLEE disabled: using pre-generated IDL files for alm")
LIST(APPEND SRCS_common alm.idl alm_enums.idl)
ELSE()
MESSAGE(WARNING "BUILD_GRANTLEE disabled but no pre-generated IDL files found for alm. Skipping service.")
ENDIF()
ENDIF()
# Generate alm_db_impl.cpp/.h, alm_db.h
IF(BUILD_RTI)
IF(BUILD_RTI AND BUILD_GRANTLEE)
CODEGEN_DATABASE(SRCS_common ${xml_FILE})
ENDIF()
# Generate *.cpp/*.hpp from idl
IF(BUILD_RTI AND (BUILD_GRANTLEE OR (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/alm.idl" AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/alm_enums.idl")))
RTIDDSGEN(SRCS_common alm_enums.idl)
RTIDDSGEN(SRCS_common alm.idl)
ENDIF()
# Generate alm_dt[s,c]_types.h, alm_ft[s,c]_types.h
IF(BUILD_RTI)
IF(BUILD_RTI AND BUILD_GRANTLEE)
CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
ENDIF()
# Generate alm_[d|f]tc.h
IF(BUILD_RTI)
IF(BUILD_RTI AND BUILD_GRANTLEE)
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
ELSEIF(BUILD_RTI AND NOT BUILD_GRANTLEE)
# Check for pre-generated files
IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/alm_dtc.h" AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/alm_ftc.h")
MESSAGE(STATUS "BUILD_GRANTLEE disabled: using pre-generated DTC/FTC files for alm")
LIST(APPEND SRCS_common alm_dtc.h alm_ftc.h)
ELSE()
MESSAGE(WARNING "BUILD_GRANTLEE disabled but no pre-generated DTC/FTC files found for alm")
ENDIF()
ENDIF()
NGL_ADD_LIBRARY(AAR SV WS svcAlmCommon SHARED ${SRCS_common})
@@ -64,8 +82,16 @@ SET(SRCS_client
alm_export.h
)
# generate alm_[d|f]tc.h, tlm_[d|f]tc_impl.[cpp|h]
IF(BUILD_RTI)
IF(BUILD_RTI AND BUILD_GRANTLEE)
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
ELSEIF(BUILD_RTI AND NOT BUILD_GRANTLEE)
# Check for pre-generated files
IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/alm_dtc.h" AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/alm_ftc.h")
MESSAGE(STATUS "BUILD_GRANTLEE disabled: using pre-generated DTC/FTC files for alm client")
LIST(APPEND SRCS_client alm_dtc.h alm_ftc.h)
ELSE()
MESSAGE(WARNING "BUILD_GRANTLEE disabled but no pre-generated DTC/FTC files found for alm client")
ENDIF()
ENDIF()
NGL_ADD_LIBRARY(AAR SV WS svcAlmClient SHARED ${SRCS_client})
@@ -8,8 +8,8 @@
#pragma once
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/core_dtc.h>
#include <DDS/Core/topic_lock_master.h>
#include <Core/core_dtc.h>
#include <Core/topic_lock_master.h>
#include <AlarmManagement/alm_dts.h>
#include <AlarmManagement/alm_dtc.h>
#include <AlarmManagement/alm_fts.h>
@@ -4,7 +4,7 @@
#include <dds_handler.h>
#include "logger.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
//Generated
#include <AlarmManagement/alm_db.h>
@@ -13,7 +13,7 @@
// AES
#include <AreaEffectSimulation/Utils/polygons.h>
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
#include <Core/core.hpp>
@@ -9,8 +9,8 @@
#include "aes_dts.h"
#include "aes_fts.h"
#include <DDS/Core/pacemaker.h>
#include <DDS/Core/core_dtc.h>
#include <Core/pacemaker.h>
#include <Core/core_dtc.h>
#include <TrainingAreaBase/tab_dtc.h>
#include <QtCore/QCoreApplication>
#include <QtCore/QThread>
@@ -9,8 +9,8 @@
#include <DDS/DDSConnector/dds_connector.h>
#include <AreaEffectSimulation/aes_dts.h>
#include <AreaEffectSimulation/aes_fts.h>
#include <DDS/Core/core_dtc.h>
#include <DDS/Core/topic_lock_master.h>
#include <Core/core_dtc.h>
#include <Core/topic_lock_master.h>
#include <ProjectDataManagement/pdm_dtc.h>
#include <ParticipantManagement/ppm_dtc.h>
#include <TrainingAreaBase/tab_ftc.h>
@@ -37,7 +37,7 @@
#include <Trajectory/trajectory_generator.h>
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
#include <ngldb/db_service_handler.h>
#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
@@ -11,7 +11,7 @@
#include <QtCore/QObject>
#include <QtCore/QTimer>
#include <DDS/Core/core.hpp>
#include <Core/core.hpp>
#include <LtsCoordTrans/lts_coord_trans.h>
#include "logger.h"
@@ -16,7 +16,7 @@
#include "special_area_provider.h"
#include "logger.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
#include <ProjectDataManagement/pdm_dtc.h>
#include <Trajectory/trajectory_generator.h>
@@ -10,7 +10,7 @@
#include <QtCore/QObject>
#include "object_base.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
#include <AreaEffectSimulation/aes_db.h>
@@ -11,7 +11,7 @@
#include "logger.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
#include <aes_db.h>
#include <aes_dtc.h>
#include <aes_ftc.h>
@@ -10,7 +10,7 @@
#include <QtCore/QObject>
#include "object_base.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
#include <AreaEffectSimulation/aes_db.h>
@@ -8,7 +8,7 @@
#include "dds_handler.h"
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
namespace AssetManagement
{
@@ -8,7 +8,7 @@
#pragma once
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/topic_lock_master.h>
#include <Core/topic_lock_master.h>
#include <AssetManagement/asm_dts.h>
#include <AssetManagement/asm_fts.h>
@@ -15,7 +15,7 @@
#include "settings.h"
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
#include <ngldb/db_service_handler.h>
namespace AssetManagement
@@ -10,7 +10,7 @@
#include "dds_handler.h"
#include "logger.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
// Generated
#include <AssetManagement/asm_db.h>
@@ -8,7 +8,7 @@
#pragma once
#include "logger.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
// Generated
#include <AssetManagement/asm_db.h>
@@ -10,7 +10,7 @@
#include "dds_handler.h"
#include "logger.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
// Generated
#include <AssetManagement/asm_db.h>
@@ -10,7 +10,7 @@
#include <QtCore/QObject>
#include "dds_handler.h"
#include "logger.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
// Generated
#include <AssetManagement/asm_db.h>
@@ -9,7 +9,6 @@
#include <QtNetwork/QHostAddress>
#include <QtCore/QStringList>
#include <QtCore/QRegExp>
#include <QtCore/QString>
#include "ava_test_server.h"
@@ -325,7 +324,7 @@ AvaTestServer::AvaTestServer()
AvaTestServer::~AvaTestServer()
{
for (QTcpSocket *conn : qAsConst(m_Conns))
for (QTcpSocket *conn : std::as_const(m_Conns))
{
// disconnect before we delete as otherwise closedConnection() would be called wich would
// also delete the socket.
@@ -366,14 +365,13 @@ void AvaTestServer::closedConnection()
qDebug() << "connection closed";
m_PosUpdate->stop();
QMutableVectorIterator<QTcpSocket *> l_It(m_Conns);
while (l_It.hasNext())
for (int i = 0; i < m_Conns.size(); ++i)
{
QTcpSocket *l_Conn = l_It.next();
QTcpSocket *l_Conn = m_Conns[i];
if (l_Conn->state() == QAbstractSocket::UnconnectedState)
{
l_Conn->disconnect(this);
l_It.remove();
m_Conns.removeAt(i);
l_Conn->deleteLater(); // use deleteLater() as we want to delete the object which was emitting the signal
return;
}
@@ -404,18 +402,15 @@ void AvaTestServer::sendScriptPosUpdate()
if (m_RelScriptPos >= m_SelStreamFromScript.getDuration())
{
QVectorIterator<ScrEdAVStream> l_Iterator(m_Script.getStreamSequences());
float l_Duration = 0;
while (l_Iterator.hasNext())
for (const ScrEdAVStream &l_Stream : m_Script.getStreamSequences())
{
ScrEdAVStream l_Stream = l_Iterator.next();
l_Duration += l_Stream.getDuration();
qDebug() << "l_Duration " << l_Duration << " abs_scriptpos " << m_AbsScriptPos << " stream " << l_Stream.getName();
if (l_Duration > m_AbsScriptPos)
{
qDebug() << "set stream " << l_Stream.getName();
m_SelStreamFromScript = l_Stream;
l_Iterator.toBack();
m_RelScriptPos = 0;
}
}
@@ -434,11 +429,8 @@ void AvaTestServer::sendScriptPosUpdate()
void AvaTestServer::readAndAnswer()
{
QVectorIterator<QTcpSocket *> l_It(m_Conns);
while (l_It.hasNext())
for (QTcpSocket *l_Conn : std::as_const(m_Conns))
{
QTcpSocket *l_Conn = l_It.next();
if (l_Conn->state() != QAbstractSocket::ConnectedState)
continue;
@@ -1102,20 +1094,15 @@ void AvaTestServer::processLine(const QByteArray &line)
qDebug() << l_Parts[4].trimmed();
//check if absolute pos is in current played stream of script, and set corresponding stream as selected Stream
QVectorIterator<ScrEdAVStream> l_Iterator(m_Script.getStreamSequences());
float l_Duration = 0;
while (l_Iterator.hasNext())
for (const ScrEdAVStream &l_Stream : m_Script.getStreamSequences())
{
ScrEdAVStream l_Stream = l_Iterator.next();
float l_OldDuration = l_Duration;
l_Duration += l_Stream.getDuration();
//qDebug() << "l_Duration " << l_Duration.toString("hh:mm:ss") << " abspos " << m_AbsScriptPos.toString("hh:mm:ss") << " l_Stream = " << l_Stream.getName();
if (l_Duration > m_AbsScriptPos)
{
m_SelStreamFromScript = l_Stream;
l_Iterator.toBack();
m_RelScriptPos = m_AbsScriptPos - l_OldDuration;
qDebug() << "set stream 2" << l_Stream.getName() << " pos is " << m_RelScriptPos;
//m_RelScriptPos = QDateTime::fromTime_t(0);
@@ -1328,11 +1315,8 @@ void AvaTestServer::sendData(const QString &data_)
qDebug() << "Outgoing RCP_AVA: " << data_;
QString data = data_;
data.append(EOL);
QVectorIterator<QTcpSocket *> l_It(m_Conns);
while (l_It.hasNext())
for (QTcpSocket *l_Conn : std::as_const(m_Conns))
{
QTcpSocket *l_Conn = l_It.next();
if (l_Conn->state() == QAbstractSocket::ConnectedState)
{
//qDebug() << "sent to conn " << l_Conn;
@@ -18,7 +18,7 @@
#include <InfrastructureManagement/ism_dtc.h>
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
namespace AudioVideoManagement
@@ -9,11 +9,11 @@
#include "logger.h"
#include <dds/domain/DomainParticipant.hpp>
#include <DDS/Core/topic_lock_master.h>
#include <Core/topic_lock_master.h>
#include <QtCore/QStringList>
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/core_dts_types.h>
#include <Core/core_dts_types.h>
#include <AudioVideoManagement/avm_dts.h>
#include <AudioVideoManagement/avm_fts.h>
@@ -32,7 +32,7 @@
#include <DDS/DDSConnector/dds_connector.h>
#include <ngldb/db_service_handler.h>
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
using namespace AudioVideoManagement;
@@ -13,7 +13,7 @@
#include "logger.h"
#include <AudioVideoManagement/avm_dts.h>
#include <AudioVideoManagement/avm_db.h>
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
#include <ngldb/dbtransaction.h>
#include <vector>
#include <set>
@@ -8,7 +8,7 @@
#include "dds_handler.h"
#include <DDS/Core/core_dtc.h>
#include <Core/core_dtc.h>
namespace TargetAreas
{
@@ -9,8 +9,8 @@
#include <QtCore/QObject>
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/core_dtc.h>
#include <DDS/Core/topic_lock_master.h>
#include <Core/core_dtc.h>
#include <Core/topic_lock_master.h>
#include <ParticipantManagement/ppm_dtc.h>
#include <TrainingAreaBase/tab_ftc.h>
#include <ParticipantManagement/ppm.hpp>
@@ -49,6 +49,8 @@ public:
class Plugin
{
Q_GADGET
public:
Plugin() = default;
virtual ~Plugin() = default;
@@ -8,7 +8,7 @@
#include "dds_handler.h"
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
namespace CentralEffectSimulation
{
@@ -9,8 +9,8 @@
#include <QtCore/QObject>
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/core_dtc.h>
#include <DDS/Core/topic_lock_master.h>
#include <Core/core_dtc.h>
#include <Core/topic_lock_master.h>
#include <CentralEffectSimulation/ces_dts.h>
#include <CentralEffectSimulation/ces_fts.h>
#include <AreaEffectSimulation/aes_dtc.h>
@@ -9,7 +9,7 @@
#include "main_handler.h"
#include "settings.h"
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
#include <LtsPluginManager/lts_plugin_loader.h>
#include <LtsElevation/lts_elevation_manager.h>
@@ -11,7 +11,7 @@
#include <QtCore/QPointF>
#include <QtCore/QString>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <DDS/Core/core.hpp>
#include <Core/core.hpp>
namespace CentralEffectSimulation
{
@@ -9,7 +9,7 @@
#pragma once
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/topic_lock_master.h>
#include <Core/topic_lock_master.h>
#include <CodificationManagement/cod_dts.h>
#include <CodificationManagement/cod_fts.h>
@@ -12,7 +12,7 @@
#include <CodificationManagement/cod_db.h>
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
using namespace CodificationManagement;
@@ -7,7 +7,7 @@
*/
#include "dds_handler.h"
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
namespace EffectShowClient
{
@@ -9,7 +9,7 @@
#pragma once
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/core_dtc.h>
#include <Core/core_dtc.h>
#include <EffectShowClient/esc_dts.h>
#include <EffectShowClient/esc_fts.h>
@@ -14,7 +14,7 @@
#include "handler_vehicle.h"
#include "control_unit_handler.h"
#include "settings.h"
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
namespace EffectShowClient
{
@@ -11,7 +11,7 @@
#include <QtCore/QObject>
#include <NotificationManagement/nom_ftc.h>
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
// Generated
#include <EffectShowClient/esc_db.h>
@@ -9,9 +9,9 @@
#pragma once
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/topic_lock_master.h>
#include <DDS/Core/core_dtc.h>
#include <DDS/Core/core_dts_types.h>
#include <Core/topic_lock_master.h>
#include <Core/core_dtc.h>
#include <Core/core_dts_types.h>
#include <EffectShowManagement/esm_dts.h>
#include <EffectShowManagement/esm_fts.h>
@@ -10,7 +10,7 @@
#include "dds_handler.h"
#include "logger.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
// Generated
#include <EffectShowManagement/esm_db.h>
@@ -12,7 +12,7 @@
#include "esm_convert_from_tab.h"
#include "logger.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
#include <EffectShowManagement/esm_db.h>
#include <EffectShowManagement/esm_dts.h>
@@ -10,7 +10,7 @@
#include "esm_convert_to_tab.h"
#include "logger.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
#include <EffectShowManagement/esm_db.h>
#include <EffectShowManagement/esm_dts.h>
@@ -11,7 +11,7 @@
#include "handler_ppm_data.h"
#include "logger.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
// Generated
#include <EffectShowManagement/esm_db.h>
@@ -8,7 +8,7 @@
#include "dds_handler.h"
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
namespace Evaluations
{
@@ -13,7 +13,7 @@
#include <DDS/DDSConnector/dds_connector.h>
#include <ngldb/db_service_handler.h>
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
namespace Evaluations
{
@@ -9,7 +9,7 @@
#include "dds_handler.h"
#include "logger.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
// Generated
#include <Evaluations/evl_db.h>
@@ -9,7 +9,7 @@
#include "dds_handler.h"
#include "logger.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
// Generated
#include <Evaluations/evl_db.h>
@@ -9,7 +9,7 @@
#include "dds_handler.h"
#include "logger.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
// Generated
#include <Evaluations/evl_db.h>
@@ -9,7 +9,7 @@
#include "dds_handler.h"
#include "logger.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
// Generated
#include <Evaluations/evl_db.h>
@@ -9,7 +9,7 @@
#include "dds_handler.h"
#include "logger.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
// Generated
#include <Evaluations/evl_db.h>
@@ -8,7 +8,7 @@
#pragma once
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
#include <ExerciseEventManagement/eem_dts.h>
#include <InfrastructureManagement/ism_dtc.h>
#include "logger.h"
@@ -14,7 +14,7 @@
#include "web_socket_avs.h"
#include "web_socket_server.h"
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
#include <AlarmManagement/initialization.h>
#include <FilterManagement/initialization.h>
#include <MarkerManagement/initialization.h>
@@ -8,7 +8,7 @@
#include "dds_handler.h"
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
namespace ExerciseManagement
{
@@ -8,7 +8,7 @@
#pragma once
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/topic_lock_master.h>
#include <Core/topic_lock_master.h>
#include <ExerciseManagement/exm_dts.h>
#include <ExerciseManagement/exm_fts.h>
#include <ServiceManagement/scm_ftc.h>
@@ -13,7 +13,7 @@
#include "settings.h"
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
#include <ngltools/ngltools_filesystem.h>
namespace ExerciseManagement
@@ -8,7 +8,7 @@
#include <QtCore/QObject>
#include "dds_handler.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
// Generated
#include <ExerciseManagement/exm_db.h>
@@ -8,7 +8,7 @@
*/
#pragma once
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
// Generated
#include <ExerciseManagement/exm_db.h>
@@ -9,7 +9,7 @@
#include "dds_handler.h"
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
namespace FileManagement
{
@@ -10,7 +10,7 @@
#pragma once
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/topic_lock_master.h>
#include <Core/topic_lock_master.h>
#include <FileManagement/flm_dts.h>
#include <FileManagement/flm_dtc.h>
#include <FileManagement/flm_fts.h>
@@ -17,7 +17,7 @@
#include "pdf_server.h"
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
namespace FileManagement
{
@@ -11,7 +11,7 @@
#include "base.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
// Generated
#include <Lts/Services/FileManagement/flm_db.h>
@@ -11,7 +11,7 @@
#include "base.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
// Generated
#include <Lts/Services/FileManagement/flm_db.h>
@@ -11,7 +11,7 @@
#include "base.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
// Generated
#include <Lts/Services/FileManagement/flm_db.h>
@@ -7,7 +7,7 @@
*/
#include "dds_handler.h"
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
namespace FilterManagement
@@ -9,7 +9,7 @@
#pragma once
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/topic_lock_master.h>
#include <Core/topic_lock_master.h>
#include <FilterManagement/flt_dts.h>
#include <FilterManagement/flt_fts.h>
@@ -8,7 +8,7 @@
#include "settings.h"
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
#include <FilterManagement/initialization.h>
@@ -8,7 +8,7 @@
#include "dds_handler.h"
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
namespace GuezIedManagement
{
@@ -9,7 +9,7 @@
#pragma once
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/topic_lock_master.h>
#include <Core/topic_lock_master.h>
#include <GuezIedManagement/gim_dts.h>
#include <GuezIedManagement/gim_fts.h>
#include "logger.h"
@@ -10,7 +10,7 @@
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
#include <ngldb/db_service_handler.h>
#include <CodificationManagement/initialization.h>
#include <EffectShowManagement/initialization.h>
@@ -10,7 +10,7 @@
#include "dds_handler.h"
#include "logger.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
#include <ParticipantManagement/ppm_dtc.h>
// Generated
@@ -8,7 +8,7 @@
#include "dds_handler.h"
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
namespace GuezMinelayerProcessing
{
@@ -8,7 +8,7 @@
#pragma once
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/topic_lock_master.h>
#include <Core/topic_lock_master.h>
#include "logger.h"
namespace GuezMinelayerProcessing
@@ -48,9 +48,17 @@ ENDIF()
IF(BUILD_RTI)
CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
ENDIF()
# generate ism_[d|f]tc.h
IF(BUILD_RTI)
# Generate ism_[d|f]tc.h
IF(BUILD_GRANTLEE)
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
ELSEIF(BUILD_RTI)
# Use pre-generated files when BUILD_GRANTLEE=OFF
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/ism_dtc.h ${CMAKE_CURRENT_BINARY_DIR}/ism_dtc.h COPYONLY)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/ism_ftc.h ${CMAKE_CURRENT_BINARY_DIR}/ism_ftc.h COPYONLY)
LIST(APPEND SRCS_common
${CMAKE_CURRENT_BINARY_DIR}/ism_dtc.h
${CMAKE_CURRENT_BINARY_DIR}/ism_ftc.h
)
ENDIF()
NGL_ADD_LIBRARY(AAR SV WS HLA svcIsmCommon SHARED ${SRCS_common})
@@ -83,8 +91,16 @@ SET(SRCS_client
parse_building_xml.h
)
# generate ism_[d|f]tc_impl.[cpp|h]
IF(BUILD_RTI)
IF(BUILD_GRANTLEE)
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
ELSEIF(BUILD_RTI)
# Use pre-generated files when BUILD_GRANTLEE=OFF
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/ism_dtc_impl_custom.cpp ${CMAKE_CURRENT_BINARY_DIR}/ism_dtc_impl_custom.cpp COPYONLY)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/ism_dtc_impl_custom.h ${CMAKE_CURRENT_BINARY_DIR}/ism_dtc_impl_custom.h COPYONLY)
LIST(APPEND SRCS_client
${CMAKE_CURRENT_BINARY_DIR}/ism_dtc_impl_custom.cpp
${CMAKE_CURRENT_BINARY_DIR}/ism_dtc_impl_custom.h
)
ENDIF()
NGL_ADD_LIBRARY(AAR SV WS HLA svcIsmClient SHARED ${SRCS_client})
@@ -9,7 +9,7 @@
#include "dds_handler.h"
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
namespace InfrastructureManagement
{
@@ -10,7 +10,7 @@
#pragma once
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/topic_lock_master.h>
#include <Core/topic_lock_master.h>
#include <InfrastructureManagement/ism_dts.h>
#include <InfrastructureManagement/ism_fts.h>
#include "logger.h"
@@ -10,8 +10,16 @@
#include <cstdint>
#include <string>
#include <vector>
#include <QtCore/QString>
#include <QtCore/QByteArray>
#include <QtGui/QImage>
#include <QtCore/QMap>
#include "ism_enums.hpp"
#include "ParticipantManagement/ppm_enums.hpp"
// Using-declaration for DataModification
using DataModification = ParticipantManagement::DataModification;
namespace InfrastructureManagement {
@@ -53,7 +61,7 @@ private:
// StructureElement Stub-Klasse
class StructureElement {
public:
StructureElement() : id_(0), mainStructureElementId_(0), mountingPointTypeId_(MountingPointType::Undefined) {}
StructureElement() : id_(0), mainStructureElementId_(0), mountingPointTypeId_(MountingPointType::Undefined), mountingPointId_(0) {}
int32_t id() const { return id_; }
void id(int32_t v) { id_ = v; }
@@ -64,6 +72,14 @@ public:
MountingPointType mountingPointTypeId() const { return mountingPointTypeId_; }
void mountingPointTypeId(MountingPointType v) { mountingPointTypeId_ = v; }
// Für Kompatibilität: structureElementTypeId() als Alias
MountingPointType structureElementTypeId() const { return mountingPointTypeId_; }
void structureElementTypeId(MountingPointType v) { mountingPointTypeId_ = v; }
// mountingPointId() für Sub-ID
int32_t mountingPointId() const { return mountingPointId_; }
void mountingPointId(int32_t v) { mountingPointId_ = v; }
Core::GeoPosition geoPosition() const { return geoPosition_; }
void geoPosition(const Core::GeoPosition& v) { geoPosition_ = v; }
@@ -79,17 +95,138 @@ public:
std::string displayName() const { return displayName_; }
void displayName(const std::string& v) { displayName_ = v; }
// path() returns vector of IDs im Hierarchie-Pfad
const std::vector<int32_t>& path() const { return path_; }
void path(const std::vector<int32_t>& v) { path_ = v; }
private:
int32_t id_;
int32_t mainStructureElementId_;
MountingPointType mountingPointTypeId_;
int32_t mountingPointId_;
Core::GeoPosition geoPosition_;
Core::RelativePosition relPosition_;
std::string properties_;
std::string name_;
std::string displayName_;
std::vector<int32_t> path_;
};
// MainStructureElement - Stub für DDS-generierten Typ
class MainStructureElement {
public:
MainStructureElement() : id_(0), groupId_(0) {}
int32_t id() const { return id_; }
void id(int32_t v) { id_ = v; }
int32_t groupId() const { return groupId_; }
void groupId(int32_t v) { groupId_ = v; }
std::string name() const { return name_; }
void name(const std::string& v) { name_ = v; }
std::string displayName() const { return displayName_; }
void displayName(const std::string& v) { displayName_ = v; }
Core::GeoPosition geoPosition() const { return geoPosition_; }
void geoPosition(const Core::GeoPosition& v) { geoPosition_ = v; }
// For compatibility: elements() returns empty vector by default
const std::vector<StructureElement>& elements() const { return elements_; }
void elements(const std::vector<StructureElement>& v) { elements_ = v; }
private:
int32_t id_;
int32_t groupId_;
std::string name_;
std::string displayName_;
Core::GeoPosition geoPosition_;
std::vector<StructureElement> elements_;
};
// MountingPointAsset - Stub für DDS-generierten Typ
class MountingPointAsset {
public:
MountingPointAsset() : id_(0), mountingPointId_(0), assetId_(0) {}
int32_t id() const { return id_; }
void id(int32_t v) { id_ = v; }
int32_t mountingPointId() const { return mountingPointId_; }
void mountingPointId(int32_t v) { mountingPointId_ = v; }
int32_t assetId() const { return assetId_; }
void assetId(int32_t v) { assetId_ = v; }
std::string name() const { return name_; }
void name(const std::string& v) { name_ = v; }
// For compatibility: structureElementId() alias for mountingPointId()
int32_t structureElementId() const { return mountingPointId_; }
void structureElementId(int32_t v) { mountingPointId_ = v; }
private:
int32_t id_;
int32_t mountingPointId_;
int32_t assetId_;
std::string name_;
};
// Forward declaration - full definition in ism_mounting_point.h
class MountingPoint;
// FootprintElement - für Footprint-Daten
class FootprintElement {
public:
FootprintElement() : isGroundLevel_(false) {}
bool isGroundLevel() const { return isGroundLevel_; }
void isGroundLevel(bool v) { isGroundLevel_ = v; }
Core::RelativePosition relPosition() const { return relPosition_; }
void relPosition(const Core::RelativePosition& v) { relPosition_ = v; }
private:
bool isGroundLevel_;
Core::RelativePosition relPosition_;
};
// MainFootprint - Footprint-Daten für MainStructureElement
class MainFootprint {
public:
MainFootprint() : id_(0) {}
int32_t id() const { return id_; }
void id(int32_t v) { id_ = v; }
const std::vector<FootprintElement>& elements() const { return elements_; }
void elements(const std::vector<FootprintElement>& v) { elements_ = v; }
private:
int32_t id_;
std::vector<FootprintElement> elements_;
};
// InstrumentationAsset - Stub für DDS-generierten Typ
class InstrumentationAsset {
public:
InstrumentationAsset() : id_(0) {}
int32_t id() const { return id_; }
void id(int32_t v) { id_ = v; }
std::string name() const { return name_; }
void name(const std::string& v) { name_ = v; }
private:
int32_t id_;
std::string name_;
};
// StructureElementType Enum (Alias für MountingPointType für Kompatibilität)
using StructureElementType = MountingPointType;
} // namespace InfrastructureManagement
#endif // ISM_HPP
@@ -1,10 +1,36 @@
#pragma once
#include <cstdint>
#include <string>
namespace InfrastructureManagement {
struct FtcData {
std::string name;
uint32_t id;
};
}
// STUB-HEADER: Diese Datei wird normalerweise von ddsftc generiert
// Für die Migration erstellen wir minimale Implementierungen
#include <QtCore/QObject>
#include "ism.hpp"
namespace InfrastructureManagement
{
namespace Interface
{
// Ftc - Function Transfer Component
class Ftc : public QObject
{
Q_OBJECT
public:
Ftc(QObject* parent = nullptr) : QObject(parent) {}
~Ftc() override = default;
// MainStructureElement operations
virtual void setMainStructureElement(const MainStructureElement& data) = 0;
virtual void removeMainStructureElement(int32_t id) = 0;
// MainSchedule operations
virtual void setMainSchedule(const MainSchedule& data) = 0;
virtual void removeMainSchedule(int32_t id) = 0;
// MountingPointAsset operations
virtual void setMountingPointAsset(const MountingPointAsset& data) = 0;
virtual void removeMountingPointAsset(int32_t id) = 0;
};
} // namespace Interface
} // namespace InfrastructureManagement
@@ -19,7 +19,7 @@
#include "settings.h"
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <ngldb/db_service_handler.h>
@@ -10,7 +10,7 @@
#pragma once
#include "base.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
#include <InfrastructureManagement/ism_db.h>
@@ -10,7 +10,7 @@
#pragma once
#include "base.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
#include <InfrastructureManagement/ism_db.h>
@@ -10,7 +10,7 @@
#pragma once
#include "base.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
#include <InfrastructureManagement/ism_db.h>
@@ -12,7 +12,7 @@
#include <QtCore/QMap>
#include <QJsonArray>
#include "base.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
#include <InfrastructureManagement/ism_db.h>
@@ -10,7 +10,7 @@
#pragma once
#include "base.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
#include <InfrastructureManagement/ism_db.h>
@@ -10,7 +10,7 @@
#pragma once
#include "base.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
#include <InfrastructureManagement/ism_db.h>
@@ -10,7 +10,7 @@
#pragma once
#include "base.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
#include <InfrastructureManagement/ism_db.h>
#include <InfrastructureManagement/object_main_structure_element.h>
@@ -8,7 +8,7 @@
#pragma once
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/topic_lock_master.h>
#include <Core/topic_lock_master.h>
#include <MarkerManagement/mrk_dts.h>
#include <MarkerManagement/mrk_fts.h>
#include "logger.h"
@@ -10,7 +10,7 @@
#include "dds_handler.h"
#include "mrk_db.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
// Generated
#include <MarkerManagement/mrk_db.h>
@@ -11,7 +11,7 @@
#include <QtCore/QVector>
#include "dds_handler.h"
#include "mrk_db.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
// Generated
#include <MarkerManagement/mrk_db.h>
@@ -8,7 +8,7 @@
#include "dds_handler.h"
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
namespace Messaging
{
@@ -8,8 +8,8 @@
#pragma once
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/topic_lock_master.h>
#include <DDS/Core/core_dtc.h>
#include <Core/topic_lock_master.h>
#include <Core/core_dtc.h>
#include <ParticipantManagement/ppm_dtc.h>
@@ -9,7 +9,7 @@
#include "main_handler.h"
#include "settings.h"
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
#include <ngldb/db_service_handler.h>
namespace Messaging
@@ -8,7 +8,7 @@
#include "dds_handler.h"
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
namespace MeteoDataManagement
{
@@ -12,7 +12,7 @@
#include <MeteoDataManagement/mdm_dts.h>
#include <MeteoDataManagement/mdm_fts.h>
#include <DDS/Core/core_dtc.h>
#include <Core/core_dtc.h>
#include "logger.h"
@@ -9,7 +9,7 @@
#include "main_handler.h"
#include "settings.h"
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
#include <ngldb/db_service_handler.h>
#include <GuezNasat/initialization.h>
@@ -12,7 +12,7 @@
#include "nme_fts.h"
#include <DDS/DTS/generic_dts_impl.h>
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
namespace NmeaManagement
{
@@ -10,9 +10,9 @@
#include <QtCore/QObject>
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/core_dts_types.h>
#include <DDS/Core/core_dtc.h>
#include <DDS/Core/pacemaker.h>
#include <Core/core_dts_types.h>
#include <Core/core_dtc.h>
#include <Core/pacemaker.h>
#include <NmeaManagement/nme_dts.h>
#include <NmeaManagement/nme_fts.h>
@@ -7,6 +7,7 @@
*/
#include <QtCore/QTime>
#include <QtCore/QDateTime>
#include <QtCore/QRegularExpression>
#include "nmea_handler.h"
namespace NmeaManagement
{
@@ -64,7 +65,7 @@ void NmeaHandler::IIXDR(QString package)
NmeaManagement::BatteryState batteryState;
NmeaManagement::ServiceControl serviceControl;
QRegExp sep(QStringLiteral("(\\,|\\*)"));
QRegularExpression sep(QStringLiteral("(\\,|\\*)"));
QStringList pkt_data = package.split(sep.pattern());
INFO_LOG(m_logger) << "----------------------------------------------------";
INFO_LOG(m_logger) << "batteryState pkt_data.size=" << pkt_data.size();
@@ -185,7 +186,7 @@ qint64 NmeaHandler::getDateTime(QString receivedTimeStr)
void NmeaHandler::IIALR(QString package)
{
NmeaManagement::BatteryAlarm batteryAlarm;
QRegExp sep(QStringLiteral("(\\,|\\*)"));
QRegularExpression sep(QStringLiteral("(\\,|\\*)"));
QStringList pkt_data = package.split(sep.pattern());
alarm_state packageData;
INFO_LOG(m_logger) << "pkt_data.size=" << pkt_data.size();
@@ -229,7 +230,7 @@ void NmeaHandler::GPGGA(QString package)
NmeaManagement::PositionExcon PositionExcon;
double latDecimal;
double lonDecimal;
QRegExp sep(QStringLiteral("(\\,|\\*)"));
QRegularExpression sep(QStringLiteral("(\\,|\\*)"));
QStringList pkt_data = package.split(sep.pattern());
gpgga_data packageData;
@@ -316,7 +317,7 @@ void NmeaHandler::GPGGA(QString package)
void NmeaHandler::GPRMC(QString package)
{
QRegExp sep(QStringLiteral("(\\,|\\*)"));
QRegularExpression sep(QStringLiteral("(\\,|\\*)"));
QStringList pkt_data = package.split(sep.pattern());
gprmc_data packageData;
@@ -8,7 +8,7 @@
#include "dds_handler.h"
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
namespace NotificationManagement
{
@@ -7,8 +7,8 @@
*/
#pragma once
#include <DDS/Core/core_dtc.h>
#include <DDS/Core/topic_lock_master.h>
#include <Core/core_dtc.h>
#include <Core/topic_lock_master.h>
#include <DDS/DDSConnector/dds_connector.h>
#include "logger.h"
@@ -9,7 +9,7 @@
#include "main_handler.h"
#include "settings.h"
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
#include <ngldb/db_service_handler.h>
namespace NotificationManagement
@@ -10,7 +10,7 @@
#include "dds_handler.h"
//#include "nom_db.h"
#include <DDS/Core/function_reply_object.h>
#include <Core/function_reply_object.h>
// Generated
#include <NotificationManagement/nom_db.h>
Loaded 100 of 256 files, more files were not shown because too many files have changed in this diff. Show more