diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/bld_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/bld_dtc.h deleted file mode 100644 index 859411d68..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/bld_dtc.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -// Stub file for BUILD_GRANTLEE=OFF -// Auto-generated during Qt6 migration -namespace DDS { class Topic; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/bld_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/bld_ftc.h deleted file mode 100644 index 5ac72ce7b..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/bld_ftc.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once -// Stub file for BUILD_GRANTLEE=OFF -// Auto-generated during Qt6 migration diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/cmo_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/cmo_dtc.h deleted file mode 100644 index 859411d68..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/cmo_dtc.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -// Stub file for BUILD_GRANTLEE=OFF -// Auto-generated during Qt6 migration -namespace DDS { class Topic; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/cmo_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/cmo_ftc.h deleted file mode 100644 index 5ac72ce7b..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/cmo_ftc.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once -// Stub file for BUILD_GRANTLEE=OFF -// Auto-generated during Qt6 migration diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/gna_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/gna_dtc.h deleted file mode 100644 index 859411d68..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/gna_dtc.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -// Stub file for BUILD_GRANTLEE=OFF -// Auto-generated during Qt6 migration -namespace DDS { class Topic; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/gna_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/gna_ftc.h deleted file mode 100644 index 5ac72ce7b..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/gna_ftc.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once -// Stub file for BUILD_GRANTLEE=OFF -// Auto-generated during Qt6 migration diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_dtc.h deleted file mode 100644 index 859411d68..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_dtc.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -// Stub file for BUILD_GRANTLEE=OFF -// Auto-generated during Qt6 migration -namespace DDS { class Topic; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_ftc.h deleted file mode 100644 index 5ac72ce7b..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_ftc.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once -// Stub file for BUILD_GRANTLEE=OFF -// Auto-generated during Qt6 migration diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/taboc_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/taboc_dtc.h deleted file mode 100644 index 859411d68..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/taboc_dtc.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -// Stub file for BUILD_GRANTLEE=OFF -// Auto-generated during Qt6 migration -namespace DDS { class Topic; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/taboc_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/taboc_ftc.h deleted file mode 100644 index 5ac72ce7b..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/taboc_ftc.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once -// Stub file for BUILD_GRANTLEE=OFF -// Auto-generated during Qt6 migration diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/alm_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/alm_dtc.h deleted file mode 100644 index c703ca8e4..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/alm_dtc.h +++ /dev/null @@ -1,23 +0,0 @@ -// Stub DTC header for AlarmManagement service -// Pre-generated for BUILD_GRANTLEE=OFF - -#ifndef ALM_DTC_H -#define ALM_DTC_H - -#include -#include "alm_export.h" - -namespace AlarmManagement { -namespace Interface { - -class ALM_EXPORT Dtc : public QObject { - Q_OBJECT -public: - explicit Dtc(QObject* parent = nullptr); - virtual ~Dtc(); -}; - -} // namespace Interface -} // namespace AlarmManagement - -#endif // ALM_DTC_H \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/alm_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/alm_ftc.h deleted file mode 100644 index d045a8bd4..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/alm_ftc.h +++ /dev/null @@ -1,23 +0,0 @@ -// Stub FTC header for AlarmManagement service -// Pre-generated for BUILD_GRANTLEE=OFF - -#ifndef ALM_FTC_H -#define ALM_FTC_H - -#include -#include "alm_export.h" - -namespace AlarmManagement { -namespace Interface { - -class ALM_EXPORT Ftc : public QObject { - Q_OBJECT -public: - explicit Ftc(QObject* parent = nullptr); - virtual ~Ftc(); -}; - -} // namespace Interface -} // namespace AlarmManagement - -#endif // ALM_FTC_H \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/aes_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/aes_dtc.h deleted file mode 100644 index 0fa5c7eda..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/aes_dtc.h +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -namespace AreaEffectSimulation { namespace Interface { class Dtc; class Ftc; } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/aes_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/aes_ftc.h deleted file mode 100644 index 0fa5c7eda..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/aes_ftc.h +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -namespace AreaEffectSimulation { namespace Interface { class Dtc; class Ftc; } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/asm_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/asm_dtc.h deleted file mode 100644 index 9c62b350a..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/asm_dtc.h +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -namespace AssetManagement { namespace Interface { class Dtc; class Ftc; } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/asm_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/asm_ftc.h deleted file mode 100644 index 9c62b350a..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/asm_ftc.h +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -namespace AssetManagement { namespace Interface { class Dtc; class Ftc; } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avm_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avm_dtc.h deleted file mode 100644 index d04c4def2..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avm_dtc.h +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -namespace AudioVideoManagement { namespace Interface { class Dtc; class Ftc; } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avm_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avm_ftc.h deleted file mode 100644 index d04c4def2..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/avm_ftc.h +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -namespace AudioVideoManagement { namespace Interface { class Dtc; class Ftc; } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/svcavmcommon_export.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/svcavmcommon_export.h deleted file mode 100644 index 9d3568212..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/svcavmcommon_export.h +++ /dev/null @@ -1,14 +0,0 @@ -// Stub export header for non-RTI builds -// When BUILD_RTI=OFF, svcAvmCommon library is not built -// This stub allows dependent code to compile -#ifndef SVCAVMCOMMON_EXPORT_H -#define SVCAVMCOMMON_EXPORT_H - -// Map to the actual macro names used in the code -#define SVCAVMCOMMON_EXPORT -#define SVCAVMCOMMON_NO_EXPORT -#define AVM_COMMON_EXPORT -#define AVM_CLIENT_EXPORT -#define AVM_SERVER_EXPORT - -#endif diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ces_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ces_dtc.h deleted file mode 100644 index c4ed6a80f..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ces_dtc.h +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -namespace CentralEffectSimulation { namespace Interface { class Dtc; class Ftc; } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ces_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ces_ftc.h deleted file mode 100644 index c4ed6a80f..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ces_ftc.h +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -namespace CentralEffectSimulation { namespace Interface { class Dtc; class Ftc; } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/cod_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/cod_dtc.h deleted file mode 100644 index 0aad572f6..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/cod_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace CodificationManagement -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace CodificationManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/cod_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/cod_ftc.h deleted file mode 100644 index 0aad572f6..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/cod_ftc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace CodificationManagement -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace CodificationManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_dtc.h deleted file mode 100644 index 7344ff4bc..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_dtc.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _STUB_DTC_H -#define _STUB_DTC_H -// Stub file for BUILD_GRANTLEE=OFF -namespace ESC { - class Dtc {}; -} -#endif diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_ftc.h deleted file mode 100644 index b21427e1c..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_ftc.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _STUB_FTC_H -#define _STUB_FTC_H -// Stub file for BUILD_GRANTLEE=OFF -namespace ESC { - class Ftc {}; -} -#endif diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_dtc.h deleted file mode 100644 index 038725933..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_dtc.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _STUB_DTC_H -#define _STUB_DTC_H -// Stub file for BUILD_GRANTLEE=OFF -namespace ESM { - class Dtc {}; -} -#endif diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_ftc.h deleted file mode 100644 index bdbc05f7d..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_ftc.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _STUB_FTC_H -#define _STUB_FTC_H -// Stub file for BUILD_GRANTLEE=OFF -namespace ESM { - class Ftc {}; -} -#endif diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/evl_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/evl_dtc.h deleted file mode 100644 index 2af4ccb91..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/evl_dtc.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _STUB_DTC_H -#define _STUB_DTC_H -// Stub file for BUILD_GRANTLEE=OFF -namespace EVL { - class Dtc {}; -} -#endif diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/evl_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/evl_ftc.h deleted file mode 100644 index 780b39919..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/evl_ftc.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _STUB_FTC_H -#define _STUB_FTC_H -// Stub file for BUILD_GRANTLEE=OFF -namespace EVL { - class Ftc {}; -} -#endif diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/eem_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/eem_dtc.h deleted file mode 100644 index ce5c860f8..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/eem_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace ExerciseEventManagement -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace ExerciseEventManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/eem_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/eem_ftc.h deleted file mode 100644 index b0144ef7e..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/eem_ftc.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef EEM_FTC_H -#define EEM_FTC_H - -// Stub file for eem_ftc.h - generated code placeholder -// This file is auto-generated from eem_service.xml when BUILD_GRANTLEE=ON -// For BUILD_GRANTLEE=OFF, this stub allows compilation to proceed - -namespace ExerciseEventManagement { -namespace Dds { - -// Forward declarations - actual definitions in generated code -class Ftc; - -} // namespace Dds -} // namespace ExerciseEventManagement - -#endif // EEM_FTC_H diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exm_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exm_dtc.h deleted file mode 100644 index c4b473296..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exm_dtc.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _STUB_DTC_H -#define _STUB_DTC_H -// Stub file for BUILD_GRANTLEE=OFF -namespace EXM { - class Dtc {}; -} -#endif diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exm_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exm_ftc.h deleted file mode 100644 index 8fd2beb67..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/exm_ftc.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _STUB_FTC_H -#define _STUB_FTC_H -// Stub file for BUILD_GRANTLEE=OFF -namespace EXM { - class Ftc {}; -} -#endif diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/gim_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/gim_dtc.h deleted file mode 100644 index b18bb76df..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/gim_dtc.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _STUB_DTC_H -#define _STUB_DTC_H -// Stub file for BUILD_GRANTLEE=OFF -namespace GIM { - class Dtc {}; -} -#endif diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/gim_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/gim_ftc.h deleted file mode 100644 index 2350a0176..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/gim_ftc.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _STUB_FTC_H -#define _STUB_FTC_H -// Stub file for BUILD_GRANTLEE=OFF -namespace GIM { - class Ftc {}; -} -#endif diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/gmp_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/gmp_dtc.h deleted file mode 100644 index e5791f170..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/gmp_dtc.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef GMP_DTC_H -#define GMP_DTC_H - -// Stub file for gmp_dtc.h - generated code placeholder -// This file is auto-generated from gmp_service.xml when BUILD_GRANTLEE=ON -// For BUILD_GRANTLEE=OFF, this stub allows compilation to proceed - -namespace GuezMinelayerProcessing { -namespace Dds { - -// Forward declarations - actual definitions in generated code -class Dtc; - -} // namespace Dds -} // namespace GuezMinelayerProcessing - -#endif // GMP_DTC_H diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/gmp_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/gmp_ftc.h deleted file mode 100644 index cab5c2426..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/gmp_ftc.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef GMP_FTC_H -#define GMP_FTC_H - -// Stub file for gmp_ftc.h - generated code placeholder -// This file is auto-generated from gmp_service.xml when BUILD_GRANTLEE=ON -// For BUILD_GRANTLEE=OFF, this stub allows compilation to proceed - -namespace GuezMinelayerProcessing { -namespace Dds { - -// Forward declarations - actual definitions in generated code -class Ftc; - -} // namespace Dds -} // namespace GuezMinelayerProcessing - -#endif // GMP_FTC_H diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism.hpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism.hpp deleted file mode 100644 index 7fa924fdf..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism.hpp +++ /dev/null @@ -1,232 +0,0 @@ -/** - * @file ism.hpp - * @brief DDS-Stub-Header für InfrastructureManagement - * - * Dieser Header ersetzt die von RTI DDS Generator erzeugten Typen. - */ - -#ifndef ISM_HPP -#define ISM_HPP - -#include -#include -#include -#include -#include -#include -#include -#include "ism_enums.hpp" -#include "ParticipantManagement/ppm_enums.hpp" - -// Using-declaration for DataModification -using DataModification = ParticipantManagement::DataModification; - -namespace InfrastructureManagement { - -// Core namespace mit GeoPosition und RelativePosition -namespace Core { - -class GeoPosition { -public: - GeoPosition() : latitude_(0.0), longitude_(0.0), altitude_(0.0) {} - double latitude() const { return latitude_; } - double longitude() const { return longitude_; } - double altitude() const { return altitude_; } - void latitude(double v) { latitude_ = v; } - void longitude(double v) { longitude_ = v; } - void altitude(double v) { altitude_ = v; } -private: - double latitude_; - double longitude_; - double altitude_; -}; - -class RelativePosition { -public: - RelativePosition() : x_(0.0), y_(0.0), z_(0.0) {} - double x() const { return x_; } - double y() const { return y_; } - double z() const { return z_; } - void x(double v) { x_ = v; } - void y(double v) { y_ = v; } - void z(double v) { z_ = v; } -private: - double x_; - double y_; - double z_; -}; - -} // namespace Core - -// StructureElement Stub-Klasse -class StructureElement { -public: - StructureElement() : id_(0), mainStructureElementId_(0), mountingPointTypeId_(MountingPointType::Undefined), mountingPointId_(0) {} - - int32_t id() const { return id_; } - void id(int32_t v) { id_ = v; } - - int32_t mainStructureElementId() const { return mainStructureElementId_; } - void mainStructureElementId(int32_t v) { mainStructureElementId_ = v; } - - 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; } - - Core::RelativePosition relPosition() const { return relPosition_; } - void relPosition(const Core::RelativePosition& v) { relPosition_ = v; } - - std::string properties() const { return properties_; } - void properties(const std::string& v) { properties_ = 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; } - - // path() returns vector of IDs im Hierarchie-Pfad - const std::vector& path() const { return path_; } - void path(const std::vector& 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 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& elements() const { return elements_; } - void elements(const std::vector& v) { elements_ = v; } - -private: - int32_t id_; - int32_t groupId_; - std::string name_; - std::string displayName_; - Core::GeoPosition geoPosition_; - std::vector 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& elements() const { return elements_; } - void elements(const std::vector& v) { elements_ = v; } - -private: - int32_t id_; - std::vector 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 diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism_dtc.h deleted file mode 100644 index 6ca6b02ce..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism_dtc.h +++ /dev/null @@ -1,129 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Implementierungen - -#include -#include -#include -#include -#include "ism.hpp" -#include "ism_mounting_point.h" - -namespace InfrastructureManagement -{ -namespace Interface -{ - -// Forward declarations -class Dtc; -class Ftc; - -// DataModification Enum -enum class DataModification -{ - eAdded, - eModified, - eRemoved -}; - -// MountingPointPlan - Planungsdaten für MountingPoints (MUST come before MainSchedule) -class MountingPointPlan { -public: - MountingPointPlan() : structureElementId_(0) {} - int32_t structureElementId() const { return structureElementId_; } - void structureElementId(int32_t v) { structureElementId_ = v; } - - MountingPointState mountingPointState() const { return mountingPointState_; } - void mountingPointState(const MountingPointState& v) { mountingPointState_ = v; } - -private: - int32_t structureElementId_; - MountingPointState mountingPointState_; -}; - -// MainSchedule - benötigt für Schedule-Daten -class MainSchedule { -public: - MainSchedule() : id_(0) {} - int32_t id() const { return id_; } - void id(int32_t v) { id_ = v; } - - // elements() returns vector of MountingPointPlan - const std::vector& elements() const { return elements_; } - void elements(const std::vector& v) { elements_ = v; } - -private: - int32_t id_; - std::vector elements_; -}; - -// InstrumentationAssetState Enum -enum class InstrumentationAssetState -{ - Undefined = 0, - Ok = 1, - Defect = 2 -}; - -// InstrumentationAsset - Asset-Daten -class InstrumentationAsset { -public: - InstrumentationAsset() : assetId_(0), assetStateId_(InstrumentationAssetState::Undefined) {} - int32_t assetId() const { return assetId_; } - void assetId(int32_t v) { assetId_ = v; } - - InstrumentationAssetState assetStateId() const { return assetStateId_; } - void assetStateId(InstrumentationAssetState v) { assetStateId_ = v; } - -private: - int32_t assetId_; - InstrumentationAssetState assetStateId_; -}; - -// Dtc - Data Transfer Component (Hauptklasse für ISM-Daten) -class Dtc : public QObject -{ - Q_OBJECT - -public: - Dtc(QObject* parent = nullptr) : QObject(parent) {} - ~Dtc() override = default; - - // MainStructureElement Zugriff - virtual const QMap& mainStructureElements() const = 0; - virtual MainStructureElement mainStructureElement(int32_t id) const = 0; - virtual bool getStructureElementById(int32_t id, StructureElement& out) const = 0; - virtual void waitForHistoricalDataMainStructureElement(int timeoutMs) = 0; - - // MainSchedule Zugriff - virtual const QMap& mainSchedules() const = 0; - virtual MainSchedule mainSchedule(int32_t id) const = 0; - virtual void waitForHistoricalDataMainSchedule(int timeoutMs) = 0; - - // MountingPointAsset Zugriff - virtual void mountingPointAssets(const std::function& cb) = 0; - virtual void waitForHistoricalDataMountingPointAsset(int timeoutMs) = 0; - virtual InstrumentationAsset instrumentationAsset(int32_t assetId) const = 0; - - // MainFootprint Zugriff (wird in ism_dtc_impl_custom_p.h verwendet) - virtual MainFootprint mainFootprint(int mseId) const = 0; - -signals: - void mainStructureElementChanged(const MainStructureElement& data, DataModification modType); - void mainScheduleChanged(const MainSchedule& data, DataModification modType); - void mountingPointAssetChanged(const MountingPointAsset& data, DataModification modType); -}; - -// Ftc - Forward Declaration (wird später implementiert) -class Ftc : public QObject -{ - Q_OBJECT - -public: - Ftc(QObject* parent = nullptr) : QObject(parent) {} - ~Ftc() override = default; -}; - -} // namespace Interface -} // namespace InfrastructureManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism_ftc.h deleted file mode 100644 index e20321d57..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism_ftc.h +++ /dev/null @@ -1,36 +0,0 @@ -#pragma once -// STUB-HEADER: Diese Datei wird normalerweise von ddsftc generiert -// Für die Migration erstellen wir minimale Implementierungen - -#include -#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 \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/mrk_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/mrk_dtc.h deleted file mode 100644 index 379ecca8b..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/mrk_dtc.h +++ /dev/null @@ -1,58 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -#include -#include -#include -#include -#include - -#include - -#include "LtsUtils/LtsUtilsCore/data_modification_enum.h" -#include "mrk_marker.h" - -namespace MarkerManagement -{ - -namespace Interface -{ - -// Dtc interface class with signals for Qt6 migration STUB -class Dtc : public QObject -{ - Q_OBJECT -public: - explicit Dtc(QObject* parent = nullptr) : QObject(parent) {} - ~Dtc() override = default; - - // Callback registration instead of enableNotification() - void markers(std::function callback) - { - m_markerCallback = callback; - } - - // Trigger marker changed (for STUB testing) - void triggerMarkerChanged(const Marker& marker, DataModification modType) - { - emit markerChanged(marker, modType); - if (m_markerCallback) - { - m_markerCallback(marker); - } - } - -signals: - void markerChanged(const Marker& marker, DataModification modType); - -private: - std::function m_markerCallback; -}; - -class Ftc; - -} // namespace Interface - -} // namespace MarkerManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/mrk_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/mrk_ftc.h deleted file mode 100644 index f95a9d333..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/mrk_ftc.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef MRK_FTC_H -#define MRK_FTC_H - -// Stub file for mrk_ftc.h - generated code placeholder -// This file is auto-generated from mrk_service.xml when BUILD_GRANTLEE=ON -// For BUILD_GRANTLEE=OFF, this stub allows compilation to proceed - -namespace MarkerManagement { -namespace Dds { - -// Forward declarations - actual definitions in generated code -class Ftc; - -} // namespace Dds -} // namespace MarkerManagement - -#endif // MRK_FTC_H diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/svcmrkcommon_export.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/svcmrkcommon_export.h deleted file mode 100644 index e17b6e31b..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/svcmrkcommon_export.h +++ /dev/null @@ -1,8 +0,0 @@ -// Stub export header for non-RTI builds -#ifndef SVCMRKCOMMON_EXPORT_H -#define SVCMRKCOMMON_EXPORT_H - -#define SVCMRKCOMMON_EXPORT -#define SVCMRKCOMMON_NO_EXPORT - -#endif diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/msg_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/msg_dtc.h deleted file mode 100644 index e6a935b68..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/msg_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace Messaging -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace Messaging diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/msg_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/msg_ftc.h deleted file mode 100644 index cf94d39ad..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/msg_ftc.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef MSG_FTC_H -#define MSG_FTC_H - -// Stub file for msg_ftc.h - generated code placeholder -// This file is auto-generated from msg_service.xml when BUILD_GRANTLEE=ON -// For BUILD_GRANTLEE=OFF, this stub allows compilation to proceed - -namespace Messaging { -namespace Dds { - -// Forward declarations - actual definitions in generated code -class Ftc; - -} // namespace Dds -} // namespace Messaging - -#endif // MSG_FTC_H diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/mdm_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/mdm_dtc.h deleted file mode 100644 index 9efa8bfc7..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/mdm_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace MeteoDataManagement -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace MeteoDataManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/mdm_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/mdm_ftc.h deleted file mode 100644 index 297c3e14b..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/mdm_ftc.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef MDM_FTC_H -#define MDM_FTC_H - -// Stub file for mdm_ftc.h - generated code placeholder -// This file is auto-generated from mdm_service.xml when BUILD_GRANTLEE=ON -// For BUILD_GRANTLEE=OFF, this stub allows compilation to proceed - -namespace MeteoDataManagement { -namespace Dds { - -// Forward declarations - actual definitions in generated code -class Ftc; - -} // namespace Dds -} // namespace MeteoDataManagement - -#endif // MDM_FTC_H diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/nme_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/nme_dtc.h deleted file mode 100644 index 8b4130862..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/nme_dtc.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef NME_DTC_H -#define NME_DTC_H - -// Stub file for nme_dtc.h - generated code placeholder -// This file is auto-generated from nme_service.xml when BUILD_GRANTLEE=ON -// For BUILD_GRANTLEE=OFF, this stub allows compilation to proceed - -namespace NmeaManagement { -namespace Dds { - -// Forward declarations - actual definitions in generated code -class Dtc; - -} // namespace Dds -} // namespace NmeaManagement - -#endif // NME_DTC_H diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/nme_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/nme_ftc.h deleted file mode 100644 index e1c7f5bda..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/nme_ftc.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef NME_FTC_H -#define NME_FTC_H - -// Stub file for nme_ftc.h - generated code placeholder -// This file is auto-generated from nme_service.xml when BUILD_GRANTLEE=ON -// For BUILD_GRANTLEE=OFF, this stub allows compilation to proceed - -namespace NmeaManagement { -namespace Dds { - -// Forward declarations - actual definitions in generated code -class Ftc; - -} // namespace Dds -} // namespace NmeaManagement - -#endif // NME_FTC_H diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/nom_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/nom_dtc.h deleted file mode 100644 index 79d7b43e9..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/nom_dtc.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _STUB_DTC_H -#define _STUB_DTC_H -// Stub file for BUILD_GRANTLEE=OFF -namespace NOM { - class Dtc {}; -} -#endif diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/nom_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/nom_ftc.h deleted file mode 100644 index 496bb11a5..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/nom_ftc.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _STUB_FTC_H -#define _STUB_FTC_H -// Stub file for BUILD_GRANTLEE=OFF -namespace NOM { - class Ftc {}; -} -#endif diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/obd_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/obd_dtc.h deleted file mode 100644 index 762795109..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/obd_dtc.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef OBD_DTC_H -#define OBD_DTC_H - -// Stub file for obd_dtc.h - generated code placeholder -// This file is auto-generated from obd_service.xml when BUILD_GRANTLEE=ON -// For BUILD_GRANTLEE=OFF, this stub allows compilation to proceed - -namespace OcBaseDownload { -namespace Dds { - -// Forward declarations - actual definitions in generated code -class Dtc; - -} // namespace Dds -} // namespace OcBaseDownload - -#endif // OBD_DTC_H diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/obd_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/obd_ftc.h deleted file mode 100644 index e006e5857..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/obd_ftc.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef OBD_FTC_H -#define OBD_FTC_H - -// Stub file for obd_ftc.h - generated code placeholder -// This file is auto-generated from obd_service.xml when BUILD_GRANTLEE=ON -// For BUILD_GRANTLEE=OFF, this stub allows compilation to proceed - -namespace OcBaseDownload { -namespace Dds { - -// Forward declarations - actual definitions in generated code -class Ftc; - -} // namespace Dds -} // namespace OcBaseDownload - -#endif // OBD_FTC_H diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/osc_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/osc_dtc.h deleted file mode 100644 index 77f1cb2ea..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/osc_dtc.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _STUB_DTC_H -#define _STUB_DTC_H -// Stub file for BUILD_GRANTLEE=OFF -namespace OSC { - class Dtc {}; -} -#endif diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/osc_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/osc_ftc.h deleted file mode 100644 index 8b56f9854..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/osc_ftc.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _STUB_FTC_H -#define _STUB_FTC_H -// Stub file for BUILD_GRANTLEE=OFF -namespace OSC { - class Ftc {}; -} -#endif diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/oss_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/oss_dtc.h deleted file mode 100644 index 6695a5a57..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/oss_dtc.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _STUB_DTC_H -#define _STUB_DTC_H -// Stub file for BUILD_GRANTLEE=OFF -namespace OSS { - class Dtc {}; -} -#endif diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/oss_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/oss_ftc.h deleted file mode 100644 index 29af724ca..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/oss_ftc.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _STUB_FTC_H -#define _STUB_FTC_H -// Stub file for BUILD_GRANTLEE=OFF -namespace OSS { - class Ftc {}; -} -#endif diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OnlineReports/ore_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OnlineReports/ore_dtc.h deleted file mode 100644 index a54fd2cfd..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OnlineReports/ore_dtc.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _STUB_DTC_H -#define _STUB_DTC_H -// Stub file for BUILD_GRANTLEE=OFF -namespace ORE { - class Dtc {}; -} -#endif diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OnlineReports/ore_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OnlineReports/ore_ftc.h deleted file mode 100644 index d53867deb..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OnlineReports/ore_ftc.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _STUB_FTC_H -#define _STUB_FTC_H -// Stub file for BUILD_GRANTLEE=OFF -namespace ORE { - class Ftc {}; -} -#endif diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/opm_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/opm_dtc.h deleted file mode 100644 index 9e13368c5..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/opm_dtc.h +++ /dev/null @@ -1,43 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Implementierungen - -#include -#include -#include - -namespace OperatorManagement -{ - -struct User -{ - [[nodiscard]] qint32 id() const { return m_id; } - [[nodiscard]] std::string name() const { return m_name; } - - qint32 m_id = 0; - std::string m_name; -}; - -namespace Interface -{ -class Dtc -{ -public: - // Initialization methods - void enableUser() {} - void waitForHistoricalDataUser() {} - - User user(qint32 id) const - { - // STUB-Implementierung - leerer User - User u; - u.m_id = id; - u.m_name = "Unknown"; - return u; - } -}; - -class Ftc; -} // namespace Interface -} // namespace OperatorManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/opm_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/opm_ftc.h deleted file mode 100644 index f5c6ff045..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/opm_ftc.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef OPM_FTC_H -#define OPM_FTC_H - -// Stub header for OperatorManagement FTC functionality -// This file is part of FilterManagement which is excluded from build -// For non-FilterManagement builds, we provide this stub - -#include -#include - -// Forward declarations and stubs for FTC (Filter/Translation/Conversion) -// Actual implementation is in FilterManagement plugin - -class OpmFtc -{ -public: - virtual ~OpmFtc() = default; - // Stub methods - actual implementation in FilterManagement -}; - -#endif // OPM_FTC_H \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_dtc.h deleted file mode 100644 index fb62c60ef..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_dtc.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef PPM_DTC_H -#define PPM_DTC_H - -// Stub file for ppm_dtc.h - generated code placeholder -// This file is auto-generated from ppm_service.xml when BUILD_GRANTLEE=ON -// For BUILD_GRANTLEE=OFF, this stub allows compilation to proceed - -namespace ParticipantManagement { -namespace Dds { - -// Forward declarations - actual definitions in generated code -class Dtc; - -} // namespace Dds -} // namespace ParticipantManagement - -#endif // PPM_DTC_H diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_ftc.h deleted file mode 100644 index c01ee6063..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_ftc.h +++ /dev/null @@ -1,44 +0,0 @@ -#pragma once - -// DDS-Stub-Header für ParticipantManagement FTC (Filter Topic Client) -// Generiert für Qt6-Migration ohne RTI DDS - -#include -#include -#include -#include -#include - -namespace ParticipantManagement -{ -namespace Interface -{ - -class Ftc -{ -public: - class ModifyTypeReplyHandler - { - public: - virtual ~ModifyTypeReplyHandler() = default; - virtual void onModifyTypeReply(const Core::FunctionReplyObject &replyObject) = 0; - }; - - Ftc() = default; - virtual ~Ftc() = default; - - virtual std::map getTypes() const - { - return std::map(); - } - - virtual Type type(int32_t typeId) const - { - Type t; - t.id = typeId; - return t; - } -}; - -} // namespace Interface -} // namespace ParticipantManagement \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/PlanEditor/ped_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/PlanEditor/ped_dtc.h deleted file mode 100644 index fd52b4efb..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/PlanEditor/ped_dtc.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef PED_DTC_H -#define PED_DTC_H - -// Stub file for ped_dtc.h - generated code placeholder -// This file is auto-generated from ped_service.xml when BUILD_GRANTLEE=ON -// For BUILD_GRANTLEE=OFF, this stub allows compilation to proceed - -namespace PlanEditor { -namespace Dds { - -// Forward declarations - actual definitions in generated code -class Dtc; - -} // namespace Dds -} // namespace PlanEditor - -#endif // PED_DTC_H diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/PlanEditor/ped_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/PlanEditor/ped_ftc.h deleted file mode 100644 index b9dc828b7..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/PlanEditor/ped_ftc.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef PED_FTC_H -#define PED_FTC_H - -// Stub file for ped_ftc.h - generated code placeholder -// This file is auto-generated from ped_service.xml when BUILD_GRANTLEE=ON -// For BUILD_GRANTLEE=OFF, this stub allows compilation to proceed - -namespace PlanEditor { -namespace Dds { - -// Forward declarations - actual definitions in generated code -class Ftc; - -} // namespace Dds -} // namespace PlanEditor - -#endif // PED_FTC_H diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/pre_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/pre_dtc.h deleted file mode 100644 index c962b3ebc..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/pre_dtc.h +++ /dev/null @@ -1,190 +0,0 @@ -/** - * @file pre_dtc.h - * @brief DDS-generated Stub-Header für PresentationManagement DTC (Data Transfer Component) - * - * Dieser Header ist ein Stub für den von RTI DDS Generator erzeugten Header. - * Ermöglicht Build ohne echte DDS-Codegenerierung. - */ - -#pragma once - -#include -#include -#include -#include -#include - -namespace PresentationManagement -{ - -// Forward declarations -struct Presentation; -struct PresentationContent; -struct GetPresentationContentReply; - -// FileStatus Enum - Status einer Präsentation -enum class FileStatus : int { Valid = 0, Deleted = 1 }; - -// Presentation - DDS-generierter Typ für Präsentationen -struct Presentation -{ - int32_t id = 0; - QString name; - QString description; - int32_t operatorId = 0; - qint64 lastModified = 0; - FileStatus fileStatus = FileStatus::Valid; -}; - -// PresentationContent - Inhalt einer Präsentation -struct PresentationContent -{ - QString attributes; - QString channel; - QString description; - int32_t duration = 0; - double height = 0.0; - int32_t id = 0; - int32_t index = 0; - int32_t presentationId = 0; - QString presentationTopicType; - qint64 startTime = 0; - double width = 0.0; - double x = 0.0; - double y = 0.0; -}; - -// GetPresentationContentReply - Reply für GetPresentationContent Request -struct GetPresentationContentReply -{ - QList content; -}; - -namespace Interface -{ - -/** - * @brief Dtc - Data Transfer Component für Presentation Management - * - * DDS-generierte Klasse mit Präsentation-Daten und Signalen für Änderungen. - */ -class Dtc : public QObject -{ - Q_OBJECT - - public: - Dtc() = default; - ~Dtc() override = default; - - // Präsentations-Liste abrufen (Callback-basiert) - void presentations(const std::function& callback) const - { - for (const auto& p : m_presentations) - { - callback(p); - } - } - - // Präsentations-Liste als QList (für direkten Zugriff) - QList presentationsList() const - { - return m_presentations; - } - - // Präsentation hinzufügen/entfernen/ändern - void addPresentation(const Presentation& p) - { - m_presentations.append(p); - emit presentationChanged(p, 0); // 0 = added - } - - void updatePresentation(const Presentation& p) - { - for (auto& existing : m_presentations) - { - if (existing.id == p.id) - { - existing = p; - emit presentationChanged(p, 1); // 1 = modified - return; - } - } - addPresentation(p); - } - - void removePresentation(int id) - { - for (auto it = m_presentations.begin(); it != m_presentations.end(); ++it) - { - if (it->id == id) - { - Presentation removed = *it; - m_presentations.erase(it); - emit presentationChanged(removed, 2); // 2 = removed - return; - } - } - } - - // Content getter/setter für PresentationContent - void content(const std::function& callback) const - { - for (const auto& c : m_content) - { - callback(c); - } - } - - QList contentList() const - { - return m_content; - } - - void setContent(const QList& content) - { - m_content = content; - } - - signals: - // Signal für Präsentations-Änderungen - void presentationChanged(const Presentation& presentation, int modificationType); - - private: - QList m_presentations; - QList m_content; -}; - -/** - * @brief Ftc - Filter Topic Client für Presentation Management - * - * DDS-generierte Klasse für Presentation-Client-Operationen. - */ -class Ftc -{ - public: - using ModifyTypeReplyHandler = std::function; - - virtual ~Ftc() = default; - - /** - * @brief Factory-Methode zur Erstellung einer Ftc-Instanz - * @param connector DDS-Connector (wird im Stub ignoriert) - * @return Shared Pointer zur Ftc-Instanz (nullptr im Stub) - */ - static std::shared_ptr create(void* /*connector*/) - { - return nullptr; // Stub returns nullptr - actual implementation requires DDS - } - - // PresentationModify Reply Handler - virtual void presentationModifyReply(ModifyTypeReplyHandler handler) = 0; - - // PresentationRemove Reply Handler - virtual void presentationRemoveReply(ModifyTypeReplyHandler handler) = 0; - - // GetPresentationContent Reply Handler - virtual void getPresentationContentReply(const GetPresentationContentReply& reply) = 0; -}; - -} // namespace Interface -} // namespace PresentationManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/pre_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/pre_ftc.h deleted file mode 100644 index 7fc492f0e..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/pre_ftc.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef PRE_FTC_H -#define PRE_FTC_H - -// Stub file for pre_ftc.h - generated code placeholder -// This file is auto-generated from pre_service.xml when BUILD_GRANTLEE=ON -// For BUILD_GRANTLEE=OFF, this stub allows compilation to proceed - -namespace PresentationManagement { -namespace Dds { - -// Forward declarations - actual definitions in generated code -class Ftc; - -} // namespace Dds -} // namespace PresentationManagement - -#endif // PRE_FTC_H diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_dtc.h deleted file mode 100644 index d422dcdf6..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_dtc.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef PDM_DTC_H -#define PDM_DTC_H - -// Stub file for pdm_dtc.h - generated code placeholder -// This file is auto-generated from pdm_service.xml when BUILD_GRANTLEE=ON -// For BUILD_GRANTLEE=OFF, this stub allows compilation to proceed - -namespace ProjectDataManagement { -namespace Dds { - -// Forward declarations - actual definitions in generated code -class Dtc; - -} // namespace Dds -} // namespace ProjectDataManagement - -#endif // PDM_DTC_H diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_ftc.h deleted file mode 100644 index 587bf0734..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_ftc.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef PDM_FTC_H -#define PDM_FTC_H - -// Stub file for pdm_ftc.h - generated code placeholder -// This file is auto-generated from pdm_service.xml when BUILD_GRANTLEE=ON -// For BUILD_GRANTLEE=OFF, this stub allows compilation to proceed - -namespace ProjectDataManagement { -namespace Dds { - -// Forward declarations - actual definitions in generated code -class Ftc; - -} // namespace Dds -} // namespace ProjectDataManagement - -#endif // PDM_FTC_H diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectionWorkstation/pws_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectionWorkstation/pws_dtc.h deleted file mode 100644 index 9f76c9653..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectionWorkstation/pws_dtc.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _STUB_DTC_H -#define _STUB_DTC_H -// Stub file for BUILD_GRANTLEE=OFF -namespace PWS { - class Dtc {}; -} -#endif diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectionWorkstation/pws_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectionWorkstation/pws_ftc.h deleted file mode 100644 index 2b2bb6f74..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectionWorkstation/pws_ftc.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _STUB_FTC_H -#define _STUB_FTC_H -// Stub file for BUILD_GRANTLEE=OFF -namespace PWS { - class Ftc {}; -} -#endif diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/rec_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/rec_dtc.h deleted file mode 100644 index 7edbe9cbf..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/rec_dtc.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _STUB_DTC_H -#define _STUB_DTC_H -// Stub file for BUILD_GRANTLEE=OFF -namespace REC { - class Dtc {}; -} -#endif diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/rec_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/rec_ftc.h deleted file mode 100644 index 4fb8bd0f2..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/rec_ftc.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _STUB_FTC_H -#define _STUB_FTC_H -// Stub file for BUILD_GRANTLEE=OFF -namespace REC { - class Ftc {}; -} -#endif diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/rep_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/rep_dtc.h deleted file mode 100644 index a5c0fbce0..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/rep_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace ReportManagement -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace ReportManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/rep_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/rep_ftc.h deleted file mode 100644 index 7a7d4b46d..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/rep_ftc.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef REP_FTC_H -#define REP_FTC_H - -// Stub file for rep_ftc.h - generated code placeholder -// This file is auto-generated from rep_service.xml when BUILD_GRANTLEE=ON -// For BUILD_GRANTLEE=OFF, this stub allows compilation to proceed - -namespace ReportManagement { -namespace Dds { - -// Forward declarations - actual definitions in generated code -class Ftc; - -} // namespace Dds -} // namespace ReportManagement - -#endif // REP_FTC_H diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/rsc_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/rsc_dtc.h deleted file mode 100644 index eaaabc0ea..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/rsc_dtc.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef RSC_DTC_H -#define RSC_DTC_H - -// Stub file for rsc_dtc.h - generated code placeholder -// This file is auto-generated from rsc_service.xml when BUILD_GRANTLEE=ON -// For BUILD_GRANTLEE=OFF, this stub allows compilation to proceed - -namespace RoutingServiceNG { -namespace Dds { - -// Forward declarations - actual definitions in generated code -class Dtc; - -} // namespace Dds -} // namespace RoutingServiceNG - -#endif // RSC_DTC_H diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/rsc_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/rsc_ftc.h deleted file mode 100644 index cc8867fe5..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/rsc_ftc.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef RSC_FTC_H -#define RSC_FTC_H - -// Stub file for rsc_ftc.h - generated code placeholder -// This file is auto-generated from rsc_service.xml when BUILD_GRANTLEE=ON -// For BUILD_GRANTLEE=OFF, this stub allows compilation to proceed - -namespace RoutingServiceNG { -namespace Dds { - -// Forward declarations - actual definitions in generated code -class Ftc; - -} // namespace Dds -} // namespace RoutingServiceNG - -#endif // RSC_FTC_H diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/tgt_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/tgt_dtc.h deleted file mode 100644 index e105df868..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/tgt_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace TargetManagement -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace TargetManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/tgt_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/tgt_ftc.h deleted file mode 100644 index 52f874580..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/tgt_ftc.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef TGT_FTC_H -#define TGT_FTC_H - -// Stub file for tgt_ftc.h - generated code placeholder -// This file is auto-generated from tgt_service.xml when BUILD_GRANTLEE=ON -// For BUILD_GRANTLEE=OFF, this stub allows compilation to proceed - -namespace TargetManagement { -namespace Dds { - -// Forward declarations - actual definitions in generated code -class Ftc; - -} // namespace Dds -} // namespace TargetManagement - -#endif // TGT_FTC_H diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/whg_dtc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/whg_dtc.h deleted file mode 100644 index 6bdff0ea4..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/whg_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace WarehouseGuez -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace WarehouseGuez diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/whg_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/whg_ftc.h deleted file mode 100644 index 20f40eab6..000000000 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/whg_ftc.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef WHG_FTC_H -#define WHG_FTC_H - -// Stub file for whg_ftc.h - generated code placeholder -// This file is auto-generated from whg_service.xml when BUILD_GRANTLEE=ON -// For BUILD_GRANTLEE=OFF, this stub allows compilation to proceed - -namespace WarehouseGuez { -namespace Dds { - -// Forward declarations - actual definitions in generated code -class Ftc; - -} // namespace Dds -} // namespace WarehouseGuez - -#endif // WHG_FTC_H diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/adler_export.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/adler_export.h deleted file mode 100755 index 1636de770..000000000 --- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/adler_export.h +++ /dev/null @@ -1,22 +0,0 @@ -/** - * Export definitions - * $Id$ - * $HeadURL$ - * $Author$ - * Created by Hanna E. Rathje, SLSE, 2015-08-04 - */ -#pragma once - -#include - -#ifndef SAATELEGRAMS_EXPORT -# ifdef BUILD_STATIC_LIBRARIES -# define SAATELEGRAMS_EXPORT -# else -# if defined(MAKE_SAATELEGRAMS_LIB) -# define SAATELEGRAMS_EXPORT Q_DECL_EXPORT -# else -# define SAATELEGRAMS_EXPORT Q_DECL_IMPORT -# endif -# endif -#endif diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/aes_handler.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/aes_handler.h deleted file mode 100755 index c84b83183..000000000 --- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/aes_handler.h +++ /dev/null @@ -1,104 +0,0 @@ -/** - * @RDE_HEADER@ - * AesHandler for AdlerJson Plugin - * $Id: aes_handler.h 62304 2024-03-21 08:17:45Z ewert_j $ - * $HeadURL: svn://slssvn/TDS/branches/product/features/ufom/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.h $ - * $Author: ewert_j $ - * Created by Julius Ewert, ESIM, 2024-03-20 - */ - -#pragma once - -#include "Core/core_types.h" -#include "logger.h" -#include "main_dispatcher.h" -#include "telegrams.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace AdlerJson -{ - -class MainDispatcher; -class AesHandler - : public QObject - , protected AreaEffectSimulation::Interface::Ftc::AirSupportImpactModifyReplyHandler - , protected AreaEffectSimulation::Interface::Ftc::OffRouteMineModifyReplyHandler - , protected AreaEffectSimulation::Interface::Ftc::EffectClusterModifyReplyHandler - , protected AreaEffectSimulation::Interface::Ftc::TrajectoryAdlerModifyReplyHandler - , protected NotificationManagement::Interface::Ftc::CreateNotificationReplyHandler -{ - Q_OBJECT - public: - explicit AesHandler(std::shared_ptr ftsTab, QObject *parent = nullptr); - - bool init(MainDispatcher *mainDispatcher); - bool sendAesModifyRequest(const QJsonObject &obj); - bool sendExplosionArea(const QJsonObject &data); - // DDS Overrides - void onAirSupportImpactModifyReply(const Core::FunctionReplyObject &reply) override; - void onOffRouteMineModifyReply(const Core::FunctionReplyObject &replyObject) override; - void onEffectClusterModifyReply(const Core::FunctionReplyObject &replyObject) override; - void onCreateNotificationReply(const Core::FunctionReplyObject &replyObject) override; - - // Internal - void onExplosionSingleChanged(const AreaEffectSimulation::ExplosionSingle &data, DataModification modType); - void onEffectClusterChanged(const AreaEffectSimulation::EffectCluster &data, DataModification modType); - - void handleCreateSingleExplosion(const TrainingAreaBase::TetraIcd::CreateSingleExplosion &data); - void handleEXFire(const Feuerkampfdaten &data, int wsId); - void handleEXDontFire(const Feuerkampfdaten &data, int wsId); - // Reald Data - void sendTrajectoryAdlerModifyRequest(const WirkfeldplanungData &data, int participantId, int wirkmittelIndex, int aesId); - void handleEffectCluster(const WirkfeldplanungData &data, int wsId); - - // - void removeAllPendingEffectCluster(int partyId); - std::shared_ptr getDtc() { return m_dtcAes; }; - std::shared_ptr getFtc() { return m_ftcAes; }; - - private: - AreaEffectSimulation::Area createMinimumRect(int zone, const QVector &points); - - signals: - void explosionSingleChanged(const QJsonObject &jsonObj); - - private: - QList findAllPendingEffectCluster(int partyId); - void handleAmmoCount(const Feuerkampfdaten &data, int saaPartyId, bool sendExVollzug = false); - - private: - MainDispatcher *m_mainDispatcher; - std::shared_ptr m_ftcAes; - std::shared_ptr m_dtcAes; - std::shared_ptr m_dtcPpm; - std::shared_ptr m_ddsHandler; - - void onTrajectoryAdlerModifyReply(const Core::FunctionReplyObject &reply) override; - - LtsUtils::RequestHelper *m_requestHelper; - - QHash m_singleExplosions; - - WirkfeldplanungData m_wirkfeldPlanungsData; - QHash m_aesIdToFeuerkampfReferenz; // key = aesId, value = feuerkampfReferenz - - QHash m_feuerkampReferenzAmmoCounter; // key = feuerkampfReferenz, value = AmmoCounter - QHash> m_feuerkampfReferenzWirkmittel; // key = feuerkampfReferenz, value = Kenner - QHash m_feuerkampfReferenzUsedFeuerHalt; // key = feuerkampfReferenz, value = boolean -> if Feuerhalt was activ - - int m_participantId; - int m_wirkmittelIndex; - int m_aesId; - QHash aesIdWsId; // key = aesId value = wsId -}; - -} // namespace AdlerJson diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/asm_handler.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/asm_handler.h deleted file mode 100755 index b8ee09015..000000000 --- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/asm_handler.h +++ /dev/null @@ -1,50 +0,0 @@ -/** - * @RDE_HEADER@ - * $Id: $ - * $HeadURL: $ - * $Author: $ - * Created by Steve K., ESZS 12-01-2026 - */ - -#pragma once - -#include "logger.h" -#include -#include -#include "main_dispatcher.h" -#include - -namespace AssetManagement -{ - namespace Interface - { - class Dtc; - class Ftc; - } -} - -namespace AdlerJson -{ - -class MainDispatcher; -class AsmHandler : public QObject - , protected AssetManagement::Interface::Ftc::AssetModifyReplyHandler -{ - Q_OBJECT -public: - explicit AsmHandler(QObject *parent = nullptr); - bool init(MainDispatcher* mainDispatcher); - - std::shared_ptr getDtc() { return m_dtcAsm; } - std::shared_ptr getFtc() { return m_ftcAsm; } - void modifyAssetAdlerProperties(int assetId, bool isSaaConnected = false); -private: - void onAssetModifyReply(const Core::FunctionReplyObject &reply) override; - -private: - std::shared_ptr m_dtcAsm; - std::shared_ptr m_ftcAsm; - int m_exerciseId; -}; - -} // namespace AdlerJson diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/flm_handler.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/flm_handler.h deleted file mode 100755 index 31fafc453..000000000 --- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/flm_handler.h +++ /dev/null @@ -1,67 +0,0 @@ -/** - * @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 - -#include "logger.h" -#include -#include -#include -#include -#include -#include - -namespace FileManagement -{ -namespace Interface -{ -class Dtc; -} -} // namespace FileManagement - -namespace AdlerJson -{ - -class MainDispatcher; -class FlmHandler - : public QObject - , protected FileManagement::Interface::Ftc::FileContentModifyReplyHandler - , protected FileManagement::Interface::Ftc::PathCreateReplyHandler - , protected NotificationManagement::Interface::Ftc::CreateNotificationReplyHandler -{ - Q_OBJECT - public: - explicit FlmHandler(QObject *parent = nullptr); - - bool processHQMessage(int partyId, const QString &name, int meldungsnummer, const QJsonObject &obj); - void createHQNotification(const int partyId, const int folderId, const int fileId); - signals: - public slots: - bool init(MainDispatcher *mainDispatcher); - void initHQFolders(int partyId); - - private: - void onFileContentModifyReply(const Core::FunctionReplyObject &reply) override; - void onPathCreateReply(const Core::FunctionReplyObject &reply) override; - void onCreateNotificationReply(const Core::FunctionReplyObject &replyObject) override final; - bool parseContent(const QString &contentString, QMap &retMap); - - private: - MainDispatcher *m_mainDispatcher = nullptr; - int m_exerciseId; - int m_parentFolderId; - int m_partyId; - int m_folderHXMessagesId; - std::shared_ptr m_dtcFlm; - std::shared_ptr m_ftcFlm; - std::shared_ptr m_ftcNom; - std::shared_ptr m_opmDtc; -}; - -} // namespace AdlerJson diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/generatetelegrams.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/generatetelegrams.h deleted file mode 100755 index a91eeeca4..000000000 --- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/generatetelegrams.h +++ /dev/null @@ -1,54 +0,0 @@ -#pragma once - -#include "telegrams.h" - -class GenerateTelegrams -{ - public: - GenerateTelegrams(); - - static void SAATELEGRAMS_EXPORT addHeaderData(AdlerJson::EXTelegramBase &tele, const int saaId, const QString referenceUuid = QString{}); - static void SAATELEGRAMS_EXPORT generateConnectResponseMessage(AdlerJson::ExAnmeldebestaetigung &exAnmeldebestaetigung); - static void SAATELEGRAMS_EXPORT generateConnectMessage(AdlerJson::EXRegistration &exRegistration, int partyId, bool isVerbund = true); - static void SAATELEGRAMS_EXPORT generateDisconnectMessage(AdlerJson::EXDeregistration &eXDeregistration, int partyId); - static void SAATELEGRAMS_EXPORT generateStatusMessage(AdlerJson::EXStatus &exStatus, AdlerJson::Szenarstatus status); - static void SAATELEGRAMS_EXPORT generateConnectionTestMessage(); - static void SAATELEGRAMS_EXPORT generateAbmeldung(AdlerJson::EXDeregistration &req); - static void SAATELEGRAMS_EXPORT generateZeit1(AdlerJson::Zeitangabe_DTG &zeit); - static void SAATELEGRAMS_EXPORT generateZeit2(AdlerJson::Zeitangabe_DTG &zeit); - - // fire - static void SAATELEGRAMS_EXPORT generateZieldaten(AdlerJson::Zieldaten &wzd); - static void SAATELEGRAMS_EXPORT generateWirkmittelFeuerkommando_Gmlrs(QVector &wfr); - static void SAATELEGRAMS_EXPORT generateEXFQBABBFK(AdlerJson::ExAwesPlanning &req); - static void SAATELEGRAMS_EXPORT generateEXFQBABBFK_Gmlrs(AdlerJson::ExAwesPlanning &req); - static void SAATELEGRAMS_EXPORT generateEXFQBABBFK_Dm72(AdlerJson::ExAwesPlanning &req); - static void SAATELEGRAMS_EXPORT generateFeuerbereit(AdlerJson::ExFeuerbereit &req); - static void SAATELEGRAMS_EXPORT generateFeuern(AdlerJson::ExFeuern &req); - static void SAATELEGRAMS_EXPORT generateFeuern_Gmlrs(AdlerJson::ExFeuern &req); - static void SAATELEGRAMS_EXPORT generateFeuern_Dm72(AdlerJson::ExFeuern &req); - static void SAATELEGRAMS_EXPORT generateNichtFeuern(AdlerJson::exNichtFeuern &req); - - static void SAATELEGRAMS_EXPORT generateAbgefeuert(AdlerJson::ExAbgefeuert &req); - static void SAATELEGRAMS_EXPORT generateVollzugsmeldung(AdlerJson::ExVollzugsmeldung &req); - // static void SAATELEGRAMS_EXPORT generateErkundungsanfrage(AdlerJson::ExErkundungsanfrage &req); - static void SAATELEGRAMS_EXPORT generateErkundungsergebnisse(AdlerJson::ExErkundungsergebnisse &req); - static void SAATELEGRAMS_EXPORT generateFeuerkampf(AdlerJson::ExFeuerkampf &req); - static void SAATELEGRAMS_EXPORT generateFeuerhalt(AdlerJson::ExFeuerhalt &req); - static void SAATELEGRAMS_EXPORT generateStellungsmeldungFS(AdlerJson::ExFeuerstellungFS &req); - static void SAATELEGRAMS_EXPORT generateStellungsmeldungWS(AdlerJson::ExFeuerstellungWS &req); - static void SAATELEGRAMS_EXPORT generateStellungsmeldungWS_Gmlrs(AdlerJson::ExFeuerstellungWS &req); - static void SAATELEGRAMS_EXPORT generateStellungsmeldungWS_Dm72(AdlerJson::ExFeuerstellungWS &req); - static void SAATELEGRAMS_EXPORT generateStellungsmeldungLP(AdlerJson::ExFeuerstellungLP &req); - static void SAATELEGRAMS_EXPORT generateStellungswechsel(AdlerJson::ExStellungswechsel &req); - static void SAATELEGRAMS_EXPORT generateKoordinierungsmassnahmen(AdlerJson::ExHqKoordinierungsmassnahmen &req); - static void SAATELEGRAMS_EXPORT generateKoordinierungsmassnahmen_EX_L25(AdlerJson::ExHqKoordinierungsmassnahmen &req, - ProjectDataManagement::L25_KindGuidingLine kind, int i); - static void SAATELEGRAMS_EXPORT generateFuehrungslinien(AdlerJson::ExHqFuehrungslinien &req); - static void SAATELEGRAMS_EXPORT generateFuehrungslinien_EX_L24(AdlerJson::ExHqFuehrungslinien &req, AdlerJson::Art_L24 art24, int meldungsnummer); - static void SAATELEGRAMS_EXPORT generateTechnischeQuittung(AdlerJson::ExTqTechnischeQuittung &req); - static void SAATELEGRAMS_EXPORT generateFreitextmeldung(AdlerJson::ExAqFreitextmeldung &req); - static void SAATELEGRAMS_EXPORT generateManuelleQuittung(AdlerJson::ExMqManuelleQuittung &req); - static void SAATELEGRAMS_EXPORT generateFlugbahnberechnung(AdlerJson::ExFlugbahnberechnung &req); - static void SAATELEGRAMS_EXPORT generateFlugbahndaten(AdlerJson::ExFlugbahndaten &req); -}; diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/interface_controller.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/interface_controller.h deleted file mode 100755 index 3ec963151..000000000 --- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/interface_controller.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -class InterfaceController -{ -public: - InterfaceController(); - -public Q_SLOTS: - void onRegistration(); - void onDeregistration(); - - void onNewConnection(); - void onWebSocketDisconnected(); - void onTextMessageReceived(const QByteArray &baJson); -}; diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/json_dispatcher.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/json_dispatcher.h deleted file mode 100755 index 197cd296e..000000000 --- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/json_dispatcher.h +++ /dev/null @@ -1,158 +0,0 @@ -/** - * @RDE_HEADER@ - * HlaDispatcher for AdlerJson Plugin - * $Id: hla_dispatcher.h 62304 2024-03-21 08:17:45Z ewert_j $ - * $HeadURL: svn://slssvn/TDS/branches/product/features/ufom/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/hla_dispatcher.h $ - * $Author: ewert_j $ - * Created by Julius Ewert, ESIM, 2024-03-20 - */ - -#pragma once - -#include -#include -#include -#include -#include // tr_lts -#include -// #include "logger.h" -#include "aes_handler.h" -#include "asm_handler.h" -#include "flm_handler.h" -#include "pdm_handler.h" -#include "ppm_handler.h" -#include "saa_interface.h" -#include "telegrams.h" -#include "ws_interface.h" - -// #include -#include -// #include -// #include - -class QTimer; -namespace AdlerJson -{ -using namespace TrainingAreaBase; -class JsonHandlerRx; -class JsonHandlerTx; -class DdsHandler; -// class EXStatus; - -struct TrajectoryIdentifier -{ - int aesItemId; - int explosionId; -}; - -class JsonDispatcher final - : public TrainingAreaBase::Plugin::Interface - , protected TrainingAreaBase::Interface::Fts::AdlerCalculateTrajectoryRequestHandler - , protected NotificationManagement::Interface::Ftc::CreateNotificationReplyHandler -{ - Q_OBJECT - public: - JsonDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp, - const std::shared_ptr &recvFromTabCb, - const std::shared_ptr &sendToTabCb, - NGL::Settings *settings, - std::shared_ptr &ddsHandler, - std::shared_ptr &flmHandler, - MainDispatcher *mainDispatcher); - - public Q_SLOTS: - bool init() override; - - public: - std::shared_ptr sendToTab() override; - bool isDebugInterface() const override { return false; } - bool canSendData() const override; - void exerciseChanged() override { return; } - const char *name() const override { return tr_lts("dds", "APHLA"); } - std::shared_ptr getSAAByParty(const int partyId); - std::shared_ptr getSAAByWs(const int wsId); - QString getSender() { return QStringLiteral("EXCON@GUEZ.DE"); } - // SendToTele - bool sendExFeuerbereit(const ExFeuerbereit &exFBDataIn, const int partyId); - bool sendExAbgefeuert(const ExAbgefeuert &exAFDataIn, int partyId); - bool sendExMqManuelleQuittung(const ExMqManuelleQuittung &exMQDataIn, int partyId); - bool sendExTqTechnischeQuittung(const ExTqTechnischeQuittung &exTQDataIn, int partyId); - bool sendExVollzugsmeldung(const ExVollzugsmeldung &exVZDataIn, int partyId); - void onAdlerCalculateTrajectoryRequest(const rti::core::SampleIdentity &cookie, const TrainingAreaBase::AdlerCalculateTrajectoryRequest &request) override; - int getAssetId(const QString &saaName) const; - // misc - void cleanupSaaInterfaces(const QString &saaName, int wsId, int partyId); - void getCreateNotificationRequestData(const int wsId, - const QString &title, - NotificationManagement::CreateNotification &data, - const QString &content = {}, - const QStringList &contentArgs = {}); - void createNotificationRequest(const int wsId, const QString &title, const NotificationManagement::MessageType messageType, const NotificationManagement::NotificationType notificationType, const QString &content = {}, const QStringList &contentArgs = {}); - - public Q_SLOTS: - void onSAARegistration(const int wsId, const int partyId, const QString &saaName, const QString &szenarName, bool isVerbund, const QString &uuid); - void onSAADeregistration(const int wsId, const int partyId); - void onSAAConnectionTest(const int wsId, const QString &uuid); - void onSAAStatus(const int wsId, const EXStatus &status); - void onSAAExceptionStatus(const int wsId, const TechnischeDaten &exceptionStatus); - void onSAASQWS(const int wsId, const Waffensystemdaten &exSQWS); - void onSAASQFS(const int wsId, const Feuerstellungsdaten &exSQFS); - void onSAASQLP(const int wsId, const Ladeplatzdaten &exSQLP); - void onSAAHXGuidingLines(const int wsId, const Koordinierungsdaten &koordinierungsdaten); - void onSAAHXGuidingLinesAndBoundaries(const int wsId, const Fuehrungsdaten &fuehrungsdaten); - void onSSAEXFIREHALT(const int wsId, const FeuerHaltDaten &feuerhaltdaten); - void onSAATrajectoryData(const int wsId, const Flugbahndaten &exFlugbahndaten, const QString referenceUuid); - - void onWebSocketConnected(); - void onNewWebsocketConnected(const int wsId, const QString &address, qint16 port); - void onWSDisconnected(const int wsId); - void onWebsocketExternalConnectionStateChanged(bool bConnected); - void onWebSocketError(); - void onRecivedTelegram(int wsId, const QJsonObject &telegramData); - void onTextMessageReceived(const QByteArray &message); - void connectWebsocket(); - void reallyConnectWebsocket() { connectWebsocket(); } - - void onKeepAliveTimerTimeout(); - void onCreateNotificationReply(const Core::FunctionReplyObject &replyObject); - Q_SIGNALS: - void broadcastTelegramsRequest(const int equipmentNumber, const int broadcastIndex, const int resetCounter); - void jsonTelegramReceived(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *tele); - void websocketConnected(quint16 port); - - private: - QUrl webSocketUrl() const; - bool isConnectionTest(QJsonDocument &doc); - QString getParticipantInfoLink(const QString &verein, const int partyId, const bool isVerbund); - - std::shared_ptr getSAAByName(const QString &saaName); - - private: - std::shared_ptr m_recvFromTabCb; - std::shared_ptr m_recvFromWebsocket; - std::shared_ptr m_sendToWebsocket; - // DDS - MainDispatcher *m_mainDispatcher; - std::shared_ptr m_flmHandler; - std::shared_ptr m_ppmHandler; - - std::shared_ptr m_ftsTab; - std::shared_ptr m_dtsTab; - std::shared_ptr m_ftcNom; - - QVector> m_saaInterfaces; - QMap m_connectionKeepaliveTimer; - - QHash m_trajectoryIdentifier; // key = exFlugbahnberechnung.uuid - QHash m_positionsLaunch; // key = exFlugbahnberechnung.uuid - - NGL::Settings *m_settings; - QWebSocket *m_webSocket; - std::shared_ptr m_webSocketInterface; - QTimer *m_webSocketReconnectTimer; - bool m_bWarnedOnce; - rti::core::SampleIdentity m_cookieCalculateTrajectoryAdler; - int m_explosionIndex; -}; - -} // namespace AdlerJson diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/json_handler_rx.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/json_handler_rx.h deleted file mode 100755 index 30f2b2ebf..000000000 --- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/json_handler_rx.h +++ /dev/null @@ -1,59 +0,0 @@ -/** - * @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 - -#include -#include -#include -#include -#include -#include -#include "logger.h" - -namespace AdlerJson -{ -class AesHandler; -class PpmHandler; -class JsonDispatcher; -class JsonHandlerRx : public QObject -{ - Q_OBJECT -public: - explicit JsonHandlerRx(const std::shared_ptr &recvFromTabCb, - const std::shared_ptr &sendToTabCb, - JsonDispatcher *dispatcher, - AesHandler *aesHandler, - PpmHandler *ppmHandler); - - bool handleTelegram (const QByteArray &baJson ); - bool handleTelegram (TrainingAreaBase::TetraIcd::TrainingAreaTelegram *tabTele); - bool handleTelegram (int wsId, const QJsonObject& telegram, int &errorcode); -Q_SIGNALS: - void participantConnectionState(int equipmentNumber, bool dataCommunicationPossible); -private: - template - void rxData (const T &data ); - - template - void txData (const T &data ); - - bool checkExercise (int equipmentNumber) const; -private: - std::shared_ptr m_rxHandler; - std::shared_ptr m_txHandler; - JsonDispatcher *m_dispatcher; - bool m_bWarnedOnce; - bool m_bWarnedOnceTx; - AesHandler *m_aesHandler; - PpmHandler *m_ppmHandler; - LOGGER_T m_logger; -}; - -} // namespace AdlerJson diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/json_handler_tx.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/json_handler_tx.h deleted file mode 100755 index b44149414..000000000 --- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/json_handler_tx.h +++ /dev/null @@ -1,107 +0,0 @@ -/** - * @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 - -#include "ppm_handler.h" -#include "pdm_handler.h" -#include "logger.h" -//#include "ws_handler.h" -#include "ws_interface.h" -#include -#include -#include -#include - -class QWebSocket; -class PpmHandler; -class PdmHandler; -class AesHandler; -namespace AdlerJson -{ -class JsonHandlerTx final : public QObject, public TrainingAreaBase::SendToTab -{ - Q_OBJECT -public: - explicit JsonHandlerTx(TrainingAreaBase::Plugin::DataProvider *pdp, MainDispatcher *mainDispatcher); - - void onWebSocketConnected (QWebSocket *webSocket); - void onWebSocketDisconnected ( ); - void onWebsocketConnectedToExternalSystem (bool bConnected ); - void setWSInterface(std::shared_ptr wsInterface) {m_wsInterface = wsInterface;}; - - const char *name () const override { return "ApAdler"; } - void resetSendCounter () override; - - HandleState canHandleTelegram (int equipmentNumber, int telegramId) const override; - - 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::OpaquePayloadDataOut &data) override; - bool txData (const TrainingAreaBase::TetraIcd::ParticipantSwVersionsRequest &data) override; - bool txData (const TrainingAreaBase::TetraIcd::CesHitInformation &data) override; - bool txData (const TrainingAreaBase::TetraIcd::TechnicalArea &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 &data) override; - bool txData (const TrainingAreaBase::TetraIcd::ExFireReadiness &data) override; - bool txData (const TrainingAreaBase::TetraIcd::ExFiredReport&data) override; - bool txData (const TrainingAreaBase::TetraIcd::ExConfirmationReport &data) override; - - QHash dataCommunicationPossible() const; -public slots: - void onParticipantConnectionState (const int equipmentNumber, const bool dataCommunicationPossible); - void onGenericTelegram (const QJsonObject &telegram); - void onGenericTelegram1 (const int wsId, const QJsonObject &telegram); -private: - bool sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *data, const bool bForce = false); -private: - TrainingAreaBase::Plugin::DataProvider *m_pdp; - QHash m_dataCommunicationPossible; // equioNo, reachable - MainDispatcher *m_mainDispatcher; - QWebSocket *m_webSocket; - std::shared_ptr m_wsInterface; - bool m_bWebsocketConnectedToExternalSystem; - LOGGER_T m_logger; - -}; - -}// namespace AdlerJson diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/logger.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/logger.h deleted file mode 100755 index 06d59b75f..000000000 --- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/logger.h +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @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 - -#include - -namespace AdlerJson -{ -using LOGGER_T = NGL::INGLLogger&; - -LOGGER_T getLogger(const char *name); -inline LOGGER_T getLogger(const QString &loggerName) -{ - return getLogger(loggerName.toUtf8().constData()); -} -} // namespace AdlerJson diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/main_dispatcher.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/main_dispatcher.h deleted file mode 100755 index 816e3f9ed..000000000 --- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/main_dispatcher.h +++ /dev/null @@ -1,84 +0,0 @@ -/** - * @RDE_HEADER@ - * MainDispatcher for AdlerJson Plugin - * $Id: main_dispatcher.h 62899 2024-05-29 11:08:50Z ewert_j $ - * $HeadURL: svn://slssvn/TDS/branches/product/features/ufom/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/main_dispatcher.h $ - * $Author: ewert_j $ - * Created by Julius Ewert, ESIM, 2024-03-20 - */ - -#pragma once - -#include -#include -#include // tr_lts -#include -//#include "logger.h" -#include "ppm_handler.h" -#include "pdm_handler.h" -#include "aes_handler.h" -#include "flm_handler.h" -#include "asm_handler.h" - -namespace AdlerJson -{ -class JsonDispatcher; -class PpmHandler; -class PdmHandler; -class AesHandler; -class FlmHandler; -class AsmHandler; - -class MainDispatcher final : public TrainingAreaBase::Plugin::Interface -{ - Q_OBJECT -public: - MainDispatcher( TrainingAreaBase::Plugin::DataProvider *pdp, - const std::shared_ptr &recvFromTabCb, - const std::shared_ptr &sendToTabCb, - const std::shared_ptr &ddsHandler, - NGL::Settings *settings); - ~MainDispatcher(); - - std::shared_ptr ppmHandler() const { return m_ppmHandler; } - std::shared_ptr pdmHandler() const { return m_pdmHandler; } - std::shared_ptr aesHandler() const { return m_aesHandler; } - std::shared_ptr asmHandler() const { return m_asmHandler; } - JsonDispatcher* jsonDispatcher() const { return m_adlerDispatcher; } - std::shared_ptr ddsHandler() const { return m_ddsHandler; } - - int exerciseId() const { return m_exerciseId; } - -public slots: - bool init() override; - void onWebsocketConnected(quint16 port); - -public: - std::shared_ptr sendToTab() override; - bool canSendData () const override; - void exerciseChanged () override; - bool isDebugInterface () const override { return false; } - const char *name () const override { return tr_lts("dds", "ApHlaJson"); } - -private: - JsonDispatcher *m_adlerDispatcher; - - std::shared_ptr m_recvFromTabCb; - const std::shared_ptr m_sendToTab; - std::shared_ptr m_mainHandlerTx; - TrainingAreaBase::Plugin::DataProvider *m_pdp; - - NGL::Settings *m_settings; - - std::shared_ptr m_ppmHandler; - std::shared_ptr m_pdmHandler; - std::shared_ptr m_aesHandler; - std::shared_ptr m_flmHandler; - std::shared_ptr m_asmHandler; - std::shared_ptr m_ddsHandler; - - int m_domainId; - int m_exerciseId; -}; -} // namespace AdlerJson - diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/pdm_handler.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/pdm_handler.h deleted file mode 100755 index e424f4143..000000000 --- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/pdm_handler.h +++ /dev/null @@ -1,44 +0,0 @@ -/** - * @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 - -#include "main_dispatcher.h" -#include "logger.h" -#include -#include -#include -#include -#include -#include -#include -#include - -namespace AdlerJson -{ - -class MainDispatcher; -class PdmHandler : public QObject -{ - Q_OBJECT -public: - explicit PdmHandler(QObject *parent = nullptr); - void getChargeTypes(); - std::shared_ptr getDtc() { return m_dtcPdm; } -signals: - void sendChargeTypes(QJsonObject jsonObj); -public slots: - bool init(MainDispatcher* mainDispatcher); - -private: - - std::shared_ptr m_dtcPdm; -}; - -} // namespace AdlerJson diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/plugin.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/plugin.h deleted file mode 100755 index 2f83bf260..000000000 --- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/plugin.h +++ /dev/null @@ -1,33 +0,0 @@ -/** - * @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 - -#include "TrainingAreaBase/dds_handler.h" -#include -#include - -namespace AdlerJson -{ -class TabAdlerPlugin : public QObject, public TrainingAreaBase::Plugin::Plugin -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID "special:3:tab.aphla") - Q_INTERFACES(TrainingAreaBase::Plugin::Plugin) -public: - TabAdlerPlugin() = default; - ~TabAdlerPlugin() = default; - std::shared_ptr createInterface(TrainingAreaBase::Plugin::DataProvider *pdp, - const std::shared_ptr &recvFromTabCb, - const std::shared_ptr &sendToTab, - const std::shared_ptr &ddsHandler, - NGL::Settings *settings) override; -}; - -} // namespace AdlerJson diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/ppm_handler.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/ppm_handler.h deleted file mode 100755 index f23c927e9..000000000 --- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/ppm_handler.h +++ /dev/null @@ -1,111 +0,0 @@ -/** - * @RDE_HEADER@ - * PpmHandler for AdlerJson Plugin - * $Id: ppm_handler.h 62899 2024-05-29 11:08:50Z ewert_j $ - * $HeadURL: svn://slssvn/TDS/branches/product/features/ufom/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/ppm_handler.h $ - * $Author: ewert_j $ - * Created by Julius Ewert, ESIM, 2024-03-20 - */ - -#pragma once - -#include "Core/core.hpp" -#include "main_dispatcher.h" -#include "logger.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace AdlerJson -{ - -class MainDispatcher; -class PpmHandler - : public QObject - , protected ParticipantManagement::Interface::Ftc::ModifyParticipantDataReplyHandler - , protected ParticipantManagement::Interface::Ftc::ModifyPartyDataReplyHandler -{ - Q_OBJECT -public: - explicit PpmHandler(QObject *parent = nullptr); - bool init(MainDispatcher* mainDispatcher); - void getParticipants(); - bool isEqNumberInExercise(const int equipmentNumber) const; - - - std::shared_ptr getDtc() { return m_dtcPpm; } - std::shared_ptr getFtc() { return m_ftcPpm; } - - void onCreateParticipant(); - - // ModifyParticipantDataRequestHandler interface - void onModifyParticipantDataReply(const Core::FunctionReply &reply); - void onModifyPartyDataReply(const Core::FunctionReply &reply); - void modifyPartyAdlerProperties(const int wsId, const int assetId, const int partyId, const QString &saaName, const QString &szenarName, - const ParticipantManagement::ConnectState &connectState, const bool isVerbund); - - //parse functions that trigger other services - void parseSQFS(const Feuerstellungsdaten &exSQFS, const int wsId); - void parseSQWS(const Waffensystemdaten &exSQWS, const int wsId); - void parseSQLP(const Ladeplatzdaten &exSQLP, const int wsId); - - void removeAllSAAParticipants(const int partyId); - ParticipantManagement::Participant findParticipantByInternalName(const QString &internalName, const int partyId, const bool isVerbund); - -signals: - void participantChanged(const QJsonObject &jsonObj); - void participantUnmount(const QJsonObject &jsonObj); - void participantMount(const QJsonObject &jsonObj); - -private slots: - void onPartyChanged(const ParticipantManagement::Party &data, DataModification modType); - void onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType); - void onParticipantPositionChanged(const ParticipantManagement::ParticipantPosition &data, DataModification modType); - void onDynamicParticipantDataChanged(const ParticipantManagement::DynamicParticipantData &data, DataModification modType); - void onSendParticipantDataTimeout(); -private: - void handleParticipantPositionChangedExternal(const ParticipantManagement::ParticipantPosition &position); - void handleParticipantPositionChangedInternal(const ParticipantManagement::ParticipantPosition &position); - - void sendParticipantMount(const ParticipantManagement::Participant &part, const ParticipantManagement::Participant &partToBeMounted); - void sendParticipantUnmount(const ParticipantManagement::Participant &participant); - void sendParticipantPositionChanged(const ParticipantManagement::ParticipantPosition &position); - void onModifyParticipantDataReply(const Core::FunctionReplyObject &reply) override; - void onModifyPartyDataReply(const Core::FunctionReplyObject &reply) override; - - QList findAllSAAParticipants(const int partyId); - ParticipantManagement::ParticipantData findParticipantDataByInternalName(int &randomNumberInOut, const QString &internalName, const bool isVerbund); - ParticipantManagement::ParticipantData findRootUnit(const int partyId); - - void sendPositionFromTempMap(int rndNmbr, const int partyId, const bool isVerbund); - void sendChargesFromTempMap(const int rndNmbr, const int partyId, const bool isVerbund); - void sendReadyMessageFromTempMap(int rndNmbr, const int partyId, const bool isVerbund); - int convertStatus_L28(const ProjectDataManagement::L28_Status &status); - - QVector sumUpAnzahlForSameGeschoss(const QVector &geschosse) const; -private: - MainDispatcher *m_mainDispatcher; - std::shared_ptr m_dtcPpm; - std::shared_ptr m_ftcPpm; - QHash m_participantIdsByEqNo; // eqNo, partId - QHash m_mountedParticipants;// participantId of passanger, participantId of Vehicle - QTimer *m_sendParticipantDataTimer; - QVector m_randomNumbers; - //maps - QMap m_mapLocationToPosition; - QMap> m_tempPositionMap; - QMap> m_tempinternalNameMap; - QMap>> m_tempChargesMap; - QMap> m_tempPartDataList; - QMap> m_tempReadyMessage; - -}; - -} // namespace AdlerJson diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/saa_interface.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/saa_interface.h deleted file mode 100755 index 69eb9f959..000000000 --- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/saa_interface.h +++ /dev/null @@ -1,103 +0,0 @@ -#pragma once -#include -#include -#include "ppm_handler.h" -#include "aes_handler.h" -#include "pdm_handler.h" - -#include "logger.h" - -// Forward: -namespace LtsCoordTrans -{ -struct UtmCoordinate; -} - -namespace AdlerJson -{ -enum class ScenarioStatus // Szenarstatus -{ - NONE , - INACTIVE , // Inaktiv - PLANNED , // Geplant - ACTIVE , // Aktiv - STOPPED // Gestoppt -}; -QString statusToStr(ScenarioStatus status); - -ScenarioStatus strToStatus(QString status); - - -/** - * @brief Convert (relative) Flugbahnpunkt to EXCON coordinate system - * @param fbPos Flugbahnpunkt to be converted. - * @param transformMatrix QTransform to be applied (most likely rotation). - * @param utmLaunch launch coordinate for debugging purpose - * @param logger to be used. - * @return Coordinate transformed (rotated) in EXCON coordinate system. - */ -static Core::RelativePositionRelativeTime convertFlugbahnpunkt(const Flugbahnpunkt &fbPos, - const QTransform &transformMatrix, - const LtsCoordTrans::UtmCoordinate &utmLaunch, - LOGGER_T logger); - - -class JsonDispatcher; -class SAAInterface - : public QObject - , protected AreaEffectSimulation::Interface::Ftc::TrajectoryAdlerModifyReplyHandler -{ - Q_OBJECT -public: - SAAInterface(int wsId, int partyId, const QString& saaName, const QString& szenarName, bool isVerbund, QObject *parent = nullptr); - - bool init(std::shared_ptr ppmHandler, - std::shared_ptr pdmHandler, - std::shared_ptr aesHandler, - std::shared_ptr dtsTab); - - - int getWsId(){ return m_wsId; }; - void setWsId(int wsId){ m_wsId = wsId;}; - int getPartyId(){ return m_partyId; }; - void setPartyId(int partyId){ m_partyId = partyId; }; - QString getSAAName(){ return m_saaName; }; - //QString getSAAName(){ return QStringLiteral("SAA.GUEZ.DE"); }; - void setSaaName(const QString& saaName){ m_saaName = saaName; }; - //void setSaaName(const QString& saaName){ Q_UNUSED(saaName); m_saaName = QStringLiteral("SAA@GUEZ.de"); }; - QString getSzenarName() {return m_szenarName; } - void setSzenarName(const QString &szenarName) { m_szenarName = szenarName; } - Szenarstatus getStatus(){ return m_status; }; - void setStatus(Szenarstatus status); - void setIsVerbund(bool isVerbund) { m_isVerbund = isVerbund; } - bool getIsVerbund(){ return m_isVerbund; } - void setIsAlive(bool isAlive) { m_isAlive = isAlive; } - bool getIsAlive(){ return m_isAlive; } - - //parse functions that trigger other services - void parseFlugbahndaten(const Flugbahndaten &flugbahndaten, int aesItemId, int exposionId, const Core::GeoPosition &positionLaunch); - - template - void rxData (const T &data ); - -private: - void onTrajectoryAdlerModifyReply(const Core::FunctionReplyObject &reply) override; - - int m_wsId; - int m_partyId; - QString m_saaName; - QString m_szenarName; - Szenarstatus m_status; - bool m_isVerbund; - bool m_isAlive=false; - - //int m_currentRandomNumber{0}; - //DDS - std::shared_ptr m_ppmHandler; - std::shared_ptr m_pdmHandler; - std::shared_ptr m_aesHandler; - - std::shared_ptr m_ftcAes; - std::shared_ptr m_dtsTab; -}; -} diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/settings.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/settings.h deleted file mode 100755 index d3fda37c7..000000000 --- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/settings.h +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Settings for TetraRadio - * $Id: settings.h 63154 2024-06-25 11:19:33Z karwat $ - * $HeadURL: svn://slssvn/TDS/branches/product/features/24_adler/Lts/Proxies/TrainingAreaBase/settings.h $ - * $Author: karwat $ - * Created by Christian Ehrlicher, SLSE, 2016-04-14 - */ -#pragma once - -#include -#include - -namespace NGL -{ -class Settings; -} - -namespace TrainingAreaBase -{ - -namespace Settings -{ - -//!< The real NGL::Settings - object -NGL::Settings *settings(); - -void setIniFile(const QString &ini); -QString txDir(); -QString rxDir(); -QPair getWebSocketServerPortRange(int type); -} - -} // namespace TrainingAreaBase diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/telegrams.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/telegrams.h deleted file mode 100755 index e7317bf22..000000000 --- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/telegrams.h +++ /dev/null @@ -1,1596 +0,0 @@ -#pragma once -#include "saatelegrams_export.h" -#include -#include -#include -#include -#include -#include -#include - -#include - -namespace AdlerJson -{ - -namespace JsonKeys -{ -// root keys -inline QString DATA() { return QStringLiteral("data"); } -inline QString UUID_() { return QStringLiteral("uuid"); } -inline QString TYPE() { return QStringLiteral("type"); } -inline QString TYPE_ID() { return QStringLiteral("typeId"); } -inline QString TIMESTAMP() { return QStringLiteral("timestamp"); } - -inline QString VERSION() { return QStringLiteral("version"); } -inline QString SENDER() { return QStringLiteral("sender"); } -inline QString RECEIVER() { return QStringLiteral("receiver"); } -inline QString REFERENCE_UUID() { return QStringLiteral("referenceUuid"); } -inline QString AFE() { return QStringLiteral("Afe"); } -inline QString PARTY_ID() { return QStringLiteral("partyId"); } -inline QString ADLER_VERBUND() { return QStringLiteral("adlerVerbund"); } -inline QString SZENAR() { return QStringLiteral("szenar"); } -inline QString STATUS() { return QStringLiteral("status"); } - -// SKD_SAA-EXCON - -// EX-L15 -inline QString JAHR() { return QStringLiteral("jahr"); } -inline QString MONAT() { return QStringLiteral("monat"); } -inline QString TAG() { return QStringLiteral("tag"); } -inline QString STUNDEN() { return QStringLiteral("stunden"); } -inline QString MINUTEN() { return QStringLiteral("minuten"); } -inline QString SEKUNDEN() { return QStringLiteral("sekunden"); } -inline QString ZDS() { return QStringLiteral("zds"); } -inline QString ZDM() { return QStringLiteral("zdm"); } -inline QString ZVZ() { return QStringLiteral("zvz"); } - -// Tabelle 2: Auszutauschende fachliche Meldungen - -inline QString EX_AWES_PLANNING() { return QStringLiteral(" EX-FQ(BA-BB-FK)"); } // Wirkfeldplanung -inline QString EX_MANUAL_REPLY() { return QStringLiteral("EX-MQ"); } // Manuelle Quittung -inline QString EX_READY_TO_FIRE() { return QStringLiteral("EX-FQ(FB)"); } // Feuerbereit -inline QString EX_FIRE() { return QStringLiteral("EX-FQ(FN)"); } // Feuern -inline QString EX_FIRED() { return QStringLiteral("EX-FQ(AF)"); } // Abgefeuert -inline QString EX_ENFORCEMENT() { return QStringLiteral("EX-FQ(VM)"); } // Vollzugsmeldung -inline QString EX_FIRE_HALT() { return QStringLiteral("EX-FH"); } // Feuer HALT / Einstellen -inline QString EX_DONT_FIRE() { return QStringLiteral("EX-FQ(nFN)"); } -inline QString EX_POSITION_REPORT_FIRE() { return QStringLiteral("EX-SQ(FS)"); } // Stellungsmeldung Feuerstellung -inline QString EX_POSITION_REPORT_WEAPON() { return QStringLiteral("EX-SQ(WS)"); } // Stellungsmeldung Waffensystem -inline QString EX_POSITION_REPORT_LOADING_PLACE() { return QStringLiteral("EX-SQ(LP)"); } // Stellungsmeldung Ladeplatz -inline QString EX_EXPLORATION_RESULTS() { return QStringLiteral("EX-Erkundungsergebnisse"); } // Senden Erkundungsergebnisse -inline QString EX_FIRE_FIGHT() { return QStringLiteral("EX-FQ(BA-BB)"); } // Feuerkampf (ohne ADLER Verbund) -inline QString EX_POSITION_CHANGED() { return QStringLiteral("EX-Stellungswechsel"); } // Stellungsinformationen (ohne ADLER Verbund) -inline QString EX_GUIDING_LINES() { return QStringLiteral("EX-HQ(K)"); } // Fuehrungslinien (Koordinierungsmassnahmen zur Feuerunterstuetzung) -inline QString EX_GUIDING_LINES_AND_BOUNDARIES() { return QStringLiteral("EX-HQ(G)"); } // Fuehrungslinien und Grenzen -inline QString EX_AQ() { return QStringLiteral("EX-AQ"); } // Freitextmeldung -inline QString EX_FLUGBAHNBERECHNUNG() { return QStringLiteral("EX-Flugbahnberechnung"); } // Flugbahnberechnung -inline QString EX_FLUGBAHNDATEN() { return QStringLiteral("EX-Flugbahndaten"); } // Flugbahndaten - -// 3.2 Technische Meldungen - -// Tabelle 4 -inline QString EX_REGISTRATION_REQUEST() { return QStringLiteral("EX-Anmeldung"); } -inline QString EX_REGISTRATION_CONFIRMATION() { return QStringLiteral("EX-Anmeldebestaetigung"); } -inline QString EX_DEREGISTRATION_REQUEST() { return QStringLiteral("EX-Abmeldung"); } -inline QString EX_STATUS() { return QStringLiteral("EX-Status"); } -inline QString EX_CONNECTION_TEST_REQUEST() { return QStringLiteral("EX-Verbindungsanfrage"); } -inline QString EX_CONNECTION_TEST_REPLY() { return QStringLiteral("EX-Verbindungsantwort"); } -inline QString EX_TQ() { return QStringLiteral("EX-TQ"); } - -// ====================================================================================================== -// JsonKeys fuer fachliche Meldungen - -inline QString FEUERKAMPFREFERENZ() { return QStringLiteral("feuerkampfReferenz"); } -inline QString ZIELDATEN() { return QStringLiteral("zieldaten"); } -inline QString NUMMER() { return QStringLiteral("nummer"); } -inline QString GEOMETRIE() { return QStringLiteral("geometrie"); } -inline QString KOORDINATE() { return QStringLiteral("koordinate"); } -inline QString KOORDINATEN() { return QStringLiteral("koordinaten"); } -inline QString ZIELKOORDINATE() { return QStringLiteral("zielkoordinate"); } -inline QString STANDORT() { return QStringLiteral("standort"); } -inline QString LATITUDE() { return QStringLiteral("latitude"); } -inline QString LONGITUDE() { return QStringLiteral("longitude"); } -inline QString HOEHE() { return QStringLiteral("hoehe"); } -inline QString MAXGIPFEL() { return QStringLiteral("maxGipfel"); } -inline QString RELATIV_KOORDINATE() { return QStringLiteral("relativKoordinate"); } -inline QString BREITE_RADIUS() { return QStringLiteral("breiteRadius"); } -inline QString RADIUS() { return QStringLiteral("radius"); } -inline QString TIEFE() { return QStringLiteral("tiefe"); } -inline QString ZIELACHSE() { return QStringLiteral("zielachse"); } -inline QString ZOG() { return QStringLiteral("zog"); } -inline QString ELEMENTE() { return QStringLiteral("elemente"); } -inline QString TYP() { return QStringLiteral("typ"); } -inline QString SUB_TYP() { return QStringLiteral("subTyp"); } -inline QString ABFEUERUNGSART() { return QStringLiteral("abfeuerungsArt"); } -inline QString ART() { return QStringLiteral("art"); } -inline QString FORDERUNG() { return QStringLiteral("forderung"); } -inline QString DAUER() { return QStringLiteral("dauer"); } - -inline QString FEUERKOMMANDO() { return QStringLiteral("feuerkommando"); } -inline QString VEREIN() { return QStringLiteral("verein"); } -inline QString WIRKMITTEL() { return QStringLiteral("wirkmittel"); } -inline QString WIRKMITTELRAKETE() { return QStringLiteral("wirkmittelRakete"); } -inline QString KENNER() { return QStringLiteral("kenner"); } -inline QString AUFTREFFPUNKT() { return QStringLiteral("auftreffpunkt"); } -inline QString TREFFPUNKTE() { return QStringLiteral("treffpunkte"); } -inline QString FLUGZEIT() { return QStringLiteral("flugzeit"); } -inline QString GIPFELHOEHE() { return QStringLiteral("gipfelhoehe"); } -inline QString SCHUSSRICHTUNG() { return QStringLiteral("schussrichtung"); } -inline QString GESCHOSS() { return QStringLiteral("geschoss"); } -inline QString GESCHOSSE() { return QStringLiteral("geschosse"); } -inline QString GESCHOSSSORTE() { return QStringLiteral("geschosssorte"); } -inline QString LADUNG() { return QStringLiteral("ladung"); } -inline QString LADUNGSNUMMER() { return QStringLiteral("ladungsNummer"); } -inline QString ZUENDER() { return QStringLiteral("zuender"); } -inline QString ZUENDERFUNKTION() { return QStringLiteral("zuenderFunktion"); } -inline QString ZUENDER_ZEIT() { return QStringLiteral("zuenderZeit"); } -inline QString ANZAHL() { return QStringLiteral("anzahl"); } -inline QString INTERVALL() { return QStringLiteral("intervall"); } -inline QString FLUGBAHNPUNKT() { return QStringLiteral("flugbahnpunkt"); } -inline QString SPRENGHOEHE() { return QStringLiteral("sprenghoehe"); } -inline QString ZEIT() { return QStringLiteral("zeit"); } -inline QString X_RELATIV() { return QStringLiteral("xRelativ"); } -inline QString Y_RELATIV() { return QStringLiteral("yRelativ"); } -inline QString Z_RELATIV() { return QStringLiteral("zRelativ"); } -inline QString STREUUNG() { return QStringLiteral("streuung"); } -inline QString LAENGS_STREUUNG() { return QStringLiteral("laengsstreuung"); } -inline QString SEITEN_STREUUNG() { return QStringLiteral("seitenstreuung"); } -inline QString LAENGS_STREUUNG_H() { return QStringLiteral("laengsstreuungH"); } -inline QString SEITEN_STREUUNG_H() { return QStringLiteral("seitenstreuungH"); } -inline QString EINHEIT() { return QStringLiteral("einheit"); } -inline QString FEUEREINHEIT() { return QStringLiteral("feuereinheit"); } -inline QString MITTELPUNKT() { return QStringLiteral("mittelpunkt"); } -inline QString GRUNDRICHTUNG() { return QStringLiteral("grundrichtung"); } -inline QString WINKELGRUPPE() { return QStringLiteral("winkelgruppe"); } -inline QString LINKS() { return QStringLiteral("links"); } -inline QString RECHTS() { return QStringLiteral("rechts"); } -inline QString WIRKUNGSBEREICH() { return QStringLiteral("wirkungsbereich"); } -inline QString NAME() { return QStringLiteral("name"); } -inline QString TRUPPENTEIL() { return QStringLiteral("truppenteil"); } - -inline QString MELDUNGSNUMMER() { return QStringLiteral("meldungsnummer"); } -inline QString AB() { return QStringLiteral("ab"); } -inline QString BIS() { return QStringLiteral("bis"); } -inline QString LINKERNACHBAR() { return QStringLiteral("linkerNachbar"); } -inline QString RECHTERNACHBAR() { return QStringLiteral("rechterNachbar"); } -inline QString BESCHREIBUNG() { return QStringLiteral("beschreibung"); } -inline QString FREITEXT() { return QStringLiteral("freitext"); } -inline QString KATEGORIE() { return QStringLiteral("kategorie"); } -inline QString FEUERKAMPF() { return QStringLiteral("feuerkampf"); } -inline QString ZPNUMMER() { return QStringLiteral("zpNummer"); } -inline QString OI() { return QStringLiteral("oi"); } -inline QString R() { return QStringLiteral("r"); } -inline QString WAFFENPLAETZE() { return QStringLiteral("waffenplaetze"); } -inline QString WAFFENSYSTEM() { return QStringLiteral("waffensystem"); } -inline QString STELLUNGEN() { return QStringLiteral("stellungen"); } -inline QString TEXTVAL() { return QStringLiteral("text"); } -inline QString FEHLERCODE() { return QStringLiteral("fehlercode"); } -inline QString FALLWINKEL() { return QStringLiteral("fallwinkel"); } -inline QString ERRORTEXT() { return QStringLiteral("error"); } -inline QString ANFLUG() { return QStringLiteral("anflug"); } -inline QString GPS() { return QStringLiteral("gps"); } -inline QString WIRKZEIT() { return QStringLiteral("wirkzeit"); } -inline QString ENTLADENSCHUSS() { return QStringLiteral("entladenSchuss"); } - -inline QString ABFEUERUNGSZEIT() { return QStringLiteral("abfeuerungsZeit"); } - -} // namespace JsonKeys - -namespace TelegramIds -{ -static constexpr int EX_REGISTRATION_REQUEST() { return 6007; } // Only sent by SAA (EX-Anmeldung) -static constexpr int EX_DEREGISTRATION_REQUEST() { return 6009; } // Sent by EXCON and SAA (EX-Abmeldung) -static constexpr int EX_REGISTRATION_CONFIRMATION() { return 6008; } // Only sent by EXCON (EX-Anmeldebestaetigung) -static constexpr int EX_CONNECTION_TEST_REQUEST() { return 6011; } // Only sent by SAA (EX-Verbindungsanfrage) -static constexpr int EX_CONNECTION_TEST_REPLY() { return 6012; } // Only sent by EXCON (EX-Verbindungsantwort) -static constexpr int EX_STATUS() { return 6010; } // Only sent by SAA (EX-Status) - -// Fachliche Meldungen -static constexpr int EX_AWES_PLANNING() { return 1000; } // Only sent by SAA ( EX-FQ(BA-BB-FK) Wirkfeldplanung) -static constexpr int EX_MANUAL_REPLY() { return 1001; } // Only sent by EXCON ( Manuelle Quittung) -static constexpr int EX_READY_TO_FIRE() { return 1002; } // Only sent by EXCON ( Feuerbereit) -static constexpr int EX_FIRE() { return 1003; } // Only sent by SAA ( EX-FQ(FN) Feuern) -static constexpr int EX_FIRED() { return 1004; } // Only sent by EXCON ( Abgefeuert) -static constexpr int EX_ENFORCEMENT() { return 1005; } // Only sent by EXCON ( Vollzugsmeldung) -static constexpr int EX_FIRE_HALT() { return 1006; } // sent by SAA+EXCON ( Feuer HALT / Einstellen) -static constexpr int EX_DONT_FIRE() { return 1007; } // sent by SAA (EXCON NICHT FEUERN) -static constexpr int EX_POSITION_REPORT_FIRE() { return 2000; } // Only sent by SAA ( Ex-Sq(FS) Stellungsmeldung Feuerstellung) -static constexpr int EX_POSITION_REPORT_WEAPON() { return 2001; } // Only sent by SAA ( Ex-SQ(WS) Stellungsmeldung Waffensystem) -static constexpr int EX_POSITION_REPORT_LOADING_PLACE() { return 2002; } // sent by SAA+EXCON ( EX-SQ(LP)Stellungsmeldung Ladeplatz) -static constexpr int EX_EXPLORATION_RESULTS() { return 5000; } // Only sent by SAA ( Senden Erkundungsergebnisse) -static constexpr int EX_FIRE_FIGHT() { return 19; } // Only sent by EXCON ( Feuerkampf (ohne ADLER Verbund)) -static constexpr int EX_POSITION_CHANGED() { return 20; } // Only sent by EXCON ( Stellungsinformationen (ohne ADLER Verbund)) -static constexpr int EX_GUIDING_LINES() { return 3000; } // Only sent by SAA ( EX-HQ(K) Koordinierungsmassnahmen) -static constexpr int EX_GUIDING_LINES_AND_BOUNDARIES() { return 3001; } // Only sent by SAA ( EX-HQ(G)Fuehrungslinien und Grenzen) -static constexpr int EX_TQ() { return 6013; } // Only sent by SAA EX-TQ Technische Quittierung -static constexpr int EX_AQ() { return 5001; } // Only sent by SAA ( Freitextmeldung) - -static constexpr int EX_FLUGBAHNBERECHNUNG() { return 4000; } // Only sent by SAA ( Flugbahnberechnung) -static constexpr int EX_FLUGBAHNDATEN() { return 4001; } // Only sent by SAA ( Flugbahndaten) - -} // namespace TelegramIds - -// EX-L15 Zeitangabe DTG -struct SAATELEGRAMS_EXPORT Zeitangabe_DTG -{ - int stunden; - int minuten; - int sekunden; - int tag; - int monat; - int jahr; - QString ZVz; - QString ZDS; - QString ZDM; -}; - -/** - * @brief The SAATelegram struct - */ -struct SAATELEGRAMS_EXPORT SAATelegram -{ - virtual QJsonObject toJson() = 0; - - explicit SAATelegram() {} - virtual ~SAATelegram() {} - - public: - template QJsonObject toJsonInternal(); -}; -template <> QJsonObject SAATelegram::toJsonInternal(); -/** - * @brief The EXTelegramBase struct - */ -struct SAATELEGRAMS_EXPORT EXTelegramBase : public SAATelegram -{ - QString typeName; - int typeId; - QString uuid; - QString version; - QString sender; - QString receiver; - QString referenceUuid; - QString timestamp; - - EXTelegramBase(const QString &typeName, int typeId) - : typeName(typeName) - , typeId(typeId) - , uuid(QUuid::createUuid().toString(QUuid::WithoutBraces)) - { - } - - QJsonObject toJson() override; - - public: - template QJsonObject toJsonInternal(); -}; -template <> QJsonObject EXTelegramBase::toJsonInternal(); -template <> QJsonObject EXTelegramBase::toJsonInternal(); - -/** - * @brief The EXRegistration struct - */ -struct SAATELEGRAMS_EXPORT EXRegistration : public EXTelegramBase -{ - int partyId; - bool adlerVerbund; - QString szenar; - - EXRegistration() - : EXTelegramBase(JsonKeys::EX_REGISTRATION_REQUEST(), TelegramIds::EX_REGISTRATION_REQUEST()) - { - } - - QJsonObject toJson() override; - - public: - template QJsonObject toJsonInternal(); -}; - -template <> QJsonObject EXRegistration::toJsonInternal(); -// /** -// * @brief The EXRegistrationConfirmation struct -// */ -// struct SAATELEGRAMS_EXPORT EXRegistrationConfirmation : public EXTelegramBase -// { -// //QString Afe; -// AdlerJson::AnBestaetigungsdaten anBestaetigungsdaten; - -// EXRegistrationConfirmation() -// : EXTelegramBase(JsonKeys::EX_REGISTRATION_CONFIRMATION(), TelegramIds::EX_REGISTRATION_CONFIRMATION()) -// {} - -// QJsonObject toJson() override; -// public: -// template -// QJsonObject toJsonInternal(); -// }; - -struct SAATELEGRAMS_EXPORT EXDeregistration : EXTelegramBase -{ - int partyId; - EXDeregistration() - : EXTelegramBase(JsonKeys::EX_DEREGISTRATION_REQUEST(), TelegramIds::EX_DEREGISTRATION_REQUEST()) - { - } - - QJsonObject toJson() override; - - public: - template QJsonObject toJsonInternal(); -}; -template <> QJsonObject EXDeregistration::toJsonInternal(); - -struct SAATELEGRAMS_EXPORT EXConnectionTestRequest : public EXTelegramBase -{ - EXConnectionTestRequest() - : EXTelegramBase(JsonKeys::EX_CONNECTION_TEST_REQUEST(), TelegramIds::EX_CONNECTION_TEST_REQUEST()) - { - } - QJsonObject toJson() override; - - public: - template QJsonObject toJsonInternal(); -}; -struct SAATELEGRAMS_EXPORT EXConnectionTestReply : public EXTelegramBase -{ - EXConnectionTestReply() - : EXTelegramBase(JsonKeys::EX_CONNECTION_TEST_REPLY(), TelegramIds::EX_CONNECTION_TEST_REPLY()) - { - } - QJsonObject toJson() override; - - public: - template QJsonObject toJsonInternal(); -}; -// EX-L40 Szenarstatus -enum class Szenarstatus -{ - Inaktiv, // Es ist keine Szenarausfuehrung aktiv. - Geplant, // Das Szenar wird gestartet. - Aktiv, // Das Szenar wird ausgefuehrt. - Gestoppt, // Das Szenar wurde gestoppt -}; -QString SAATELEGRAMS_EXPORT szenarstatusToStr(Szenarstatus status); -Szenarstatus SAATELEGRAMS_EXPORT strToSzenarstatus(QString status); - -struct SAATELEGRAMS_EXPORT EXStatus : public EXTelegramBase -{ - Szenarstatus status; - - EXStatus() - : EXTelegramBase(JsonKeys::EX_STATUS(), TelegramIds::EX_STATUS()) - { - } - - QJsonObject toJson() override; - - public: - template QJsonObject toJsonInternal(); -}; -void SAATELEGRAMS_EXPORT statusFromJson(const QJsonObject &data, EXStatus &eXStatus, bool &bOk); - -///////////////////////// -// Fachliche Meldungen // -///////////////////////// - -template <> QJsonObject EXStatus::toJsonInternal(); - -// ====================================================================================================== -// fachliche Meldungen - -// EX-L13 -struct SAATELEGRAMS_EXPORT Koordinate -{ - double latitude; // -90.0…90.0 - double longitude; // -180.0…180.0 -}; - -// EX-L14 -struct SAATELEGRAMS_EXPORT KoordinateMitHoehe -{ - Koordinate koordinate; // EX-L13 - int hoehe; // EX-L5 -399…9999 Meter -}; - -// EX-L6 Abfeuerungsart -enum class SAATELEGRAMS_EXPORT Abfeuerungsart -{ - A, // TTF - B, // Bereitschaft Melden - F, // Feuern Sofort - T, // TOT - K, // Nach Kommando Feuern -}; - -// EX-L24 HQ(G) Art -enum SAATELEGRAMS_EXPORT Art_L24 -{ - AL, // Line of Departure - ANL, // Handover Line - AO, // Area of Operations - ATRZ, // Artillery Target Report Zone - BAA, // Biological Attack Area - BCA, // Biological Contaminated Area - BDRY, // Boundary - BHA, // Biological Hazard Area - CAA, // Chemical Attack Area - CCA, // Chemical Contaminated Area - CFL, // Coordinated Fire Line - CFZ, // Critical Friendly Zone - CHA, // Chemical Hazard Area - CP, // Checkpoint - CZ, // Censor Zone - EA, // Engagement Area - EZ, // Engagement Zone - FLET, // Forward Line of Enemy Troops - FLOT, // Forward Line of Own Troops - FOAZI, // Fallout Area Zone I - FOAZII, // Fallout Area Zone II - IZ, // Inhibit Zone - LZ, // Locating Zone - MA, // Mined Area - NAI, // Named Area of Interest - OA, // Objective Area - PL, // Phase Line - ROTACA, // ROT A Contaminated Area - ROTAHA, // ROT A Hazard Area - ROTARA, // ROT A Release Area - ROUTE, // Movement Route - RP, // Release Point - SP, // Starting Point - TAI, // Target Area of Interest - FEBA, // Forward Edge of the Battle Area - VZL, // Delay Line - MFLD, // Minefield - ZOF, // Zone of Fire - TAREA, // Target Area - PP, // Passage Point - AMA, // Artillery Maneuver Area - ARA // Artillery Reserved Area -}; - -// EX-L26 Waffensystemtyp -const QMap waffensystemtypMap = { - {QStringLiteral("Pzh2000"), ProjectDataManagement::L26_EffectingSystemType::Pzh2000}, - {QStringLiteral("RRohr"), ProjectDataManagement::L26_EffectingSystemType::RRohr}, - {QStringLiteral("Mars"), ProjectDataManagement::L26_EffectingSystemType::Mars}, -}; - -// EX-L27 Waffensystemkenner -const QMap waffensystemkennerMap = { - {QStringLiteral("A"), ProjectDataManagement::L27_EffectorId::A}, // A - {QStringLiteral("B"), ProjectDataManagement::L27_EffectorId::B}, // B - {QStringLiteral("C"), ProjectDataManagement::L27_EffectorId::C}, // C - {QStringLiteral("D"), ProjectDataManagement::L27_EffectorId::D}, // D - {QStringLiteral("E"), ProjectDataManagement::L27_EffectorId::E}, // E - {QStringLiteral("F"), ProjectDataManagement::L27_EffectorId::F}, // F - {QStringLiteral("G"), ProjectDataManagement::L27_EffectorId::G}, // G - {QStringLiteral("H"), ProjectDataManagement::L27_EffectorId::H}, // H - {QStringLiteral("I"), ProjectDataManagement::L27_EffectorId::I}, // I - {QStringLiteral("J"), ProjectDataManagement::L27_EffectorId::J}, // J - {QStringLiteral("K"), ProjectDataManagement::L27_EffectorId::K}, // K - {QStringLiteral("L"), ProjectDataManagement::L27_EffectorId::L}, // L - {QStringLiteral("M"), ProjectDataManagement::L27_EffectorId::M}, // M - {QStringLiteral("N"), ProjectDataManagement::L27_EffectorId::N}, // N - {QStringLiteral("O"), ProjectDataManagement::L27_EffectorId::O}, // O - {QStringLiteral("P"), ProjectDataManagement::L27_EffectorId::P}, // P - {QStringLiteral("Q"), ProjectDataManagement::L27_EffectorId::Q}, // Q - {QStringLiteral("R"), ProjectDataManagement::L27_EffectorId::R}, // R - {QStringLiteral("S"), ProjectDataManagement::L27_EffectorId::S}, // S - {QStringLiteral("T"), ProjectDataManagement::L27_EffectorId::T}, // T - {QStringLiteral("U"), ProjectDataManagement::L27_EffectorId::U}, // U - {QStringLiteral("V"), ProjectDataManagement::L27_EffectorId::V}, // V - {QStringLiteral("W"), ProjectDataManagement::L27_EffectorId::W}, // W - {QStringLiteral("X"), ProjectDataManagement::L27_EffectorId::X}, // X - {QStringLiteral("Y"), ProjectDataManagement::L27_EffectorId::Y}, // Y - {QStringLiteral("Z"), ProjectDataManagement::L27_EffectorId::Z}, // Z - {QStringLiteral("B1"), ProjectDataManagement::L27_EffectorId::B1}, // B1 - {QStringLiteral("B2"), ProjectDataManagement::L27_EffectorId::B2}, // B2 - {QStringLiteral("B3"), ProjectDataManagement::L27_EffectorId::B3}, // B3 - {QStringLiteral("B4"), ProjectDataManagement::L27_EffectorId::B4}, // B4 - {QStringLiteral("B5"), ProjectDataManagement::L27_EffectorId::B5}, // B5 - {QStringLiteral("B6"), ProjectDataManagement::L27_EffectorId::B6}, // B6 - {QStringLiteral("B7"), ProjectDataManagement::L27_EffectorId::B7}, // B7 - {QStringLiteral("B8"), ProjectDataManagement::L27_EffectorId::B8}, // B8 - {QStringLiteral("C1"), ProjectDataManagement::L27_EffectorId::C1}, // C1 - {QStringLiteral("C2"), ProjectDataManagement::L27_EffectorId::C2}, // C2 - {QStringLiteral("C3"), ProjectDataManagement::L27_EffectorId::C3}, // C3 - {QStringLiteral("C4"), ProjectDataManagement::L27_EffectorId::C4}, // C4 - {QStringLiteral("C5"), ProjectDataManagement::L27_EffectorId::C5}, // C5 - {QStringLiteral("C6"), ProjectDataManagement::L27_EffectorId::C6}, // C6 - {QStringLiteral("C7"), ProjectDataManagement::L27_EffectorId::C7}, // C7 - {QStringLiteral("C8"), ProjectDataManagement::L27_EffectorId::C8}, // C8 - {QStringLiteral("211"), ProjectDataManagement::L27_EffectorId::NO_211}, // 211 Werfer ID - {QStringLiteral("212"), ProjectDataManagement::L27_EffectorId::NO_212}, // 212 Werfer ID - {QStringLiteral("213"), ProjectDataManagement::L27_EffectorId::NO_213}, // 213 Werfer ID - {QStringLiteral("214"), ProjectDataManagement::L27_EffectorId::NO_214}, // 214 Werfer ID - {QStringLiteral("215"), ProjectDataManagement::L27_EffectorId::NO_215}, // 215 Werfer ID - {QStringLiteral("216"), ProjectDataManagement::L27_EffectorId::NO_216}, // 216 Werfer ID - {QStringLiteral("217"), ProjectDataManagement::L27_EffectorId::NO_217}, // 217 Werfer ID - {QStringLiteral("218"), ProjectDataManagement::L27_EffectorId::NO_218}, // 218 Werfer ID - {QStringLiteral("221"), ProjectDataManagement::L27_EffectorId::NO_221}, // 221 Werfer ID - {QStringLiteral("222"), ProjectDataManagement::L27_EffectorId::NO_222}, // 222 Werfer ID - {QStringLiteral("223"), ProjectDataManagement::L27_EffectorId::NO_223}, // 223 Werfer ID - {QStringLiteral("224"), ProjectDataManagement::L27_EffectorId::NO_224}, // 224 Werfer ID - {QStringLiteral("225"), ProjectDataManagement::L27_EffectorId::NO_225}, // 225 Werfer ID - {QStringLiteral("226"), ProjectDataManagement::L27_EffectorId::NO_226}, // 226 Werfer ID - {QStringLiteral("227"), ProjectDataManagement::L27_EffectorId::NO_227}, // 227 Werfer ID - {QStringLiteral("228"), ProjectDataManagement::L27_EffectorId::NO_228}, // 228 Werfer ID - {QStringLiteral("311"), ProjectDataManagement::L27_EffectorId::NO_311}, // 311 Werfer ID - {QStringLiteral("312"), ProjectDataManagement::L27_EffectorId::NO_312}, // 312 Werfer ID - {QStringLiteral("313"), ProjectDataManagement::L27_EffectorId::NO_313}, // 313 Werfer ID - {QStringLiteral("314"), ProjectDataManagement::L27_EffectorId::NO_314}, // 314 Werfer ID - {QStringLiteral("315"), ProjectDataManagement::L27_EffectorId::NO_315}, // 315 Werfer ID - {QStringLiteral("316"), ProjectDataManagement::L27_EffectorId::NO_316}, // 316 Werfer ID - {QStringLiteral("317"), ProjectDataManagement::L27_EffectorId::NO_317}, // 317 Werfer ID - {QStringLiteral("318"), ProjectDataManagement::L27_EffectorId::NO_318}, // 318 Werfer ID - {QStringLiteral("321"), ProjectDataManagement::L27_EffectorId::NO_321}, // 321 Werfer ID - {QStringLiteral("322"), ProjectDataManagement::L27_EffectorId::NO_322}, // 322 Werfer ID - {QStringLiteral("323"), ProjectDataManagement::L27_EffectorId::NO_323}, // 323 Werfer ID - {QStringLiteral("324"), ProjectDataManagement::L27_EffectorId::NO_324}, // 324 Werfer ID - {QStringLiteral("325"), ProjectDataManagement::L27_EffectorId::NO_325}, // 325 Werfer ID - {QStringLiteral("326"), ProjectDataManagement::L27_EffectorId::NO_326}, // 326 Werfer ID - {QStringLiteral("327"), ProjectDataManagement::L27_EffectorId::NO_327}, // 327 Werfer ID - {QStringLiteral("328"), ProjectDataManagement::L27_EffectorId::NO_328}, // 328 Werfer ID - {QStringLiteral("411"), ProjectDataManagement::L27_EffectorId::NO_411}, // 411 Werfer ID - {QStringLiteral("412"), ProjectDataManagement::L27_EffectorId::NO_412}, // 412 Werfer ID - {QStringLiteral("413"), ProjectDataManagement::L27_EffectorId::NO_413}, // 413 Werfer ID - {QStringLiteral("414"), ProjectDataManagement::L27_EffectorId::NO_414}, // 414 Werfer ID - {QStringLiteral("415"), ProjectDataManagement::L27_EffectorId::NO_415}, // 415 Werfer ID - {QStringLiteral("416"), ProjectDataManagement::L27_EffectorId::NO_416}, // 416 Werfer ID - {QStringLiteral("417"), ProjectDataManagement::L27_EffectorId::NO_417}, // 417 Werfer ID - {QStringLiteral("418"), ProjectDataManagement::L27_EffectorId::NO_418}, // 418 Werfer ID - {QStringLiteral("421"), ProjectDataManagement::L27_EffectorId::NO_421}, // 421 Werfer ID - {QStringLiteral("422"), ProjectDataManagement::L27_EffectorId::NO_422}, // 422 Werfer ID - {QStringLiteral("423"), ProjectDataManagement::L27_EffectorId::NO_423}, // 423 Werfer ID - {QStringLiteral("424"), ProjectDataManagement::L27_EffectorId::NO_424}, // 424 Werfer ID - {QStringLiteral("425"), ProjectDataManagement::L27_EffectorId::NO_425}, // 425 Werfer ID - {QStringLiteral("426"), ProjectDataManagement::L27_EffectorId::NO_426}, // 426 Werfer ID - {QStringLiteral("427"), ProjectDataManagement::L27_EffectorId::NO_427}, // 427 Werfer ID - {QStringLiteral("428"), ProjectDataManagement::L27_EffectorId::NO_428}, // 428 Werfer ID - {QStringLiteral("511"), ProjectDataManagement::L27_EffectorId::NO_511}, // 511 Werfer ID - {QStringLiteral("512"), ProjectDataManagement::L27_EffectorId::NO_512}, // 512 Werfer ID - {QStringLiteral("513"), ProjectDataManagement::L27_EffectorId::NO_513}, // 513 Werfer ID - {QStringLiteral("514"), ProjectDataManagement::L27_EffectorId::NO_514}, // 514 Werfer ID - {QStringLiteral("515"), ProjectDataManagement::L27_EffectorId::NO_515}, // 515 Werfer ID - {QStringLiteral("516"), ProjectDataManagement::L27_EffectorId::NO_516}, // 516 Werfer ID - {QStringLiteral("517"), ProjectDataManagement::L27_EffectorId::NO_517}, // 517 Werfer ID - {QStringLiteral("518"), ProjectDataManagement::L27_EffectorId::NO_518}, // 518 Werfer ID - {QStringLiteral("521"), ProjectDataManagement::L27_EffectorId::NO_521}, // 521 Werfer ID - {QStringLiteral("522"), ProjectDataManagement::L27_EffectorId::NO_522}, // 522 Werfer ID - {QStringLiteral("523"), ProjectDataManagement::L27_EffectorId::NO_523}, // 523 Werfer ID - {QStringLiteral("524"), ProjectDataManagement::L27_EffectorId::NO_524}, // 524 Werfer ID - {QStringLiteral("525"), ProjectDataManagement::L27_EffectorId::NO_525}, // 525 Werfer ID - {QStringLiteral("526"), ProjectDataManagement::L27_EffectorId::NO_526}, // 526 Werfer ID - {QStringLiteral("527"), ProjectDataManagement::L27_EffectorId::NO_527}, // 527 Werfer ID - {QStringLiteral("528"), ProjectDataManagement::L27_EffectorId::NO_528} // 528 Werfer ID -}; - -// EX-L32 Fehlerstatus -enum SAATELEGRAMS_EXPORT Status_L32 -{ - INV, // Meldung nicht gültig nach JSON-Schema. - DAT, // Datenkonsistenzfehler. -}; - -// EX-L40 Szenarstatus -// ist bereits definiert -// enum class SAATELEGRAMS_EXPORT Szenarstatus -// { -// Inaktiv, // Es ist keine Szenarausfuehrung aktiv. -// Geplant, // Das Szenar wird gestartet. -// Aktiv, // Das Szenar wird ausgefuehrt. -// Gestoppt, // Das Szenar wurde gestoppt. -// }; - -// EX-L43 Winkelgruppe -enum class SAATELEGRAMS_EXPORT Winkelgruppe -{ - Untere = 0, // Untere Winkelgruppe - Obere = 1 // Obere Winkelgruppe -}; - -// EX-L44 Flugbahnberechnung Fehlercode -enum class SAATELEGRAMS_EXPORT FlugbahnberechnungFehlercode -{ - Ok = 0, // Erfolg - MinimaleEntfernung = 1, // Unterhalb der minimalen Entfernung - MaximaleEntfernung = 2, // Oberhalb der maximalen Entfernung - GeschossKombination = 3, // Ungueltige Geschosskombination - Ungueltig = 4, // Ungueltig -}; - -// EX-L45 Anmeldebestätigung Fehlercode -enum class SAATELEGRAMS_EXPORT L45_AnmeldebestaetigungFehlercode -{ - Ok = 0, // OK - Doppelt = 1, // Doppelte Anmeldung - Mehrfach = 2, // Mehrfachanmeldung - Belegt = 3 // Belegte Anmeldung -}; - -// EX-L3 Einheit -struct SAATELEGRAMS_EXPORT Einheit -{ - QString verein; // EX-L2 - int r; - ProjectDataManagement::L19_Oi oi; // EX-L19 -}; - -// EX-L8 Geschosse -struct SAATELEGRAMS_EXPORT Geschoss -{ - QString geschosssorte; // EX-L9 (table pdm_charge_type) - QString ladung; // EX-L10 (table pdm_load_type) - QString zuender; // EX-L11 (table pdm_igniter_type) - int anzahl{0}; -}; - -// EX-L12 Zieldaten -struct SAATELEGRAMS_EXPORT Zieldaten -{ - int nummer{0}; - ProjectDataManagement::L4_TargetGeometry geometrie; // EX-L4 - KoordinateMitHoehe koordinate; // EX-L14 - KoordinateMitHoehe relativKoordinate; // EX-L14 - int breiteRadius{0}; - int tiefe{0}; - int zielachse{0}; - int zog{0}; - int elemente{0}; - QString typ; // EX-L20 (pdm_target_type) - QString subTyp; // EX-L21 (pdm_target_subtype) -}; - -// EX-L14 -// struct SAATELEGRAMS_EXPORT KoordinateMitHoehe ist weiter oben definiert. - -// EX-L18 Wirkungsbereich -struct SAATELEGRAMS_EXPORT Wirkungsbereich -{ - int grundrichtung; - int links; - int rechts; -}; - -// EX-L23 Feuereinheit -struct SAATELEGRAMS_EXPORT Feuereinheit -{ - QString verein; - int r; -}; - -// EX-L29 Erkundungseinheit -struct SAATELEGRAMS_EXPORT Erkundungseinheit -{ - QString verein; - int r; -}; - -// EX-L30 Erkundungsstellungen -struct SAATELEGRAMS_EXPORT Erkundungsstellungen -{ - QVector waffenplaetze; // EX-L14 - Wirkungsbereich wirkungsbereich; // EX-L18 -}; - -// EX-L36 Feuerkommando Geschosse -struct SAATELEGRAMS_EXPORT FeuerkommandoGeschosse -{ - QString geschosssorte; // EX-L9 (table pdm_charge_type) - QString ladung; // EX-L10 (table pdm_load_type) - QString zuender; // EX-L11 (table pdm_igniter_type) - QString zuenderFunktion; // EX-L41 (table pdm_igniter_function) - double zuenderZeit; // [ms] - int anzahl; - int ladungsNummer; - double intervall; // [s] -}; - -// EX-L35 Flugbahnpunkt -struct SAATELEGRAMS_EXPORT Flugbahnpunkt -{ - double zeit; - double xRelativ; - double yRelativ; - double zRelativ; -}; - -// EX-L37 Flugbahnberechnung Geschosse -struct SAATELEGRAMS_EXPORT FlugbahnberechnungGeschosse -{ - QString geschosssorte; // EX_L9 (table pdm_charge_type) - QString ladung; // EX-L10 (table pdm_load_type) - QString zuender; // EX-L11 (table pdm_igniter_type) - QString zuenderFunktion; // EX-L41 (table pdm_igniter_function) -}; - -// EX-L38 Flugbahndaten Geschosse -struct SAATELEGRAMS_EXPORT FlugbahndatenGeschosse -{ - QString geschosssorte; // EX_L9 (table pdm_charge_type) - QString ladung; // EX-L10 (table pdm_load_type) - int ladungsNummer; - QString zuender; // EX-L11 (table pdm_igniter_type) - QString zuenderFunktion; // EX-L41 (table pdm_igniter_function) - double zuenderZeit; -}; - -// EX-L39 Streuungsdaten -struct SAATELEGRAMS_EXPORT Streuungsdaten -{ - double laengsstreuung; - double seitenstreuung; - double laengsstreuungH; - double seitenstreuungH; -}; - -// EX-L34 Wirkmittel Feuerkommando -struct SAATELEGRAMS_EXPORT WirkmittelFeuerkommando -{ - ProjectDataManagement::L27_EffectorId kenner; // EX-L27 - KoordinateMitHoehe auftreffpunkt; // EX-L14 - double flugzeit; - int gipfelhoehe; - double schussrichtung; - FeuerkommandoGeschosse geschoss; // EX-L36 - QVector flugbahnpunkt; // EX-L35 - Streuungsdaten streuung; // EX-L39 -}; - -// EX-L47 Rakete Trefferpunkt -struct SAATELEGRAMS_EXPORT Treffpunkt -{ - KoordinateMitHoehe koordinate; // EX-L14 - int anzahl; -}; - -// EX-L49 Wirkmittel Feuerkommando Rakete -struct SAATELEGRAMS_EXPORT WirkmittelFeuerkommandoRakete -{ - ProjectDataManagement::L27_EffectorId kenner; // EX-L27 - QVector treffpunkte; - double flugzeit; - int gipfelhoehe; - double schussrichtung; - int fallwinkel; - ProjectDataManagement::L48_TrajectoryRocket anflug; - FeuerkommandoGeschosse geschoss; - ProjectDataManagement::L46_GpsFrequency gps; - int wirkzeit; -}; - -// EX-L33 Feuerkommando -struct SAATELEGRAMS_EXPORT Feuerkommando -{ - QString verein; // EX-L2 - ProjectDataManagement::L26_EffectingSystemType typ; // EX-L26 - QVector wirkmittel; // EX-L34 - QVector wirkmittelRakete; // EX-L49 -}; - -// ====================================================================================================== -// Strukturen und Legenden - -// EX-Wirkfelddaten -struct SAATELEGRAMS_EXPORT Wirkfelddaten -{ - QString feuerkampfReferenz; - Zieldaten zieldaten; - Abfeuerungsart abfeuerungsArt; - ProjectDataManagement::L7_Request forderung; - int dauer; - Feuerkommando feuerkommando; -}; - -// EX-Feuerkampfdaten -struct SAATELEGRAMS_EXPORT Feuerkampfdaten -{ - QString feuerkampfReferenz; // string - QString verein; // EX-L2 - ProjectDataManagement::L27_EffectorId kenner; // EX-L27 -}; - -// EX-Erkundungsdaten -struct SAATELEGRAMS_EXPORT Erkundungsdaten -{ - Erkundungseinheit einheit; // EX-L29 - KoordinateMitHoehe ladeplatz; // EX-L14 - Erkundungsstellungen stellungen; // EX-L30 -}; - -// EX-Zielmeldedaten -struct SAATELEGRAMS_EXPORT Zielmeldedaten -{ - Zieldaten zieldaten; // EX-L12 - Abfeuerungsart abfeuerungsArt; // EX-L6 - ProjectDataManagement::L7_Request forderung; // EX-L7 - int dauer; - QVector feuerkommandos; // 1…n feuerkommando M S S EX-L37 -}; - -// EX-Feuerstellungsdaten -struct SAATELEGRAMS_EXPORT Feuerstellungsdaten -{ - ProjectDataManagement::L26_EffectingSystemType typ; // EX-L26 - ProjectDataManagement::L28_Status status; // EX-L28 - Einheit feuereinheit; // EX-L3 - KoordinateMitHoehe mittelpunkt; // EX-L14 - QVector koordinaten; // EX-L14 - QVector geschosse; // EX-L8 - Wirkungsbereich wirkungsbereich; // EX-L18 -}; - -// EX-Waffensystemdaten -struct SAATELEGRAMS_EXPORT Waffensystemdaten -{ - ProjectDataManagement::L26_EffectingSystemType typ; // EX-L26 - ProjectDataManagement::L27_EffectorId kenner; // EX-L27 - ProjectDataManagement::L28_Status status; // EX-L28 - Einheit einheit; // EX-L3 - QVector geschosse; // EX-L8 - KoordinateMitHoehe koordinate; // EX-L14 - Wirkungsbereich wirkungsbereich; // EX-L18 -}; - -// EX-Ladeplatzdaten -struct SAATELEGRAMS_EXPORT Ladeplatzdaten -{ - Einheit einheit; // EX-L3 - KoordinateMitHoehe koordinate; // EX-L14 - QVector geschosse; // EX-L8 -}; - -// EX-Stellungswechseldaten -struct SAATELEGRAMS_EXPORT Stellungswechseldaten -{ - QString verein; // EX-L2 - int r; - ProjectDataManagement::L19_Oi oi; // EX-L19 -}; - -// EX-Munitionsdaten -struct SAATELEGRAMS_EXPORT Munitionsdaten -{ - QString verein; // EX-L2 -}; - -// EX-LpMunitionsdaten -struct SAATELEGRAMS_EXPORT LpMunitionsdaten -{ - Einheit einheit; // EX-L3 -}; - -// EX-Koordinierungsdaten -struct SAATELEGRAMS_EXPORT Koordinierungsdaten -{ - ProjectDataManagement::L25_KindGuidingLine art; // EX-L25 - QString name; - int meldungsnummer; - QString truppenteil; // EX-L31 - Zeitangabe_DTG ab; // EX-L15 - Zeitangabe_DTG bis; // EX-L15 - QVector koordinaten; // EX-L13 - Koordinate mittelpunkt; // EX-L13 - int radius; - int maxGipfel; // EX-L5 -}; - -// EX-Wirkfelddaten -struct SAATELEGRAMS_EXPORT WirkfeldplanungData -{ - QString feuerkampfReferenz; - Zieldaten zieldaten; // EX-L12 - Abfeuerungsart abfeuerungsArt; // EX-L6 - ProjectDataManagement::L7_Request forderung; // EX-L7 - int dauer; - Feuerkommando feuerkommando; // EX-L33 -}; - -// EX-Fuehrungsdaten -struct SAATELEGRAMS_EXPORT Fuehrungsdaten -{ - Art_L24 art; // EX-L24 - QString name; - int meldungsnummer; - Zeitangabe_DTG ab; // EX-L15 - Zeitangabe_DTG bis; // EX-L15 - QVector koordinaten; // EX-L13 - QString linkerNachbar; - QString rechterNachbar; -}; - -// EX-Anmeldedaten -struct SAATELEGRAMS_EXPORT Anmeldedaten -{ - int partyId; - bool adlerVerbund; - QString szenar; -}; -void SAATELEGRAMS_EXPORT anmeldedatenFromJson(const QJsonObject &data, Anmeldedaten &anmeldedaten, bool &bOk); - -// EX-Anmeldedaten -struct SAATELEGRAMS_EXPORT Abmeldedaten -{ - int partyId; -}; -void SAATELEGRAMS_EXPORT abmeldedatenFromJson(const QJsonObject &data, Abmeldedaten &anmeldedaten, bool &bOk); - -// EX-TechnischeDaten -struct SAATELEGRAMS_EXPORT TechnischeDaten -{ - Status_L32 status; // EX-L32 - QString beschreibung; -}; - -// EX-FreitextDaten -struct SAATELEGRAMS_EXPORT FreitextDaten -{ - QString text; -}; - -// EX-MQ Manuelle Quittung Daten -struct SAATELEGRAMS_EXPORT ManuelleQuittungDaten -{ - QString feuerkampfreferenz; -}; - -// EX-FeuerHaltDaten -struct SAATELEGRAMS_EXPORT FeuerHaltDaten -{ - QString verein; // EX-L2 - ProjectDataManagement::L27_EffectorId kenner; // EX-L27 - ProjectDataManagement::L22_FireHaltCategory kategorie; // EX-L22 - QString feuerkampfReferenz; - int zpNummer; - Koordinate koordinate; // EX-L13 - int radius; - bool entladenSchuss; -}; - -// EX-AnBestaetigungsdaten -struct SAATELEGRAMS_EXPORT AnBestaetigungsdaten -{ - L45_AnmeldebestaetigungFehlercode error; -}; - -// EX-Flugbahnberechnung -struct SAATELEGRAMS_EXPORT FlugBerechnungsDaten -{ - KoordinateMitHoehe standort; - KoordinateMitHoehe zielkoordinate; - ProjectDataManagement::L26_EffectingSystemType waffensystem; - FlugbahnberechnungGeschosse geschoss; // EX-L37 - int sprenghoehe; - Winkelgruppe winkelgruppe; -}; - -// EX-Flugbahndaten -struct SAATELEGRAMS_EXPORT Flugbahndaten -{ - FlugbahnberechnungFehlercode fehlercode; // EX-L44 - KoordinateMitHoehe zielkoordinate; - ProjectDataManagement::L26_EffectingSystemType waffensystem; - int flugzeit; - int gipfelhoehe; - int schussrichtung; - int fallwinkel; - QVector flugbahnpunkt; // EX-L35 - Streuungsdaten streuung; - FlugbahndatenGeschosse geschoss; -}; -// EX-Statusdaten -// struct SAATELEGRAMS_EXPORT Statusdaten -// { -// Szenarstatus status; // EX-L40 - -// }; -// Siehe EXStatus - -// EX-FQ(BA-BB-FK) Wirkfeldplanung (EX_AWES_PLANNING) -void SAATELEGRAMS_EXPORT wirkfeldplanungDataFromJson(const QJsonObject &data, WirkfeldplanungData &wirkfeldplanungData, bool &bOk); -struct SAATELEGRAMS_EXPORT ExAwesPlanning : public EXTelegramBase -{ - WirkfeldplanungData wirkfeldplanungData; - - ExAwesPlanning() - : EXTelegramBase(JsonKeys::EX_AWES_PLANNING(), TelegramIds::EX_AWES_PLANNING()) - { - } - QJsonObject toJson() override; - - public: - template QJsonObject toJsonInternal(); -}; - -template <> QJsonObject ExAwesPlanning::toJsonInternal(); - -// 7.1.4 EX-FQ(FB) Feuerbereit -void SAATELEGRAMS_EXPORT feuerkampfdatenFromJson(const QJsonObject &data, Feuerkampfdaten &feuerkampfdaten, bool &bOk); -struct SAATELEGRAMS_EXPORT ExFeuerbereit : public EXTelegramBase -{ - Feuerkampfdaten feuerkampfdaten; - - ExFeuerbereit() - : EXTelegramBase(JsonKeys::EX_READY_TO_FIRE(), TelegramIds::EX_READY_TO_FIRE()) - { - } - QJsonObject toJson() override; - - public: - template QJsonObject toJsonInternal(); -}; - -template <> QJsonObject ExFeuerbereit::toJsonInternal(); - -// 7.1.5 EX-FQ(FN) Feuern -struct SAATELEGRAMS_EXPORT ExFeuern : public EXTelegramBase -{ - Feuerkampfdaten feuerkampfdaten; - - ExFeuern() - : EXTelegramBase(JsonKeys::EX_FIRE(), TelegramIds::EX_FIRE()) - { - } - QJsonObject toJson() override; - - public: - template QJsonObject toJsonInternal(); -}; - -template <> QJsonObject ExFeuern::toJsonInternal(); - -// 7.1.6 EX-FQ(AF) Abgefeuert -struct SAATELEGRAMS_EXPORT ExAbgefeuert : public EXTelegramBase -{ - Feuerkampfdaten feuerkampfdaten; - - ExAbgefeuert() - : EXTelegramBase(JsonKeys::EX_FIRED(), TelegramIds::EX_FIRED()) - { - } - QJsonObject toJson() override; - - public: - template QJsonObject toJsonInternal(); -}; - -template <> QJsonObject ExFeuern::toJsonInternal(); - -// 7.1.7 EX-FQ(VM) Vollzugsmeldung -struct SAATELEGRAMS_EXPORT ExVollzugsmeldung : public EXTelegramBase -{ - Feuerkampfdaten feuerkampfdaten; - - ExVollzugsmeldung() - : EXTelegramBase(JsonKeys::EX_ENFORCEMENT(), TelegramIds::EX_ENFORCEMENT()) - { - } - QJsonObject toJson() override; - - public: - template QJsonObject toJsonInternal(); -}; - -template <> QJsonObject ExFeuern::toJsonInternal(); - -// // 7.1.8 EX-Erkundungsanfrage - Anfrage Erkundungsergebnisse -// struct SAATELEGRAMS_EXPORT ExErkundungsanfrage : public EXTelegramBase -// { - -// ExErkundungsanfrage() -// : EXTelegramBase(JsonKeys::EX_REQUEST_EXPLORATION_RESULTS(), TelegramIds::EX_REQUEST_EXPLORATION_RESULTS()) -// {} -// QJsonObject toJson() override; -// public: -// template -// QJsonObject toJsonInternal(); - -// }; - -// template<> -// QJsonObject ExFeuern::toJsonInternal(); - -// 7.1.9 EX-Erkundungsergebnisse - Senden Erkundungsergebnisse -void SAATELEGRAMS_EXPORT erkundungsdatenFromJson(const QJsonObject &data, Erkundungsdaten &erkundungsdaten, bool &bOk); - -struct SAATELEGRAMS_EXPORT ExErkundungsergebnisse : public EXTelegramBase -{ - Erkundungsdaten erkundungsdaten; - - ExErkundungsergebnisse() - : EXTelegramBase(JsonKeys::EX_EXPLORATION_RESULTS(), TelegramIds::EX_EXPLORATION_RESULTS()) - { - } - QJsonObject toJson() override; - - public: - template QJsonObject toJsonInternal(); -}; - -template <> QJsonObject ExFeuern::toJsonInternal(); - -// 7.1.10 EX-FQ(BA-BB) Feuerkampf -// Feuerkampf enthaelt keine Feuerkampfsdaten, sondern Zielmeldedaten. - -void SAATELEGRAMS_EXPORT zielmeldedatenFromJson(const QJsonObject &data, Zielmeldedaten &zielmeldedaten, bool &bOk); -struct SAATELEGRAMS_EXPORT ExFeuerkampf : public EXTelegramBase -{ - Zielmeldedaten zielmeldedaten; // EX-Zielmeldedaten - - ExFeuerkampf() - : EXTelegramBase(JsonKeys::EX_FIRE_FIGHT(), TelegramIds::EX_FIRE_FIGHT()) - { - } - QJsonObject toJson() override; - - public: - template QJsonObject toJsonInternal(); -}; - -template <> QJsonObject ExFeuern::toJsonInternal(); - -// 7.1.11 EX-FH Feuer HALT - -void SAATELEGRAMS_EXPORT feuerHaltDatenFromJson(const QJsonObject &data, FeuerHaltDaten &feuerHaltDaten, bool &bOk); -struct SAATELEGRAMS_EXPORT ExFeuerhalt : public EXTelegramBase -{ - FeuerHaltDaten feuerHaltDaten; // - - ExFeuerhalt() - : EXTelegramBase(JsonKeys::EX_FIRE_HALT(), TelegramIds::EX_FIRE_HALT()) - { - } - QJsonObject toJson() override; - - public: - template QJsonObject toJsonInternal(); -}; - -template <> QJsonObject ExFeuern::toJsonInternal(); - -// 7.1.12 EX-SQ(FS) Stellungsmeldung Feuerstellung - -void SAATELEGRAMS_EXPORT feuerstellungsdatenFromJson(const QJsonObject &data, Feuerstellungsdaten &feuerstellungsdaten, bool &bOk); -struct SAATELEGRAMS_EXPORT ExFeuerstellungFS : public EXTelegramBase -{ - Feuerstellungsdaten feuerstellungsdaten; // - - ExFeuerstellungFS() - : EXTelegramBase(JsonKeys::EX_POSITION_REPORT_FIRE(), TelegramIds::EX_POSITION_REPORT_FIRE()) - { - } - QJsonObject toJson() override; - - public: - template QJsonObject toJsonInternal(); -}; - -template <> QJsonObject ExFeuerstellungFS::toJsonInternal(); - -// 7.1.13 EX-SQ(WS) Stellungsmeldung Waffensystem - -void SAATELEGRAMS_EXPORT waffensystemdatenFromJson(const QJsonObject &data, Waffensystemdaten &waffensystemdaten, bool &bOk); -struct SAATELEGRAMS_EXPORT ExFeuerstellungWS : public EXTelegramBase -{ - Waffensystemdaten waffensystemdaten; // - - ExFeuerstellungWS() - : EXTelegramBase(JsonKeys::EX_POSITION_REPORT_WEAPON(), TelegramIds::EX_POSITION_REPORT_WEAPON()) - { - } - QJsonObject toJson() override; - - public: - template QJsonObject toJsonInternal(); -}; - -template <> QJsonObject ExFeuerstellungWS::toJsonInternal(); - -// 7.1.14 EX-SQ(LP) Stellungsmeldung Ladeplatz - -void SAATELEGRAMS_EXPORT ladeplatzdatenFromJson(const QJsonObject &data, Ladeplatzdaten &ladeplatzdaten, bool &bOk); -struct SAATELEGRAMS_EXPORT ExFeuerstellungLP : public EXTelegramBase -{ - Ladeplatzdaten ladeplatzdaten; // - - ExFeuerstellungLP() - : EXTelegramBase(JsonKeys::EX_POSITION_REPORT_LOADING_PLACE(), TelegramIds::EX_POSITION_REPORT_LOADING_PLACE()) - { - } - QJsonObject toJson() override; - - public: - template QJsonObject toJsonInternal(); -}; - -template <> QJsonObject ExFeuerstellungLP::toJsonInternal(); - -// 7.1.15 EX-Stellungswechsel - -void SAATELEGRAMS_EXPORT stellungswechseldatenFromJson(const QJsonObject &data, Stellungswechseldaten &stellungswechseldaten, bool &bOk); -struct SAATELEGRAMS_EXPORT ExStellungswechsel : public EXTelegramBase -{ - Stellungswechseldaten stellungswechseldaten; // EX-Stellungswechseldaten - - ExStellungswechsel() - : EXTelegramBase(JsonKeys::EX_POSITION_CHANGED(), TelegramIds::EX_POSITION_CHANGED()) - { - } - QJsonObject toJson() override; - - public: - template QJsonObject toJsonInternal(); -}; - -template <> QJsonObject ExStellungswechsel::toJsonInternal(); - -// 7.1.16 EX-HQ(K) Koordinierungsmassnahmen - -void SAATELEGRAMS_EXPORT koordinierungsdatenFromJson(const QJsonObject &data, Koordinierungsdaten &koordinierungsdaten, bool &bOk); -struct SAATELEGRAMS_EXPORT ExHqKoordinierungsmassnahmen : public EXTelegramBase -{ - Koordinierungsdaten koordinierungsdaten; // EX-Koordinierungsdaten - - ExHqKoordinierungsmassnahmen() - : EXTelegramBase(JsonKeys::EX_GUIDING_LINES(), TelegramIds::EX_GUIDING_LINES()) - { - } - QJsonObject toJson() override; - - public: - template QJsonObject toJsonInternal(); -}; - -template <> QJsonObject ExHqKoordinierungsmassnahmen::toJsonInternal(); - -// 7.1.17 EX-HQ(G) Fuehrungslinien und Grenzen - -void SAATELEGRAMS_EXPORT fuehrungsdatenFromJson(const QJsonObject &data, Fuehrungsdaten &fuehrungsdaten, bool &bOk); -struct SAATELEGRAMS_EXPORT ExHqFuehrungslinien : public EXTelegramBase -{ - Fuehrungsdaten fuehrungsdaten; // EX-Fuehrungsdaten - - ExHqFuehrungslinien() - : EXTelegramBase(JsonKeys::EX_GUIDING_LINES_AND_BOUNDARIES(), TelegramIds::EX_GUIDING_LINES_AND_BOUNDARIES()) - { - } - QJsonObject toJson() override; - - public: - template QJsonObject toJsonInternal(); -}; - -template <> QJsonObject ExHqFuehrungslinien::toJsonInternal(); - -// 7.1.22 EX-TQ Technische Quittierung - -void SAATELEGRAMS_EXPORT technischeDatenFromJson(const QJsonObject &data, TechnischeDaten &technischeDaten, bool &bOk); -struct SAATELEGRAMS_EXPORT ExTqTechnischeQuittung : public EXTelegramBase -{ - TechnischeDaten technischeDaten; // EX-TechnischeDaten - - ExTqTechnischeQuittung() - : EXTelegramBase(JsonKeys::EX_TQ(), TelegramIds::EX_TQ()) - { - } - QJsonObject toJson() override; - - public: - template QJsonObject toJsonInternal(); -}; - -template <> QJsonObject ExTqTechnischeQuittung::toJsonInternal(); - -// 7.1.23 EX-AQ Freitextmeldung - -void SAATELEGRAMS_EXPORT FreitextDatenFromJson(const QJsonObject &data, FreitextDaten &freitextDaten, bool &bOk); -struct SAATELEGRAMS_EXPORT ExAqFreitextmeldung : public EXTelegramBase -{ - FreitextDaten freitextDaten; // EX-FreitextDaten - - ExAqFreitextmeldung() - : EXTelegramBase(JsonKeys::EX_AQ(), TelegramIds::EX_AQ()) - { - } - QJsonObject toJson() override; - - public: - template QJsonObject toJsonInternal(); -}; -template <> QJsonObject ExAqFreitextmeldung::toJsonInternal(); - -// 7.2.1 EX-MQ Manuelle Quittung - -void SAATELEGRAMS_EXPORT mqManuelleQuittungDatenFromJson(const QJsonObject &data, ManuelleQuittungDaten &manuelleQuittungDaten, bool &bOk); -struct SAATELEGRAMS_EXPORT ExMqManuelleQuittung : public EXTelegramBase -{ - ManuelleQuittungDaten mqManuelleQuittungDaten; - - ExMqManuelleQuittung() - : EXTelegramBase(JsonKeys::EX_MANUAL_REPLY(), TelegramIds::EX_MANUAL_REPLY()) - { - } - QJsonObject toJson() override; - - public: - template QJsonObject toJsonInternal(); -}; -template <> QJsonObject ExMqManuelleQuittung::toJsonInternal(); - -// 7.2.5 EX-FQ(nFN) Nicht Feuern - -void SAATELEGRAMS_EXPORT exNichtFeuernFromJson(const QJsonObject &data, Feuerkampfdaten &feuerkampfdaten, bool &bOk); - -struct SAATELEGRAMS_EXPORT exNichtFeuern : public EXTelegramBase -{ - Feuerkampfdaten feuerkampfdaten; - - exNichtFeuern() - : EXTelegramBase(JsonKeys::EX_DONT_FIRE(), TelegramIds::EX_DONT_FIRE()) - { - } - - QJsonObject toJson() override; - - public: - template QJsonObject toJsonInternal(); -}; -template <> QJsonObject exNichtFeuern::toJsonInternal(); - -// 7.2.17 EX-Anmeldebestaetigung -void SAATELEGRAMS_EXPORT exAnmeldebestaetigungDatenFromJson(const QJsonObject &data, AnBestaetigungsdaten &anBestaetigungsdaten, bool &bOk); -struct SAATELEGRAMS_EXPORT ExAnmeldebestaetigung : public EXTelegramBase -{ - AnBestaetigungsdaten anBestaetigungsdaten; - - ExAnmeldebestaetigung() - : EXTelegramBase(JsonKeys::EX_REGISTRATION_CONFIRMATION(), TelegramIds::EX_REGISTRATION_CONFIRMATION()) - { - } - QJsonObject toJson() override; - - public: - template QJsonObject toJsonInternal(); -}; -template <> QJsonObject ExAnmeldebestaetigung::toJsonInternal(); - -// 7.2.22 EX-Flugbahnberechnung - -void SAATELEGRAMS_EXPORT exFlugbahnberechnungDatenFromJson(const QJsonObject &data, FlugBerechnungsDaten &flugBerechnungsDaten, bool &bOk); -struct SAATELEGRAMS_EXPORT ExFlugbahnberechnung : public EXTelegramBase -{ - FlugBerechnungsDaten flugbahnberechnungDaten; - - ExFlugbahnberechnung() - : EXTelegramBase(JsonKeys::EX_FLUGBAHNBERECHNUNG(), TelegramIds::EX_FLUGBAHNBERECHNUNG()) - { - } - QJsonObject toJson() override; - - public: - template QJsonObject toJsonInternal(); -}; -template <> QJsonObject ExFlugbahnberechnung::toJsonInternal(); - -// 7.2.23 EX-Flugbahndaten - -void SAATELEGRAMS_EXPORT flugbahndatenFromJson(const QJsonObject &data, Flugbahndaten &flugbahndaten, bool &bOk); -struct SAATELEGRAMS_EXPORT ExFlugbahndaten : public EXTelegramBase -{ - Flugbahndaten flugbahndaten; - - ExFlugbahndaten() - : EXTelegramBase(JsonKeys::EX_FLUGBAHNDATEN(), TelegramIds::EX_FLUGBAHNDATEN()) - { - } - QJsonObject toJson() override; - - public: - template QJsonObject toJsonInternal(); -}; -template <> QJsonObject ExFlugbahndaten::toJsonInternal(); - -// -------------------------------------------- -// Enum-Maps: -// -------------------------------------------- - -// EX-L4 Zielgeometrie -const QMap zielgeometrieMap = { - {QStringLiteral("P"), ProjectDataManagement::L4_TargetGeometry::Point}, // Punktziel - {QStringLiteral("F"), ProjectDataManagement::L4_TargetGeometry::Area}, // Flaechenziel - {QStringLiteral("R"), ProjectDataManagement::L4_TargetGeometry::Radial}, // Radialziel - {QStringLiteral("L"), ProjectDataManagement::L4_TargetGeometry::Linear} // Linearziel -}; - -// EX-L6 Abfeuerungsart -const QMap AbfeuerungsartMap = { - {QStringLiteral("A"), Abfeuerungsart::A}, // TTF - {QStringLiteral("B"), Abfeuerungsart::B}, // Bereitschaft Melden - {QStringLiteral("F"), Abfeuerungsart::F}, // Feuern Sofort - {QStringLiteral("T"), Abfeuerungsart::T}, // TOT - {QStringLiteral("K"), Abfeuerungsart::K}, // Nach Kommando Feuern -}; - -// EX-L7 Forderung -const QMap ForderungMap = { - {QStringLiteral("ABR"), ProjectDataManagement::L7_Request::ABR}, // abriegeln - {QStringLiteral("BEK"), ProjectDataManagement::L7_Request::BEK}, // bekaempfen - {QStringLiteral("BEL"), ProjectDataManagement::L7_Request::BEL}, // beleuchten - {QStringLiteral("BLE"), ProjectDataManagement::L7_Request::BLE}, // blenden - {QStringLiteral("NIE"), ProjectDataManagement::L7_Request::NIE}, // niederhalten - {QStringLiteral("SPE"), ProjectDataManagement::L7_Request::SPE}, // sperren - {QStringLiteral("STO"), ProjectDataManagement::L7_Request::STO}, // stoeren - {QStringLiteral("UBW"), ProjectDataManagement::L7_Request::UBW}, // ueberwachen - {QStringLiteral("VER"), ProjectDataManagement::L7_Request::VER}, // vernichten - {QStringLiteral("ZSL"), ProjectDataManagement::L7_Request::ZSL}, // zerschlagen - {QStringLiteral("ZER"), ProjectDataManagement::L7_Request::ZER}, // zerstoeren (Infrastruktur) - {QStringLiteral("BWL"), ProjectDataManagement::L7_Request::BWL}, // bekaempfen mit wenig letaler Munition - {QStringLiteral("MRK"), ProjectDataManagement::L7_Request::MRK}, // markieren - {QStringLiteral("WRN"), ProjectDataManagement::L7_Request::WRN}, // warnen - {QStringLiteral("BLI"), ProjectDataManagement::L7_Request::BLI}, // blenden IR - {QStringLiteral("BEI"), ProjectDataManagement::L7_Request::BEI}, // beleuchten IR - {QStringLiteral("BEW"), ProjectDataManagement::L7_Request::BEW}, // beleuchten mit Wirkung - {QStringLiteral("BEO"), ProjectDataManagement::L7_Request::BEO}, // beobachten - {QStringLiteral("BLW"), ProjectDataManagement::L7_Request::BLW}, // blenden mit Wirkung - {QStringLiteral("MBE"), ProjectDataManagement::L7_Request::MBE}, // markieren mit Leucht - {QStringLiteral("MBL"), ProjectDataManagement::L7_Request::MBL}, // markieren mit Nebel - {QStringLiteral("MIR"), ProjectDataManagement::L7_Request::MIR}, // markieren mit Leucht IR -}; - -// EX-L19 Orts ID -const QMap ortsIdMap = { - {QStringLiteral("Empty"), ProjectDataManagement::L19_Oi::Empty}, // Orts ID nicht gesetzt - {QStringLiteral("F1"), ProjectDataManagement::L19_Oi::F1}, // 1. Feuerstellung - {QStringLiteral("F2"), ProjectDataManagement::L19_Oi::F2}, // 2. Feuerstellung - {QStringLiteral("F3"), ProjectDataManagement::L19_Oi::F3}, // 3. Feuerstellung - {QStringLiteral("F4"), ProjectDataManagement::L19_Oi::F4}, // 4. Feuerstellung - {QStringLiteral("F5"), ProjectDataManagement::L19_Oi::F5}, // 5. Feuerstellung - {QStringLiteral("F6"), ProjectDataManagement::L19_Oi::F6}, // 6. Feuerstellung - {QStringLiteral("F7"), ProjectDataManagement::L19_Oi::F7}, // 7. Feuerstellung - {QStringLiteral("F8"), ProjectDataManagement::L19_Oi::F8}, // 8. Feuerstellung - {QStringLiteral("F9"), ProjectDataManagement::L19_Oi::F9}, // 9. Feuerstellung - {QStringLiteral("L"), ProjectDataManagement::L19_Oi::L} // Ladeplatz -}; - -// EX-20 TargetType -> pdm_target_type -// EX-21 TargetSubType -> pdm_target_subtype - -// EX-L22 Feuer HALT Kategorie -const QMap feuerHaltKategorieMap = { - {QStringLiteral("A"), ProjectDataManagement::L22_FireHaltCategory::A}, // Feuer HALT Allgemein - {QStringLiteral("R"), ProjectDataManagement::L22_FireHaltCategory::R}, // Feuer HALT Referenziert - {QStringLiteral("E"), ProjectDataManagement::L22_FireHaltCategory::E}, // Feuer Einstellen - {QStringLiteral("C"), ProjectDataManagement::L22_FireHaltCategory::C}, // Aufheben Feuer HALT Allgemein - {QStringLiteral("F"), ProjectDataManagement::L22_FireHaltCategory::F}, // Aufheben Feuer HALT Referenziert -}; - -// EX-L24 HQ(G) Art -const QMap art_L24Map = { - {QStringLiteral("AL"), Art_L24::AL}, // Line of Departure - {QStringLiteral("ANL"), Art_L24::ANL}, // Handover Line - {QStringLiteral("AO"), Art_L24::AO}, // Area of Operations - {QStringLiteral("ATRZ"), Art_L24::ATRZ}, // Artillery Target Report Zone - {QStringLiteral("BAA"), Art_L24::BAA}, // Biological Attack Area - {QStringLiteral("BCA"), Art_L24::BCA}, // Biological Contaminated Area - {QStringLiteral("BDRY"), Art_L24::BDRY}, // Boundary - {QStringLiteral("BHA"), Art_L24::BHA}, // Biological Hazard Area - {QStringLiteral("CAA"), Art_L24::CAA}, // Chemical Attack Area - {QStringLiteral("CCA"), Art_L24::CCA}, // Chemical Contaminated Area - {QStringLiteral("CFL"), Art_L24::CFL}, // Coordinated Fire Line - {QStringLiteral("CFZ"), Art_L24::CFZ}, // Critical Friendly Zone - {QStringLiteral("CHA"), Art_L24::CHA}, // Chemical Hazard Area - {QStringLiteral("CP"), Art_L24::CP}, // Checkpoint - {QStringLiteral("CZ"), Art_L24::CZ}, // Censor Zone - {QStringLiteral("EA"), Art_L24::EA}, // Engagement Area - {QStringLiteral("EZ"), Art_L24::EZ}, // Engagement Zone - {QStringLiteral("FLET"), Art_L24::FLET}, // Forward Line of Enemy Troops - {QStringLiteral("FLOT"), Art_L24::FLOT}, // Forward Line of Own Troops - {QStringLiteral("FOAZI"), Art_L24::FOAZI}, // Fallout Area Zone I - {QStringLiteral("FOAZII"), Art_L24::FOAZII}, // Fallout Area Zone II - {QStringLiteral("IZ"), Art_L24::IZ}, // Inhibit Zone - {QStringLiteral("LZ"), Art_L24::LZ}, // Locating Zone - {QStringLiteral("MA"), Art_L24::MA}, // Mined Area - {QStringLiteral("NAI"), Art_L24::NAI}, // Named Area of Interest - {QStringLiteral("OA"), Art_L24::OA}, // Objective Area - {QStringLiteral("PL"), Art_L24::PL}, // Phase Line - {QStringLiteral("ROTACA"), Art_L24::ROTACA}, // ROT A Contaminated Area - {QStringLiteral("ROTAHA"), Art_L24::ROTAHA}, // ROT A Hazard Area - {QStringLiteral("ROTARA"), Art_L24::ROTARA}, // ROT A Release Area - {QStringLiteral("ROUTE"), Art_L24::ROUTE}, // Movement Route - {QStringLiteral("RP"), Art_L24::RP}, // Release Point - {QStringLiteral("SP"), Art_L24::SP}, // Starting Point - {QStringLiteral("TAI"), Art_L24::TAI}, // Target Area of Interest - {QStringLiteral("FEBA"), Art_L24::FEBA}, // Forward Edge of the Battle Area - {QStringLiteral("VZL"), Art_L24::VZL}, // Delay Line - {QStringLiteral("MFLD"), Art_L24::MFLD}, // Minefield - {QStringLiteral("ZOF"), Art_L24::ZOF}, // Zone of Fire - {QStringLiteral("TAREA"), Art_L24::TAREA}, // Target Area - {QStringLiteral("PP"), Art_L24::PP}, // Passage Point - {QStringLiteral("AMA"), Art_L24::AMA}, // Artillery Maneuver Area - {QStringLiteral("ARA"), Art_L24::ARA}, // Artillery Reserved Area -}; - -// EX-L25 HQ(K) Art -const QMap art_L25Map = { - {QStringLiteral("FFA"), ProjectDataManagement::L25_KindGuidingLine::FFA}, - {QStringLiteral("NFA"), ProjectDataManagement::L25_KindGuidingLine::NFA}, - {QStringLiteral("RFA"), ProjectDataManagement::L25_KindGuidingLine::RFA}, - {QStringLiteral("FSCL"), ProjectDataManagement::L25_KindGuidingLine::FSCL}, - {QStringLiteral("RFL"), ProjectDataManagement::L25_KindGuidingLine::RFL}, - {QStringLiteral("FSSL"), ProjectDataManagement::L25_KindGuidingLine::FSSL}, - {QStringLiteral("NFL"), ProjectDataManagement::L25_KindGuidingLine::NFL}, -}; - -// EX-L28 Status -const QMap StatusL28Map = { - - {QStringLiteral("Nicht einsatzbereit"), ProjectDataManagement::L28_Status::NichtEinsatzbereit}, - {QStringLiteral("Einsatzbereit"), ProjectDataManagement::L28_Status::Einsatzbereit}}; - -// EX-L32 Status -const QMap StatusL32Map = { - {QStringLiteral("INV"), Status_L32::INV}, // Meldung nicht gültig nach JSON-Schema. - {QStringLiteral("DAT"), Status_L32::DAT}, // Datenkonsistenzfehler. -}; - -// EX-L40 Szenarstatus -const QMap szenarstatusMap = { - {QStringLiteral("Inaktiv"), Szenarstatus::Inaktiv}, // Es ist keine Szenarausfuehrung aktiv. - {QStringLiteral("Geplant"), Szenarstatus::Geplant}, // Das Szenar wird gestartet. - {QStringLiteral("Aktiv"), Szenarstatus::Aktiv}, // Das Szenar wird ausgefuehrt. - {QStringLiteral("Gestoppt"), Szenarstatus::Gestoppt}, // Das Szenar wurde gestoppt -}; - -// EX-L43 Winkelgruppe -const QMap winkelgruppeMap = { - {QStringLiteral("Untere"), Winkelgruppe::Untere}, - {QStringLiteral("Obere"), Winkelgruppe::Obere}, -}; - -// EX-L44 Flugbahnberechnung Fehlercode -const QMap FehlercodeMap = { - {QStringLiteral("ok"), FlugbahnberechnungFehlercode::Ok}, // Erfolg - {QStringLiteral("MinimaleEntfernung"), FlugbahnberechnungFehlercode::MinimaleEntfernung}, // Unterhalb der minimalen Entfernung - {QStringLiteral("MaximaleEntfernung"), FlugbahnberechnungFehlercode::MaximaleEntfernung}, // Oberhalb der maximalen Entfernung - {QStringLiteral("GeschossKombination"), FlugbahnberechnungFehlercode::GeschossKombination}, // Ungueltige Geschosskombination - {QStringLiteral("Ungueltig"), FlugbahnberechnungFehlercode::Ungueltig}, // Ungueltig -}; - -// EX-L45 Anmeldebestaetigung Fehlercode -const QMap AnmeldebestaetigungFehlercodeMap = { - {QStringLiteral("ok"), L45_AnmeldebestaetigungFehlercode::Ok}, - {QStringLiteral("doppelt"), L45_AnmeldebestaetigungFehlercode::Doppelt}, - {QStringLiteral("mehrfach"), L45_AnmeldebestaetigungFehlercode::Mehrfach}, - {QStringLiteral("belegt"), L45_AnmeldebestaetigungFehlercode::Belegt}, -}; - -// EX-L46 GPS Frequenz -const QMap GpsFrequencyMap - = {{QStringLiteral("L1"), ProjectDataManagement::L46_GpsFrequency::L1}, {QStringLiteral("L1"), ProjectDataManagement::L46_GpsFrequency::L2}}; - -// EX-L48 Rakete Trajektorie -const QMap TrajectoryRocketMap - = {{QStringLiteral("Nominal"), ProjectDataManagement::L48_TrajectoryRocket::Nominal}, - {QStringLiteral("Vertical"), ProjectDataManagement::L48_TrajectoryRocket::Vertical}}; - -// EX-Koordinierungsdaten -void SAATELEGRAMS_EXPORT koordinierungsdatenFromJson(const QJsonObject &data, Koordinierungsdaten &koordinierungsdaten, bool &bOk); -void SAATELEGRAMS_EXPORT koordinierungsdatenToJson(QJsonObject &data, const Koordinierungsdaten &koordinierungsdaten); - -// 7.1.17 EX-HQ(G) Fuehrungslinien und Grenzen -void SAATELEGRAMS_EXPORT fuehrungsdatenFromJson(const QJsonObject &data, Fuehrungsdaten &fuehrungsdaten, bool &bOk); -void SAATELEGRAMS_EXPORT fuehrungsdatenToJson(QJsonObject &data, const Fuehrungsdaten &fuehrungsdaten); - -// EX-FeuerHaltDaten -void SAATELEGRAMS_EXPORT feuerHaltDatenFromJson(const QJsonObject &data, FeuerHaltDaten &feuerHaltDaten, bool &bOk); -void SAATELEGRAMS_EXPORT feuerHaltDatenToJson(QJsonObject &data, const FeuerHaltDaten &feuerHaltDaten); - -// EX-L49 Wirkmittel Feuerkommando Rakete -void SAATELEGRAMS_EXPORT wirkmittelFeuerkommandoRaketeToJson(QJsonObject &data, const WirkmittelFeuerkommandoRakete &wirkmittelFeuerkommandoRakete); -void SAATELEGRAMS_EXPORT wirkmittelFeuerkommandoRaketeFromJson(const QJsonObject &data, WirkmittelFeuerkommandoRakete &wirkmittelFeuerkommandoRakete, bool &bOk); -int SAATELEGRAMS_EXPORT getFeuerkommandoRaketeEffectDurationMsec(const QJsonObject &data); - -} // namespace AdlerJson diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/ws_handler.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/ws_handler.h deleted file mode 100755 index 8d42ce1ee..000000000 --- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/ws_handler.h +++ /dev/null @@ -1,78 +0,0 @@ -#pragma once - -#include "ws_interface.h" -#include "logger.h" - -#include -#include -#include -#include - - -namespace TrainingAreaBase -{ - class WebSocketWrapper; - - class WebSocketHandler : public WebSocketInterface - { - Q_OBJECT - public: - explicit WebSocketHandler(QObject *parent = nullptr); - ~WebSocketHandler(); - - // WSInterface interface - public: - bool init(quint16 listenPort) override; - bool isConnected() const override; - quint16 getPort() const override; - bool sendTelegram(const int typeId, const QJsonObject *data, const int exerciseId) override; - bool sendTelegram(const int wsId, const QJsonObject *data) override; - bool disconnectWs(int wsId) override; - QString getPeerAddress(int wsId) const override; - QUrl getPeerUrl(int wsId) const override; - - int getExerciseId(int wsId) const override; - - //Q_SIGNALS: - // void wsDisconnect(const int wsId); - private Q_SLOTS: - void onNewConnection(); - void onWebSocketDisconnected(); - void onTextMessageReceived(const QByteArray &baJson); - private: - bool sendTelegramInternal(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *data, const QString &type, int exerciseId); - bool sendTelegramInternal(const int wsId, const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *data, const QString &type, const int exerciseId); - int getWSIdFromWS( WebSocketWrapper* wsw ); - private: - QWebSocketServer *m_webSocketServer; - //QVector> m_webSockets; - QMap> m_connections; // key = wsId - - int m_nextWsId = 1; - AdlerJson::LOGGER_T m_logger; - }; - - class WebSocketWrapper : public QObject - { - Q_OBJECT - public: - explicit WebSocketWrapper(QWebSocket *ws); - ~WebSocketWrapper(); - - bool sendTextMessage(const QString &msg); - - void setExerciseId(int exerciseId); - void setWsId(int wsId){ m_wsId = wsId; } - int getWsId(){ return m_wsId; } - int exerciseId() const { return m_exerciseId; } - QWebSocket *webSocket() const { return m_webSocket; } - Q_SIGNALS: - void textMessageReceived(const QByteArray &data); - private Q_SLOTS: - void onTextMessageReceived(const QString &data); - private: - QWebSocket *m_webSocket; - int m_wsId; - int m_exerciseId; - }; -} diff --git a/qt6-after/qt6-migrated-legatus/include/AdlerJson/ws_interface.h b/qt6-after/qt6-migrated-legatus/include/AdlerJson/ws_interface.h deleted file mode 100755 index 4d4bb3370..000000000 --- a/qt6-after/qt6-migrated-legatus/include/AdlerJson/ws_interface.h +++ /dev/null @@ -1,45 +0,0 @@ -#pragma once - -#include -#include - -namespace TrainingAreaBase { - - class WebSocketInterface : public QObject - { - Q_OBJECT - public: - - virtual bool init(quint16 listenPort) = 0; - bool init(const QPair &portRange) - { - for (quint16 currentPort = portRange.first; currentPort != portRange.second; ++currentPort) - { - if (init(currentPort)) - return true; - } - - return init(0); - } - virtual bool isConnected() const = 0; - virtual quint16 getPort() const = 0; - - virtual bool disconnectWs(int wsId) = 0; - - virtual bool sendTelegram(int typeId, const QJsonObject *data, int exerciseId) = 0; - virtual bool sendTelegram(int wsId, const QJsonObject *data) = 0; - virtual QString getPeerAddress(int wsId) const = 0; - virtual QUrl getPeerUrl(int wsId) const = 0; - virtual int getExerciseId(int wsId) const = 0; - Q_SIGNALS: - void recivedTelegram(int wsId, const QJsonObject& telegramData); - void newConnection(int wsId, const QString& address, qint16 port); - void wsDisconnected(int wsId); - - - public: - explicit WebSocketInterface(QObject* parent = nullptr) : QObject(parent){} - virtual ~WebSocketInterface() {} - }; - -} diff --git a/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_dtc.h b/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_dtc.h deleted file mode 100644 index d09b626b3..000000000 --- a/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_dtc.h +++ /dev/null @@ -1,94 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -#include -#include -#include -#include - -#include - -#include "LtsUtils/LtsUtilsCore/data_modification_enum.h" -#include "ProjectDataManagement/pdm_types.h" - -namespace AlarmManagement -{ - -// Position-Struct (wird normalerweise von DDS generiert) -struct Position -{ - double longitude = 0.0; - double latitude = 0.0; - - double lon() const { return longitude; } - double lat() const { return latitude; } -}; - -// Notification-Struct (wird normalerweise von DDS generiert) -struct Notification -{ - int32_t id = 0; - int64_t time() const { return timestamp; } - int64_t timestamp = 0; - int32_t type = 0; - int32_t priority = 0; - int32_t status = 0; - std::string description; - - // Zusätzliche Member für AlarmHistoryModel - int32_t operatorId() const { return m_operatorId; } - int32_t equipmentNumber() const { return m_equipmentNumber; } - std::optional participantId() const { return m_participantId; } - std::optional aesId() const { return m_aesId; } - ProjectDataManagement::EventType eventType() const { return m_eventType; } - Position position() const { return m_position; } - const std::string& properties() const { return m_properties; } - - int32_t m_operatorId = 0; - int32_t m_equipmentNumber = 0; - std::optional m_participantId; - std::optional m_aesId; - ProjectDataManagement::EventType m_eventType = ProjectDataManagement::EventType::Unknown; - Position m_position; - std::string m_properties; -}; - -namespace Interface -{ - -// Dtc interface class with signals for Qt6 migration STUB -class Dtc : public QObject -{ - Q_OBJECT -public: - explicit Dtc(QObject* parent = nullptr) : QObject(parent) {} - ~Dtc() override = default; - - // Callback registration instead of enableNotification() - void notifications(std::function callback) - { - m_notificationCallback = callback; - } - - // Trigger notification changed (for STUB testing) - void triggerNotificationChanged(const Notification& notification, DataModification modType) - { - emit notificationChanged(notification, modType); - if (m_notificationCallback) - { - m_notificationCallback(notification); - } - } - -signals: - void notificationChanged(const Notification& notification, DataModification modType); - -private: - std::function m_notificationCallback; -}; - -class Ftc; -} // namespace Interface -} // namespace AlarmManagement diff --git a/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_translation.h b/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_translation.h deleted file mode 100644 index 8cc17b835..000000000 --- a/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_translation.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -// Translation Helper für AlarmManagement Module -// Wrapper für QObject::tr() in nicht-QObject Klassen - -#include -#include "svcalmcommon_export.h" - -namespace AlarmManagement -{ - -SVCALMCOMMON_EXPORT QString tr(const char *sourceText, const char *comment = nullptr, int n = -1); - -} // namespace AlarmManagement \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_types.h b/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_types.h deleted file mode 100644 index 27b090ab5..000000000 --- a/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_types.h +++ /dev/null @@ -1,49 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Typ-Definitionen - -#include -#include "almcommon_export.h" - -namespace AlarmManagement -{ - -// STUB: AlarmConfig - wird durch echten DDS-Typ ersetzt -class ALMCOMMON_EXPORT AlarmConfig -{ -public: - AlarmConfig() = default; - - int eventTypeId() const { return m_eventTypeId; } - void setEventTypeId(int id) { m_eventTypeId = id; } - - bool messageWindow() const { return m_messageWindow; } - void setMessageWindow(bool value) { m_messageWindow = value; } - - bool setMarker() const { return m_setMarker; } - void setSetMarker(bool value) { m_setMarker = value; } - - int participantId() const { return m_participantId; } - void setParticipantId(int id) { m_participantId = id; } - - int id() const { return m_id; } - void setId(int id) { m_id = id; } - - bool global() const { return m_global; } - void setGlobal(bool value) { m_global = value; } - - int vulnerabilityState() const { return m_vulnerabilityState; } - void setVulnerabilityState(int value) { m_vulnerabilityState = value; } - -private: - int m_eventTypeId = 0; - bool m_messageWindow = false; - bool m_setMarker = false; - int m_participantId = 0; - int m_id = 0; - bool m_global = false; - int m_vulnerabilityState = -1; -}; - -} // namespace AlarmManagement \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/AreaEffectSimulation/aes_dtc.h b/qt6-after/qt6-migrated-legatus/include/AreaEffectSimulation/aes_dtc.h deleted file mode 100644 index 53d8cdb02..000000000 --- a/qt6-after/qt6-migrated-legatus/include/AreaEffectSimulation/aes_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace AreaEffectSimulation -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace AreaEffectSimulation diff --git a/qt6-after/qt6-migrated-legatus/include/AssetManagement/asm_dtc.h b/qt6-after/qt6-migrated-legatus/include/AssetManagement/asm_dtc.h deleted file mode 100644 index 085fecaf1..000000000 --- a/qt6-after/qt6-migrated-legatus/include/AssetManagement/asm_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace AssetManagement -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace AssetManagement diff --git a/qt6-after/qt6-migrated-legatus/include/AudioVideoManagement/ava_types.h b/qt6-after/qt6-migrated-legatus/include/AudioVideoManagement/ava_types.h deleted file mode 100644 index 9829ba79b..000000000 --- a/qt6-after/qt6-migrated-legatus/include/AudioVideoManagement/ava_types.h +++ /dev/null @@ -1,322 +0,0 @@ -/** - * STUB-HEADER: Diese Datei wird normalerweise von AudioVideoManagement generiert - * Für die Migration ohne RTI erstellen wir minimale Typ-Definitionen - */ - -#pragma once - -#include -#include "svcavmcommon_export.h" -#include -#include -#include -#include -#include -#include - -namespace AudioVideoManagement -{ - -class StreamNameMapping; - -enum class AvaVisibility -{ - Visible = 1, - Hidden = 0 -}; - -enum class AvaStreamState -{ - Stop = 0, - Start = 1, - Pause = 2, - NotPossible = 3 -}; - -enum class AvaStreamType -{ - Audio = 1, - Video = 2 -}; - -enum class AvaStreamSource -{ - Interface = 1, //!< live streams - Server = 2, //!< stored streams for playback - Local = 4 -}; - -enum class AvaScriptSource -{ - ServerAudio = 1, - ServerVideo = 2, - LocalAudio = 3, - LocalVideo = 4 -}; - -enum class AvaElokaMode -{ - EndlessLoop = 0, - Once = 1 -}; - -enum class AvaQueryElokaMode -{ - Stop = 0, //!< stop previously requested asynchronous notifications - Poll = 1, //!< poll active ELOKA measures once - Push = 2 //!< request asynchronous notifications from AVS -}; - -enum class AvaSumChannel -{ - Right = 1, - Left = 2 -}; - -enum class AvaRtButtonState -{ - NotAvailable = 0, - None = 1, - Left = 2, - Right = 3, - Both = 4 -}; - -class AVM_COMMON_EXPORT AvaSpeed -{ -public: - explicit AvaSpeed(int speed = 0) : m_speed(speed) {} - - operator int() const { return m_speed; } - - static const QVector &allowedValues() - { - static const QVector values = {0, 25, 50, 75, 100, 125, 150, 175, 200}; - return values; - } - -private: - int m_speed; -}; - - -class AVM_COMMON_EXPORT AvaVolume -{ -public: - explicit AvaVolume(int db = 0) : m_db(db) {} - - operator int() const { return m_db; } - - static AvaVolume min() { return AvaVolume(-50); } - static AvaVolume max() { return AvaVolume(20); } - -private: - int m_db; -}; - - -class AVM_COMMON_EXPORT AvaAudioPrio -{ -public: - explicit AvaAudioPrio(int prio = 0) : m_prio(prio) {} - - operator int() const { return m_prio; } - - static AvaAudioPrio min() { return AvaAudioPrio(0); } - static AvaAudioPrio max() { return AvaAudioPrio(255); } - -private: - int m_prio; -}; - - -/** - * Position (index) of a radio circuit in the AVS_Workstation GUI. - * The index must be in [1, 8]. - */ -class AVM_COMMON_EXPORT AvaRtPos -{ -public: - explicit AvaRtPos(int pos = 1) : m_pos(pos) {} - - operator int() const { return m_pos; } - - static constexpr int min() { return 1; } - static constexpr int max() { return 8; } - static constexpr int count() { return max() - min() + 1; } - -private: - int m_pos; -}; - - -enum class AvaGuiStyle -{ - Light = 0, - Dark -}; - -using AvaDuration = std::chrono::duration; -using AvaTimePoint = std::chrono::time_point; - -/** - * Information about a stream in response to getStreamList. - */ -struct AVM_COMMON_EXPORT AvaStream -{ - /** - * @param nameWithSourceSpec is the AVS-internal stream name plus a source specifier that must match - * the given AvaStreamSource, "(S)" for Server, "(L)" for Local, nothing for Interface. - */ - static AvaStream create(AvaStreamType, AvaStreamSource, const QString &nameWithSourceSpec, StreamNameMapping *streamNameMapping) - { - Q_UNUSED(nameWithSourceSpec) - Q_UNUSED(streamNameMapping) - return AvaStream{}; - } - - /** - * Returns the AVS-internal stream name plus a source specifier at the end - * as described in create(). - */ - QString toString() const { return internalName; } - /** Same as toString() but for a vector of streams. */ - static QStringList toStringList(const QVector &streams) - { - QStringList result; - for (const auto &s : streams) { - result.append(s.toString()); - } - return result; - } - - bool operator==(const AvaStream &other) const - { - return type == other.type && source == other.source && - internalName == other.internalName && displayName == other.displayName; - } - bool operator!=(const AvaStream &other) const { return !(*this == other); } - - AvaStreamType type = AvaStreamType::Audio; - AvaStreamSource source = AvaStreamSource::Interface; - QString internalName; //!< AVS-internal stream name without source specifier - QString displayName; //!< name to be displayed in the GUI without source specifier -}; - -/** - * Information about a stream as contained in StreamInfo in response to chooseStream. - */ -struct AVM_COMMON_EXPORT AvaStreamInfo -{ - AvaTimePoint start; - AvaTimePoint end; - AvaDuration duration; -}; - - -using AvaTimelinePart = QPair; - -class AVM_COMMON_EXPORT AvaTimeline -{ -public: - AvaTimeline() = default; - explicit AvaTimeline(const QVector &parts) : m_parts(parts) {} - - bool isEmpty() const { return m_parts.isEmpty(); } - - const AvaTimePoint &startTime() const - { - static AvaTimePoint dummy; - return m_parts.isEmpty() ? dummy : m_parts.first().first; - } - const AvaTimePoint &endTime() const - { - static AvaTimePoint dummy; - return m_parts.isEmpty() ? dummy : m_parts.last().second; - } - - void clear() { m_parts.clear(); } - void append(const AvaTimelinePart &part) { m_parts.append(part); } - void merge(const AvaTimeline &other) - { - m_parts.append(other.m_parts); - } - - const QVector &parts() const { return m_parts; } - - bool operator==(const AvaTimeline &other) const { return m_parts == other.m_parts; } - bool operator!=(const AvaTimeline &other) const { return m_parts != other.m_parts; } - -private: - void checkConsistency() const {} - - QVector m_parts; -}; - - -/** - * Information about an eloka in response to queryEloka. - */ -struct AVM_COMMON_EXPORT AvaEloka -{ - QString signal; - QString stream; - qint32 priority = 0; - AvaTimePoint time; - - bool operator==(const AvaEloka &other) const - { - return signal == other.signal && stream == other.stream && - priority == other.priority && time == other.time; - } - bool operator!=(const AvaEloka &other) const { return !(*this == other); } -}; - -/** - * Information about a script entry. - */ -struct AVM_COMMON_EXPORT AvaScriptEntry -{ - bool operator==(const AvaScriptEntry &other) const - { - return name == other.name && speed == other.speed && - start == other.start && stop == other.stop && - db == other.db && mute == other.mute && pint == other.pint; - } - bool operator!=(const AvaScriptEntry &other) const { return !(*this == other); } - - QString name; - AvaSpeed speed{100}; - AvaTimePoint start; - AvaTimePoint stop; - AvaVolume db{0}; - bool mute = false; - bool pint = false; -}; - -/** - * Represents the JSON data for a AV script topic in a C++ way. - */ -struct AVM_COMMON_EXPORT AvaTopicData -{ -public: - explicit AvaTopicData(const QJsonObject &data) : m_isAudio(false), isValid(true) - { - Q_UNUSED(data) - } - - bool isAudio() const { return m_isAudio; } - const QString &scriptName() const { return m_scriptName; } - const QVector &streamList() const { return m_streamList; } - - bool isValid = true; - -private: - bool m_isAudio = false; - QString m_scriptName; - QVector m_streamList; -}; - -} // namespace AudioVideoManagement - -Q_DECLARE_METATYPE(AudioVideoManagement::AvaStream) \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/AudioVideoManagement/avm_dtc.h b/qt6-after/qt6-migrated-legatus/include/AudioVideoManagement/avm_dtc.h deleted file mode 100644 index 6ebbe52b0..000000000 --- a/qt6-after/qt6-migrated-legatus/include/AudioVideoManagement/avm_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace AudioVideoManagement -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace AudioVideoManagement diff --git a/qt6-after/qt6-migrated-legatus/include/AudioVideoManagement/avm_export.h b/qt6-after/qt6-migrated-legatus/include/AudioVideoManagement/avm_export.h deleted file mode 100644 index 0054fbea3..000000000 --- a/qt6-after/qt6-migrated-legatus/include/AudioVideoManagement/avm_export.h +++ /dev/null @@ -1,13 +0,0 @@ -/** - * Stub export header for non-RTI builds - * When BUILD_RTI=OFF, svcAvmCommon library is not built - * This stub allows dependent code to compile - */ -#pragma once - -#include - -// Stub export macros for non-RTI builds -#define AVM_COMMON_EXPORT -#define AVM_CLIENT_EXPORT -#define AVM_SERVER_EXPORT \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/AudioVideoManagement/avm_translation.h b/qt6-after/qt6-migrated-legatus/include/AudioVideoManagement/avm_translation.h deleted file mode 100644 index 942a90f02..000000000 --- a/qt6-after/qt6-migrated-legatus/include/AudioVideoManagement/avm_translation.h +++ /dev/null @@ -1,77 +0,0 @@ -/** - * @file avm_translation.h - * @brief Translation functions for AudioVideoManagement enums - * - * This file provides toString() functions for AVM enums used in CNR frequency planning. - */ - -#ifndef AVM_TRANSLATION_H -#define AVM_TRANSLATION_H - -#include -#include "avm_enums.hpp" - -namespace AudioVideoManagement { - -// RcOperatingMode toString - using actual enum values from stub -inline QString toString(RcOperatingMode mode) -{ - switch (mode.underlying()) { - case RcOperatingMode::FixedFreqEncNone: return QStringLiteral("FixedFreqEncNone"); - case RcOperatingMode::FixedFreqEncHwKr: return QStringLiteral("FixedFreqEncHwKr"); - case RcOperatingMode::FixedFreqEncHwKrKl: return QStringLiteral("FixedFreqEncHwKrKl"); - case RcOperatingMode::AkwEncNone: return QStringLiteral("AkwEncNone"); - case RcOperatingMode::AkwEncEccm: return QStringLiteral("AkwEncEccm"); - case RcOperatingMode::SIMPLEX: return QStringLiteral("SIMPLEX"); - case RcOperatingMode::HALFDUPLEX: return QStringLiteral("HALFDUPLEX"); - case RcOperatingMode::DUPLEX: return QStringLiteral("DUPLEX"); - default: return QStringLiteral("Unknown"); - } -} - -// FrequencyBand toString -inline QString toString(FrequencyBand band) -{ - switch (band.underlying()) { - case FrequencyBand::Undefined: return QStringLiteral("Undefined"); - case FrequencyBand::HF: return QStringLiteral("HF"); - case FrequencyBand::VHF: return QStringLiteral("VHF"); - case FrequencyBand::UHF: return QStringLiteral("UHF"); - case FrequencyBand::REL: return QStringLiteral("REL"); - default: return QStringLiteral("Unknown"); - } -} - -// ModulationType toString -inline QString toString(ModulationType mod) -{ - switch (mod.underlying()) { - case ModulationType::AM: return QStringLiteral("AM"); - case ModulationType::FM: return QStringLiteral("FM"); - default: return QStringLiteral("Unknown"); - } -} - -// ChannelSpacingHF toString -inline QString toString(ChannelSpacingHF spacing) -{ - switch (spacing.underlying()) { - case ChannelSpacingHF::CS_100_Hz: return QStringLiteral("CS_100_Hz"); - default: return QStringLiteral("Unknown"); - } -} - -// ChannelSpacing toString -inline QString toString(ChannelSpacing spacing) -{ - switch (spacing.underlying()) { - case ChannelSpacing::CS_25_00_kHz: return QStringLiteral("CS_25_00_kHz"); - case ChannelSpacing::CS_12_50_kHz: return QStringLiteral("CS_12_50_kHz"); - case ChannelSpacing::CS_8_33_kHz: return QStringLiteral("CS_8_33_kHz"); - default: return QStringLiteral("Unknown"); - } -} - -} // namespace AudioVideoManagement - -#endif // AVM_TRANSLATION_H \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/AudioVideoManagement/svcavmcommon_export.h b/qt6-after/qt6-migrated-legatus/include/AudioVideoManagement/svcavmcommon_export.h deleted file mode 100644 index 0602f3ee7..000000000 --- a/qt6-after/qt6-migrated-legatus/include/AudioVideoManagement/svcavmcommon_export.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef SVCAVMCOMMON_EXPORT_H -#define SVCAVMCOMMON_EXPORT_H - -// Stub export header for non-RTI builds -// When BUILD_RTI=OFF, svcAvmCommon library is not built -// This stub allows dependent code to compile - -// Map to the actual macro names used in avm_export.h -#define AVM_COMMON_EXPORT -#define AVM_CLIENT_EXPORT -#define AVM_SERVER_EXPORT - -#endif /* SVCAVMCOMMON_EXPORT_H */ diff --git a/qt6-after/qt6-migrated-legatus/include/Buildings/bld_dtc.h b/qt6-after/qt6-migrated-legatus/include/Buildings/bld_dtc.h deleted file mode 100644 index 1a97ff37a..000000000 --- a/qt6-after/qt6-migrated-legatus/include/Buildings/bld_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace Buildings -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace Buildings diff --git a/qt6-after/qt6-migrated-legatus/include/Buildings/bld_enums.hpp.stub b/qt6-after/qt6-migrated-legatus/include/Buildings/bld_enums.hpp.stub deleted file mode 100644 index b43d8f43d..000000000 --- a/qt6-after/qt6-migrated-legatus/include/Buildings/bld_enums.hpp.stub +++ /dev/null @@ -1,30 +0,0 @@ -// Stub file for bld_enums.hpp - used when BUILD_RTI=OFF -#ifndef BLD_ENUMS_HPP -#define BLD_ENUMS_HPP - -#include - -namespace Buildings { - -enum class BuildingType : std::int32_t { - Residential = 0, - Commercial = 1, - Industrial = 2 -}; - -enum class BuildingStatus : std::int32_t { - Active = 0, - Inactive = 1, - UnderConstruction = 2 -}; - -struct BuildingInfo { - int id = 0; - double x = 0.0; - double y = 0.0; - double z = 0.0; -}; - -} // namespace Buildings - -#endif // BLD_ENUMS_HPP \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/CentralEffectSimulation/ces_dtc.h b/qt6-after/qt6-migrated-legatus/include/CentralEffectSimulation/ces_dtc.h deleted file mode 100644 index afdb06c40..000000000 --- a/qt6-after/qt6-migrated-legatus/include/CentralEffectSimulation/ces_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace CentralEffectSimulation -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace CentralEffectSimulation diff --git a/qt6-after/qt6-migrated-legatus/include/CodificationManagement/cod_dtc.h b/qt6-after/qt6-migrated-legatus/include/CodificationManagement/cod_dtc.h deleted file mode 100644 index 0aad572f6..000000000 --- a/qt6-after/qt6-migrated-legatus/include/CodificationManagement/cod_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace CodificationManagement -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace CodificationManagement diff --git a/qt6-after/qt6-migrated-legatus/include/ComponentMonitor/cmo_dtc.h b/qt6-after/qt6-migrated-legatus/include/ComponentMonitor/cmo_dtc.h deleted file mode 100644 index 451073155..000000000 --- a/qt6-after/qt6-migrated-legatus/include/ComponentMonitor/cmo_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace ComponentMonitor -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace ComponentMonitor diff --git a/qt6-after/qt6-migrated-legatus/include/Core/core.hpp b/qt6-after/qt6-migrated-legatus/include/Core/core.hpp deleted file mode 100644 index 6aace4c35..000000000 --- a/qt6-after/qt6-migrated-legatus/include/Core/core.hpp +++ /dev/null @@ -1,107 +0,0 @@ -/** - * @file core.hpp - * @brief Core DDS Sammel-Header - * - * Beinhaltet alle Core-Typen für DDS-Integration. - * - * STUB: Diese Datei wird normalerweise von DDS generiert. - * Für die Qt6-Migration erstellen wir einen minimalen Stub. - */ - -#pragma once - -#include -#include -#include -#include - -namespace Core -{ -/** - * @brief GeoPosition - Stub für DDS GeoPosition - * - * Einfache Struktur für geographische Positionen. - */ -struct GeoPosition -{ - double longitude = 0.0; - double latitude = 0.0; - double altitude = 0.0; - - GeoPosition() = default; - - GeoPosition(double lon, double lat, double z) - : longitude(lon) - , latitude(lat) - , altitude(z) - { - } - - double lon() const { return longitude; } - double lat() const { return latitude; } - double z() const { return altitude; } - - void lon(double lon) { longitude = lon; } - void lat(double lat) { latitude = lat; } - void z(double z) { altitude = z; } - - void setLon(double lon) { longitude = lon; } - void setLat(double lat) { latitude = lat; } - void setZ(double z) { altitude = z; } -}; - -/** - * @brief GeoPosition2D - 2D GeoPosition (ohne Altitude) - * - * Wird für Koordinaten ohne Höheninformation verwendet. - * Implizite Konversion von GeoPosition ermöglicht Downcast. - */ -struct GeoPosition2D -{ - double longitude = 0.0; - double latitude = 0.0; - - GeoPosition2D() = default; - - GeoPosition2D(double lon, double lat) - : longitude(lon) - , latitude(lat) - { - } - - // Implizite Konversion von GeoPosition (Downcast ignoriert altitude) - GeoPosition2D(const GeoPosition& pos) - : longitude(pos.lon()) - , latitude(pos.lat()) - { - } - - double lon() const { return longitude; } - double lat() const { return latitude; } - - void lon(double lon) { longitude = lon; } - void lat(double lat) { latitude = lat; } - - void setLon(double lon) { longitude = lon; } - void setLat(double lat) { latitude = lat; } -}; - -/** - * @brief ostream operator für GeoPosition (Debug/Logging) - */ -inline std::ostream& operator<<(std::ostream& os, const GeoPosition& pos) -{ - os << "GeoPosition(lon=" << pos.lon() << ", lat=" << pos.lat() << ", alt=" << pos.z() << ")"; - return os; -} - -/** - * @brief ostream operator für GeoPosition2D (Debug/Logging) - */ -inline std::ostream& operator<<(std::ostream& os, const GeoPosition2D& pos) -{ - os << "GeoPosition2D(lon=" << pos.lon() << ", lat=" << pos.lat() << ")"; - return os; -} - -} // namespace Core \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/Core/core_dtc.h b/qt6-after/qt6-migrated-legatus/include/Core/core_dtc.h deleted file mode 100644 index 47120f2bd..000000000 --- a/qt6-after/qt6-migrated-legatus/include/Core/core_dtc.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace DDS -{ -namespace Core -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace Core -} // namespace DDS diff --git a/qt6-after/qt6-migrated-legatus/include/Core/core_types.h b/qt6-after/qt6-migrated-legatus/include/Core/core_types.h deleted file mode 100644 index db5b76f4e..000000000 --- a/qt6-after/qt6-migrated-legatus/include/Core/core_types.h +++ /dev/null @@ -1,144 +0,0 @@ -/** - * @file core_types.h - * @brief Core DDS-Typen Stubs - * - * Minimalistische Definitionen für DDS-generierte Core-Typen. - */ - -#pragma once - -#include -#include -#include - -namespace Core -{ - -/** - * @brief FunctionReplyObject - DDS-Stub für Function Reply Handling - * - * Simuliert QString::arg() Verhalten und sammelt Argumente. - */ -class FunctionReplyObject -{ -public: - explicit FunctionReplyObject(int id = -1, const char *str = nullptr) - : m_str(str ? str : std::string()) - , m_id(id) - {} - - explicit FunctionReplyObject(const char *str) - : m_str(str ? str : std::string()) - {} - - explicit FunctionReplyObject(int id, const std::string &errStr, const std::vector &errArgs) - : m_str(errStr) - , m_args(errArgs) - , m_id(id) - {} - - explicit FunctionReplyObject(int id, std::string &&errStr, std::vector &&errArgs) - : m_str(std::move(errStr)) - , m_args(std::move(errArgs)) - , m_id(id) - {} - - explicit FunctionReplyObject(int id, const std::string &errStr, const std::vector &errArgs, const std::string &additionalInfo) - : m_str(errStr) - , m_additionalInfo(additionalInfo) - , m_args(errArgs) - , m_id(id) - {} - - explicit FunctionReplyObject(int id, std::string &&errStr, std::vector &&errArgs, std::string &&additionalInfo) - : m_str(std::move(errStr)) - , m_additionalInfo(std::move(additionalInfo)) - , m_args(std::move(errArgs)) - , m_id(id) - {} - - ~FunctionReplyObject() = default; - - // simulate QString::arg() behaviour - FunctionReplyObject &arg(qint64 val) { (void)val; return *this; } - FunctionReplyObject &arg(const std::string &str) { m_args.push_back(str); return *this; } - FunctionReplyObject &arg(const QString &str) { m_args.push_back(str.toStdString()); return *this; } - - /** - * @brief true if the object contains an error description - */ - bool error() const { return !m_str.empty(); } - void setId(int id) { m_id = id; } - FunctionReplyObject &setStr(const char *str) { m_str = str; return *this; } - FunctionReplyObject &setAdditionalInfo(const char *additionalInfo) { m_additionalInfo = additionalInfo; return *this; } - - int id() const { return m_id; } - std::string str() const { return m_str; } - std::string additionalInfo() const { return m_additionalInfo; } - - std::vector args() const { return m_args; } - - /** - * @brief convert the error string and arguments to an untranslated std::string - */ - std::string operator()() const { return m_str; } - - /** - * @brief convert and translate the error string and arguments to a translated QString - */ - QString translated() const { return QString::fromStdString(m_str); } - - int64_t uniqueId() const { return m_uniqueId; } - void setUniqueId(int64_t uniqueId) { m_uniqueId = uniqueId; } - -private: - std::string m_str; - std::string m_additionalInfo; - std::vector m_args; - int64_t m_uniqueId = 0; - int m_id = -1; -}; - -/** - * @brief FunctionReply - Stub für DDS Function Reply bei BUILD_RTI=OFF - * - * Minimaler Stub der API-Kompatibilität für request_helper.h bietet. - */ -class FunctionReply -{ -public: - FunctionReply() = default; - - // Konstruktor für Kompatibilität mit FunctionReplyObject - FunctionReply(int id, const std::string& str, const std::vector& args = {}, const std::string& additionalInfo = {}) - : m_str(str) - , m_args(args) - , m_additionalInfo(additionalInfo) - , m_id(id) - {} - - ~FunctionReply() = default; - - int id() const { return m_id; } - void setId(int id) { m_id = id; } - - std::string str() const { return m_str; } - void setStr(const std::string& str) { m_str = str; } - - bool error() const { return !m_str.empty(); } - - int64_t uniqueId() const { return m_uniqueId; } - void setUniqueId(int64_t uniqueId) { m_uniqueId = uniqueId; } - - std::vector args() const { return m_args; } - std::string additionalInfo() const { return m_additionalInfo; } - -private: - std::string m_str; - std::vector m_args; - std::string m_additionalInfo; - int m_id = -1; - int64_t m_uniqueId = 0; -}; - -} // namespace Core \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/DDS/DTC/generic_dtc.h b/qt6-after/qt6-migrated-legatus/include/DDS/DTC/generic_dtc.h deleted file mode 100644 index 32587ab92..000000000 --- a/qt6-after/qt6-migrated-legatus/include/DDS/DTC/generic_dtc.h +++ /dev/null @@ -1,61 +0,0 @@ - - -#pragma once -#include -#include - -namespace NGLLogger -{ -class INGLLogger; -} - -namespace DTC -{ -class SubscriberListener; - -template class GenericDtcSC -{ - public: - using DataReaderObject = DRO_OBJECT; - using SubscriberCallback = SC; - using TopicType = typename DRO_OBJECT::TopicType; - - GenericDtcSC() = default; - virtual ~GenericDtcSC() = default; - - virtual bool setSubscriberCallback(const SubscriberCallback& subscriberCallback) = 0; - virtual dds::sub::LoanedSamples readAlive() const = 0; - virtual dds::sub::LoanedSamples takeAlive() const = 0; - virtual dds::sub::LoanedSamples takeDisposed() const = 0; - virtual bool hasSamples() const = 0; - virtual DataReaderObject* dataReader() const = 0; - virtual bool waitForHistoricalData(int timeoutMSec) = 0; -}; - -template -class GenericDtc - : public GenericDtcSC> -{ -}; - -template -class GenericDtcSampleInfo - : public GenericDtcSC> -{ -}; - -template -class Ddtc - : public GenericDtcSC< - DRO_OBJECT, std::function> -{ -}; - -template -class DdtcSampleInfo - : public GenericDtcSC> -{ -}; -} // namespace DTC diff --git a/qt6-after/qt6-migrated-legatus/include/DDS/DTC/generic_dtc_impl.h b/qt6-after/qt6-migrated-legatus/include/DDS/DTC/generic_dtc_impl.h deleted file mode 100755 index f9e81dd67..000000000 --- a/qt6-after/qt6-migrated-legatus/include/DDS/DTC/generic_dtc_impl.h +++ /dev/null @@ -1,319 +0,0 @@ -/** - * @RDE_HEADER@ - * DataTopicClient (DTC) - Generic - * $Id$ - * $HeadURL$ - * $Author$ - */ - -#pragma once - -#include -#include -#include -#include - -#include -#include - -#include "generic_dtc.h" - - -namespace DDSGeneric -{ -class DynamicDataReader; -} -namespace DTC -{ - -template -class GenericDtcImplSubscriberTemplate : public DDSGeneric::SubscriberListenerCallback, public SuperClass -{ -public: - using DataReaderObject = typename SuperClass::DataReaderObject; - using SubscriberCallback = typename SuperClass::SubscriberCallback; - using TopicTypeRead = typename DataReaderObject::TopicType; - using TopicTypeSubscribe = typename DataReaderObject::TopicType; - using DataReader = typename DataReaderObject::DataReader; - - GenericDtcImplSubscriberTemplate(const dds::domain::DomainParticipant &domainParticipant, - const dds::sub::Subscriber &ddsSubscriber, - DDSGeneric::SubscriberListener *subscriberListener, - const std::string &topicName = DDS::Helper::getShortTopicName(DDS::topic_type_name::value())) - : m_subscriberListener(subscriberListener) - , m_dataReaderObject(new DataReaderObject) - , m_subscriberCallback(nullptr) - , m_writerState(0) - , m_logger(DDS::getLogger(DDS::topic_type_name::value(), DDS::DataType::DATA_TOPIC_CLIENT)) - { - createInternal(m_dataReaderObject->create(domainParticipant, ddsSubscriber, topicName)); - } - - GenericDtcImplSubscriberTemplate(const dds::domain::DomainParticipant &domainParticipant, - const dds::sub::Subscriber &ddsSubscriber, - DDSGeneric::SubscriberListener *subscriberListener, - const dds::topic::Filter &filter, - const std::string &topicName) - : m_subscriberListener(subscriberListener) - , m_dataReaderObject(new DataReaderObject) - , m_subscriberCallback(nullptr) - , m_writerState(0) - , m_logger(DDS::getLogger(DDS::topic_type_name::value(), DDS::DataType::DATA_TOPIC_CLIENT)) - { - createInternal(m_dataReaderObject->create(domainParticipant, ddsSubscriber, topicName, filter)); - } - - GenericDtcImplSubscriberTemplate(const dds::domain::DomainParticipant &domainParticipant, - const dds::sub::Subscriber &ddsSubscriber, - DDSGeneric::SubscriberListener *subscriberListener, - const dds::core::xtypes::StructType &structType, - const std::string &topicName) - : m_subscriberListener(subscriberListener) - , m_dataReaderObject(new DataReaderObject) - , m_subscriberCallback(nullptr) - , m_logger(DDS::getLogger(DDS::topic_type_name::value(), DDS::DataType::DATA_TOPIC_CLIENT)) - { - createInternal(m_dataReaderObject->create(domainParticipant, ddsSubscriber, topicName, structType)); - } - - ~GenericDtcImplSubscriberTemplate() - { - if (m_dataReaderObject && m_subscriberCallback) - m_subscriberListener->removeCallback(m_dataReaderObject->getDataReader(), this); - delete m_dataReaderObject; - } - - bool setSubscriberCallback(const SubscriberCallback &subscriberCallback) override final - { - if (m_subscriberCallback) - { - WARNING_LOG(m_logger) << "Can not set subscriber callback - already set ..."; - return false; - } - if (!m_subscriberListener) - { - WARNING_LOG(m_logger) << "Can not set subscriber callback - no subscriber listener ..."; - return false; - } - - m_subscriberCallback = subscriberCallback; - - if (!m_dataReaderObject) - { - WARNING_LOG(m_logger) << "Can not set subscriber callback - no data reader object ..."; - return false; - } - - m_dataReaderObject->setHaveSubscriberCallback(m_subscriberCallback != nullptr); - - return true; - } - - dds::sub::LoanedSamples readAlive() const override final - { - if (!m_dataReaderObject) - return dds::sub::LoanedSamples(); - - bool bSeenUnreadSamples = false; - auto ret = m_dataReaderObject->readAlive(bSeenUnreadSamples); - if (bSeenUnreadSamples) - QTimer::singleShot(0, this, &GenericDtcImplSubscriberTemplate::unreadSamplesDuringRead); - - return ret; - } - - dds::sub::LoanedSamples takeAlive() const override final - { - if (!m_dataReaderObject) - return dds::sub::LoanedSamples(); - - bool bSeenUnreadSamples = false; - auto ret = m_dataReaderObject->takeAlive(bSeenUnreadSamples); - if (bSeenUnreadSamples) - QTimer::singleShot(0, this, &GenericDtcImplSubscriberTemplate::unreadSamplesDuringRead); - - return ret; - } - - dds::sub::LoanedSamples takeDisposed() const override final - { - if (!m_dataReaderObject) - return dds::sub::LoanedSamples(); - - return m_dataReaderObject->takeDisposed(); - } - - bool hasSamples() const override final - { - if (!m_dataReaderObject) - return false; - - return m_dataReaderObject->hasSamples(); - } - - DataReaderObject *dataReader() const override final - { - return m_dataReaderObject; - } - - bool waitForHistoricalData(int timeoutMSec) override - { - if (m_dataReaderObject == nullptr || - m_dataReaderObject->getDataReader() == nullptr) - return false; - - const bool bWaitForever = (timeoutMSec < 0); - auto dr = m_dataReaderObject->getDataReader(); - try - { - if (dr.subscription_matched_status().current_count() == 0) - { - dds::core::cond::WaitSet ws; - dds::core::cond::StatusCondition cond(dr); - cond.enabled_statuses(dds::core::status::StatusMask::subscription_matched()); - ws.attach_condition(cond); - const dds::core::Duration waitTimeout(bWaitForever ? dds::core::Duration::infinite() : dds::core::Duration::from_millisecs(timeoutMSec)); - const dds::core::cond::WaitSet::ConditionSeq seq(ws.wait(waitTimeout)); - // empty sequence -> timeout - if (seq.empty()) - return false; - } - dr.wait_for_historical_data(dds::core::Duration(1)); - } - catch (const dds::core::Exception &) - { - // timeout - return false; - } - return true; - } - -protected: - void unreadSamplesDuringRead() - { - droDataAvailable(DDS::topic_type_name::value(), m_dataReaderObject->topicName()); - } - - void droDataAvailable(const std::string &topicType, const std::string &topicName) override final - { - Q_UNUSED(topicType); - if (m_writerState.testAndSetRelaxed(1, 0)) - { - DEBUG_LOG(m_logger) << "Recreate Reader for topic " << topicName - << ", type name " << DDS::topic_type_name::value(); - if (m_subscriberListener) - m_subscriberListener->removeCallback(m_dataReaderObject->getDataReader(), this); - m_dataReaderObject->recreateReader(); - if (m_subscriberListener) - m_subscriberListener->addCallback(m_dataReaderObject->getDataReader(), this); - } - - DEBUG_LOG(m_logger) << "IN droDataAvailable(), topic name: " << topicName - << ", type name " << DDS::topic_type_name::value() - << ", this: " << this - << ", m_dataReaderObject: " << m_dataReaderObject - << ", hasSamples: " << (m_dataReaderObject ? m_dataReaderObject->hasSamples() : -1); - - if (m_subscriberListener) - m_subscriberListener->enableCallback(m_dataReaderObject->getDataReader(), this); - - if (!m_dataReaderObject || !m_subscriberCallback) - return; - - m_dataReaderObject->read(m_subscriberCallback); - } - - void noWriterAnymore(const std::string &topicType, const std::string &topicName) override - { - Q_UNUSED(topicType); - Q_UNUSED(topicName); - m_writerState = -1; - } - - void writerAvailable(const std::string &topicType, const std::string &topicName) override - { - Q_UNUSED(topicType); - Q_UNUSED(topicName); - m_writerState.testAndSetRelaxed(-1, 1); - } - - bool createInternal(bool droInitOk) - { - if (!droInitOk) - { - ERROR_LOG(m_logger) << "Error initializing DRO for type " << DDS::topic_type_name::value(); - delete m_dataReaderObject; - m_dataReaderObject = nullptr; - return false; - } - - if (m_subscriberListener) - { - DEBUG_LOG(m_logger) << "subscriberListener exists, adding type " - << DDS::topic_type_name::value(); - m_subscriberListener->addCallback(m_dataReaderObject->getDataReader(), this); - } - else - { - DEBUG_LOG(m_logger) << "Cannot add DTC to subscriberListener callback - type: " - << DDS::topic_type_name::value(); - } - m_dataReaderObject->setHaveSubscriberCallback(m_subscriberListener != nullptr); - return true; - } - -private: - DDSGeneric::SubscriberListener *m_subscriberListener; - - // DataReaderObjects (DROs) - DataReaderObject *m_dataReaderObject; - - // Callback for data processing - SubscriberCallback m_subscriberCallback; - - QAtomicInt m_writerState; - - NGL::INGLLogger &m_logger; -}; - -// Typed topic callback (DataReader) -template -class GenericDtcImpl final - : public GenericDtcImplSubscriberTemplate> -{ - using BaseClass = GenericDtcImplSubscriberTemplate>; -public: - using BaseClass::BaseClass; -}; - -// Typed topic callback (DataReader) with SampleInfo -template -class GenericDtcImplSampleInfo final - : public GenericDtcImplSubscriberTemplate> -{ - using BaseClass = GenericDtcImplSubscriberTemplate>; -public: - using BaseClass::BaseClass; -}; - -// Dynamic topic callback (DynamicDataReader) -template -class DdtcImpl final - : public GenericDtcImplSubscriberTemplate> -{ - using BaseClass = GenericDtcImplSubscriberTemplate>; -public: - using BaseClass::BaseClass; -}; - -// Dynamic topic callback (DynamicDataReader) with SampleInfo -template -class DdtcImplSampleInfo final - : public GenericDtcImplSubscriberTemplate> -{ - using BaseClass = GenericDtcImplSubscriberTemplate>; -public: - using BaseClass::BaseClass; -}; - -} // namespace DTC diff --git a/qt6-after/qt6-migrated-legatus/include/DDS/Generic/ddsconnector_export.h b/qt6-after/qt6-migrated-legatus/include/DDS/Generic/ddsconnector_export.h deleted file mode 100644 index e542f867e..000000000 --- a/qt6-after/qt6-migrated-legatus/include/DDS/Generic/ddsconnector_export.h +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once - -// Stub header for BUILD_RTI=OFF -// Original ddsconnector_export.h is generated by CMake when BUILD_RTI=ON - -// For BUILD_RTI=OFF, we don't need DLL export/import macros -// Define DDSCONNECTOR_EXPORT as empty -#ifndef DDSCONNECTOR_EXPORT -#define DDSCONNECTOR_EXPORT -#endif - -#ifndef DDSCONNECTOR_NO_EXPORT -#define DDSCONNECTOR_NO_EXPORT -#endif - -// Static library marker (not used for BUILD_RTI=OFF) -#ifndef DDSCONNECTOR_STATIC_DEFINE -#define DDSCONNECTOR_STATIC_DEFINE -#endif - -// Deprecated marker (optional, can be empty) -#ifndef DDSCONNECTOR_DEPRECATED -#define DDSCONNECTOR_DEPRECATED -#endif - -#ifndef DDSCONNECTOR_DEPRECATED_EXPORT -#define DDSCONNECTOR_DEPRECATED_EXPORT DDSCONNECTOR_DEPRECATED DDSCONNECTOR_EXPORT -#endif - -#ifndef DDSCONNECTOR_DEPRECATED_NO_EXPORT -#define DDSCONNECTOR_DEPRECATED_NO_EXPORT DDSCONNECTOR_DEPRECATED DDSCONNECTOR_NO_EXPORT -#endif \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/DDS/Generic/ddsgen_export.h b/qt6-after/qt6-migrated-legatus/include/DDS/Generic/ddsgen_export.h deleted file mode 100644 index 818f6bde7..000000000 --- a/qt6-after/qt6-migrated-legatus/include/DDS/Generic/ddsgen_export.h +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once - -// Stub header for BUILD_RTI=OFF -// Original ddsgen_export.h comes from RTI Connext DDS code generation - -// For BUILD_RTI=OFF, we don't need DLL export/import macros -// Define DDSGEN_EXPORT as empty -#ifndef DDSGEN_EXPORT -#define DDSGEN_EXPORT -#endif - -#ifndef DDSGEN_NO_EXPORT -#define DDSGEN_NO_EXPORT -#endif - -// Static library marker (not used for BUILD_RTI=OFF) -#ifndef DDSGEN_STATIC_DEFINE -#define DDSGEN_STATIC_DEFINE -#endif - -// Deprecated marker (optional, can be empty) -#ifndef DDSGEN_DEPRECATED -#define DDSGEN_DEPRECATED -#endif - -#ifndef DDSGEN_DEPRECATED_EXPORT -#define DDSGEN_DEPRECATED_EXPORT DDSGEN_DEPRECATED DDSGEN_EXPORT -#endif - -#ifndef DDSGEN_DEPRECATED_NO_EXPORT -#define DDSGEN_DEPRECATED_NO_EXPORT DDSGEN_DEPRECATED DDSGEN_NO_EXPORT -#endif \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/DDS/Generic/generic_base.h b/qt6-after/qt6-migrated-legatus/include/DDS/Generic/generic_base.h deleted file mode 100644 index 8819487c9..000000000 --- a/qt6-after/qt6-migrated-legatus/include/DDS/Generic/generic_base.h +++ /dev/null @@ -1,51 +0,0 @@ -#pragma once - -// Stub header for BUILD_RTI=OFF -// Original generic_base.h uses RTI Connext DDS types - -#include -#include -#include - -// Forward declarations for Qt types used in getMethod -class QObject; - -// Forward declaration for NGL logger -namespace NGL { -class INGLLogger; -} - -namespace DDS -{ - -// Template for topic type name - returns empty string for BUILD_RTI=OFF -template -struct topic_type_name { - static std::string value() { - return ""; - } -}; - -namespace Helper -{ -// Stub implementations for BUILD_RTI=OFF -DDSGEN_EXPORT inline std::string getFunctionTopicName(const std::string &fqName) { - return fqName; -} - -DDSGEN_EXPORT inline std::string getShortTopicName(const std::string &fqName) { - return fqName; -} - -// Stub for getMethod - returns default-constructed QMetaMethod -DDSGEN_EXPORT inline QMetaMethod getMethod(NGL::INGLLogger & /*logger*/, - QObject * /*objectToInform*/, - const char * /*slotToExecute*/, - const char * /*signalSignature*/, - bool /*bWarnOnEmptySlot*/ = true) { - // Stub implementation - returns default QMetaMethod - return QMetaMethod(); -} -} - -} // namespace DDS \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/DDS/Generic/generic_data_reader.h b/qt6-after/qt6-migrated-legatus/include/DDS/Generic/generic_data_reader.h deleted file mode 100644 index 7298059a8..000000000 --- a/qt6-after/qt6-migrated-legatus/include/DDS/Generic/generic_data_reader.h +++ /dev/null @@ -1,116 +0,0 @@ -#pragma once - -/** - * @file generic_data_reader.h - * @brief Generic Data Reader wrapper for DDS - * - * Provides GenericDataReader template class that wraps RTI DataReader - * when BUILD_RTI=ON, or provides stub implementation when BUILD_RTI=OFF. - */ - -#include - -namespace DDSGeneric -{ - -#ifdef BUILD_RTI -// RTI DDS is available - include full DynamicDataReader implementation -#include - -// Forward declaration stub for DataReader -// RTI 7.7 signature: template class DELEGATE = dds::sub::detail::DataReaderImpl> -template -class GenericDataReader { -public: - using DataType = T; - using ReaderType = dds::sub::DataReader; - - // Minimal interface - extend as needed - bool has_data() const { return false; } - T read_data() { return T{}; } - void cleanup() {} - - // Access to underlying RTI reader if needed - ReaderType& reader() { return m_reader; } - const ReaderType& reader() const { return m_reader; } - -private: - ReaderType m_reader; -}; - -template -class GenericDataReaderContentFilter { -public: - using DataType = T; - // Minimal stub - extend as needed -}; - -#else -// BUILD_RTI=OFF: Provide minimal stub definitions - -namespace dds { -namespace sub { -namespace detail { - -// Dummy delegate class to serve as default template parameter -template -class DataReaderImpl { - // Empty stub implementation -}; - -} // namespace detail - -// Forward declaration stub for DataReader -// Must match RTI 7.7 signature for compatibility -template class DELEGATE = detail::DataReaderImpl> -class DataReader { -public: - // Minimal stub interface - add methods as needed by the codebase - T read() { return T{}; } - void take() {} -}; - -} // namespace sub -} // namespace dds - -// GenericDataReader stub template -template -class GenericDataReader { -public: - using DataType = T; - - // Minimal stub methods - extend as needed - bool has_data() const { return false; } - T read_data() { return T{}; } - void cleanup() {} -}; - -template -class GenericDataReaderContentFilter { -public: - using DataType = T; - // Minimal stub - extend as needed -}; - -// DynamicDataReader stub for BUILD_RTI=OFF -class DynamicDataReader { -public: - using TopicType = void*; - using DataReader = void*; - using DataTopic = void*; - - DynamicDataReader() {} - ~DynamicDataReader() {} - - bool create(const void* domainParticipant, const void* ddsSubscriber, - const std::string& specialTopicName, const void* structType) - { - return false; - } - - bool hasSamples() const { return false; } -}; - -#endif // BUILD_RTI - -} // namespace DDSGeneric \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/DDS/Generic/generic_logger.h b/qt6-after/qt6-migrated-legatus/include/DDS/Generic/generic_logger.h deleted file mode 100644 index c51e009d3..000000000 --- a/qt6-after/qt6-migrated-legatus/include/DDS/Generic/generic_logger.h +++ /dev/null @@ -1,84 +0,0 @@ -#pragma once - -#ifdef BUILD_RTI -// Real implementation with RTI NGL logger -#include -#include -#include - -namespace DDS -{ - -enum class DataType -{ - DATA_TYPE_UNKNOWN = 0, - - DATA_WRITER = 1, - DATA_READER = 2, - - DYNAMIC_DATA_WRITER = 3, - DYNAMIC_DATA_READER = 4, - - DATA_TOPIC_SERVER = 8, - DATA_TOPIC_CLIENT = 9, - - FUNCTION_TOPIC_SERVER = 12, - FUNCTION_TOPIC_CLIENT = 13 -}; - -using LOGGER_T = NGL::INGLLogger&; - -DDSGEN_EXPORT LOGGER_T getLogger(const char *name, DataType dt); -inline LOGGER_T getLogger(const std::string &loggerName, DataType dt) -{ - return getLogger(loggerName.data(), dt); -} - -} // namespace DDS -#else -// Stub header for BUILD_RTI=OFF -#include -#include -#include - -namespace DDS -{ - -// DataType enum - same as original, no RTI dependency -enum class DataType -{ - DATA_TYPE_UNKNOWN = 0, - - DATA_WRITER = 1, - DATA_READER = 2, - - DYNAMIC_DATA_WRITER = 3, - DYNAMIC_DATA_READER = 4, - - DATA_TOPIC_SERVER = 8, - DATA_TOPIC_CLIENT = 9, - - FUNCTION_TOPIC_SERVER = 12, - FUNCTION_TOPIC_CLIENT = 13 -}; - -// Logger type alias -using LOGGER_T = NGL::INGLLogger&; - -// Stub implementation for getLogger -// Returns a dummy logger reference - in real usage, this would need proper initialization -DDSGEN_EXPORT inline LOGGER_T getLogger(const char *name, DataType dt) { - // Stub: return a static dummy logger - // In production code with BUILD_RTI=OFF, this should be replaced with actual logger - static NGL::INGLLogger* dummy_logger = nullptr; - return *dummy_logger; -} - -// Inline overload for std::string -inline LOGGER_T getLogger(const std::string &loggerName, DataType dt) -{ - return getLogger(loggerName.data(), dt); -} - -} // namespace DDS -#endif \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/EffectShowClient/esc_dtc.h b/qt6-after/qt6-migrated-legatus/include/EffectShowClient/esc_dtc.h deleted file mode 100644 index d91be8274..000000000 --- a/qt6-after/qt6-migrated-legatus/include/EffectShowClient/esc_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace EffectShowClient -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace EffectShowClient diff --git a/qt6-after/qt6-migrated-legatus/include/EffectShowManagement/esm_dtc.h b/qt6-after/qt6-migrated-legatus/include/EffectShowManagement/esm_dtc.h deleted file mode 100644 index d73623e87..000000000 --- a/qt6-after/qt6-migrated-legatus/include/EffectShowManagement/esm_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace EffectShowManagement -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace EffectShowManagement diff --git a/qt6-after/qt6-migrated-legatus/include/Evaluations/evl_db_impl.h b/qt6-after/qt6-migrated-legatus/include/Evaluations/evl_db_impl.h deleted file mode 100644 index 2d74e86d2..000000000 --- a/qt6-after/qt6-migrated-legatus/include/Evaluations/evl_db_impl.h +++ /dev/null @@ -1,31 +0,0 @@ -/** - * @RDE_HEADER@ - * Stub header for CODEGEN_DATABASE generated code (BUILD_RTI=OFF) - * This file is generated by CODEGEN_DATABASE macro when BUILD_RTI=ON - * For BUILD_RTI=OFF builds, this stub provides the minimal interface - */ -#pragma once - -#include - -namespace Evaluations -{ - -/** - * @brief Base class for database interface implementation - * - * This class is normally generated by CODEGEN_DATABASE macro. - * This stub provides minimal interface for BUILD_RTI=OFF builds. - */ -class DatabaseInterfaceImpl : public QObject -{ - Q_OBJECT -public: - explicit DatabaseInterfaceImpl(QObject *parent = nullptr) : QObject(parent) {} - virtual ~DatabaseInterfaceImpl() = default; - - // Virtual methods that can be overridden by custom implementations - virtual bool removeCategoryLinesPerNineLiner(qint64 nineLinerId) = 0; -}; - -} // namespace Evaluations \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/Evaluations/evl_dtc.h b/qt6-after/qt6-migrated-legatus/include/Evaluations/evl_dtc.h deleted file mode 100644 index 89207e684..000000000 --- a/qt6-after/qt6-migrated-legatus/include/Evaluations/evl_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace Evaluations -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace Evaluations diff --git a/qt6-after/qt6-migrated-legatus/include/ExerciseEventManagement/eem.hpp b/qt6-after/qt6-migrated-legatus/include/ExerciseEventManagement/eem.hpp deleted file mode 100644 index 078ecb677..000000000 --- a/qt6-after/qt6-migrated-legatus/include/ExerciseEventManagement/eem.hpp +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once - -// Convenience header for ExerciseEventManagement -// Includes all common types and enums - -#include -#include -#include - -// Additional forward declarations and common types can be added here \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/ExerciseEventManagement/eem_dtc.h b/qt6-after/qt6-migrated-legatus/include/ExerciseEventManagement/eem_dtc.h deleted file mode 100644 index ce5c860f8..000000000 --- a/qt6-after/qt6-migrated-legatus/include/ExerciseEventManagement/eem_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace ExerciseEventManagement -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace ExerciseEventManagement diff --git a/qt6-after/qt6-migrated-legatus/include/ExerciseEventManagement/eem_export.h b/qt6-after/qt6-migrated-legatus/include/ExerciseEventManagement/eem_export.h deleted file mode 100644 index 95115ec9a..000000000 --- a/qt6-after/qt6-migrated-legatus/include/ExerciseEventManagement/eem_export.h +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Stub export header for ExerciseEventManagement non-RTI builds - * When BUILD_RTI=OFF, svcEemCommon library is not built - * This stub allows dependent code to compile - */ -#pragma once - -#include - -// Stub export macros for non-RTI builds -#define EEM_EXPORT \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/ExerciseEventManagement/eem_types.h b/qt6-after/qt6-migrated-legatus/include/ExerciseEventManagement/eem_types.h deleted file mode 100644 index 0cbaa483f..000000000 --- a/qt6-after/qt6-migrated-legatus/include/ExerciseEventManagement/eem_types.h +++ /dev/null @@ -1,37 +0,0 @@ -/** - * Stub type definitions for ExerciseEventManagement - * When BUILD_RTI=OFF, DDS-generated types are not available - * This stub allows dependent code to compile - */ -#pragma once - -#include -#include -#include -#include - -namespace ExerciseEventManagement -{ - -/** - * @brief Stub Event type for non-RTI builds - */ -struct EEM_EXPORT Event -{ - Event() = default; - ~Event() = default; - - // Basic fields - adjust based on actual usage - QString id; - QString type; - QDateTime timestamp; - QString description; - - // Copy/move operations - Event(const Event&) = default; - Event(Event&&) = default; - Event& operator=(const Event&) = default; - Event& operator=(Event&&) = default; -}; - -} // namespace ExerciseEventManagement \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/ExerciseManagement/exm_db.h b/qt6-after/qt6-migrated-legatus/include/ExerciseManagement/exm_db.h deleted file mode 100644 index 3b2ed3e47..000000000 --- a/qt6-after/qt6-migrated-legatus/include/ExerciseManagement/exm_db.h +++ /dev/null @@ -1,165 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von DDS/RTI Codegen generiert -// Für die Migration mit BUILD_RTI=OFF erstellen wir minimale Implementierungen - -#include "exm_enums.hpp" -#include -#include -#include -#include -#include -#include -#include - -namespace ExerciseManagement -{ - -// Forward declarations -class Exercise; -class ExercisePhase; - -/** - * @brief Exercise class - Stub für DDS-generierten Code - * - * Diese Klasse wird normalerweise von DDS aus exm_service.xml generiert. - * Für BUILD_RTI=OFF verwenden wir diese minimale Implementierung. - */ -class Exercise -{ -public: - Exercise() - : m_id(0) - , m_stateId(0) - , m_operatorId(0) - , m_workstationId(0) - , m_trainingAreaId(0) - , m_radioGroupId(std::nullopt) - , m_activePhaseId(std::nullopt) - , m_symbolFillTypeId(0) - , m_linkedExerciseId(std::nullopt) - , m_sendToWms(false) - , m_transferred(false) - , m_hasHlaInterface(false) - {} - - // Getter - int32_t id() const { return m_id; } - std::string name() const { return m_name.toStdString(); } - QString nameQString() const { return m_name; } - int32_t stateId() const { return m_stateId; } - int32_t operatorId() const { return m_operatorId; } - int32_t workstationId() const { return m_workstationId; } - QDateTime beginTime() const { return m_beginTime; } - QDateTime endTime() const { return m_endTime; } - QDateTime created() const { return m_created; } - QDateTime startTime() const { return m_startTime; } - QDateTime stopTime() const { return m_stopTime; } - int32_t trainingAreaId() const { return m_trainingAreaId; } - std::optional radioGroupId() const { return m_radioGroupId; } - std::optional activePhaseId() const { return m_activePhaseId; } - int32_t symbolFillTypeId() const { return m_symbolFillTypeId; } - std::optional linkedExerciseId() const { return m_linkedExerciseId; } - QString defaultTimeZone() const { return m_defaultTimeZone; } - bool sendToWms() const { return m_sendToWms; } - QString forces() const { return m_forces; } - QString description() const { return m_description; } - bool transferred() const { return m_transferred; } - bool hasHlaInterface() const { return m_hasHlaInterface; } - - // Setter - void setId(int32_t id) { m_id = id; } - void setName(const QString& name) { m_name = name; } - void setName(const std::string& name) { m_name = QString::fromStdString(name); } - void setStateId(int32_t stateId) { m_stateId = stateId; } - void setOperatorId(int32_t operatorId) { m_operatorId = operatorId; } - void setWorkstationId(int32_t workstationId) { m_workstationId = workstationId; } - void setBeginTime(const QDateTime& time) { m_beginTime = time; } - void setEndTime(const QDateTime& time) { m_endTime = time; } - void setCreated(const QDateTime& time) { m_created = time; } - void setStartTime(const QDateTime& time) { m_startTime = time; } - void setStopTime(const QDateTime& time) { m_stopTime = time; } - void setTrainingAreaId(int32_t id) { m_trainingAreaId = id; } - void setRadioGroupId(std::optional id) { m_radioGroupId = id; } - void setActivePhaseId(std::optional id) { m_activePhaseId = id; } - void setSymbolFillTypeId(int32_t id) { m_symbolFillTypeId = id; } - void setLinkedExerciseId(std::optional id) { m_linkedExerciseId = id; } - void setDefaultTimeZone(const QString& tz) { m_defaultTimeZone = tz; } - void setSendToWms(bool send) { m_sendToWms = send; } - void setForces(const QString& forces) { m_forces = forces; } - void setDescription(const QString& desc) { m_description = desc; } - void setTransferred(bool transferred) { m_transferred = transferred; } - void setHasHlaInterface(bool has) { m_hasHlaInterface = has; } - - // Utility - bool isValid() const { return m_id > 0; } - -private: - int32_t m_id; - QString m_name; - int32_t m_stateId; - int32_t m_operatorId; - int32_t m_workstationId; - QDateTime m_beginTime; - QDateTime m_endTime; - QDateTime m_created; - QDateTime m_startTime; - QDateTime m_stopTime; - int32_t m_trainingAreaId; - std::optional m_radioGroupId; - std::optional m_activePhaseId; - int32_t m_symbolFillTypeId; - std::optional m_linkedExerciseId; - QString m_defaultTimeZone; - bool m_sendToWms; - QString m_forces; - QString m_description; - bool m_transferred; - bool m_hasHlaInterface; -}; - -/** - * @brief ExercisePhase class - Stub für DDS-generierten Code - * - * Diese Klasse wird normalerweise von DDS aus exm_service.xml generiert. - * Für BUILD_RTI=OFF verwenden wir diese minimale Implementierung. - */ -class ExercisePhase -{ -public: - ExercisePhase() - : m_id(0) - , m_exerciseId(0) - {} - - // Getter - int32_t id() const { return m_id; } - std::string name() const { return m_name.toStdString(); } - QString nameQString() const { return m_name; } - QString description() const { return m_description; } - QDateTime beginTime() const { return m_beginTime; } - QDateTime endTime() const { return m_endTime; } - int32_t exerciseId() const { return m_exerciseId; } - - // Setter - void setId(int32_t id) { m_id = id; } - void setName(const QString& name) { m_name = name; } - void setName(const std::string& name) { m_name = QString::fromStdString(name); } - void setDescription(const QString& desc) { m_description = desc; } - void setBeginTime(const QDateTime& time) { m_beginTime = time; } - void setEndTime(const QDateTime& time) { m_endTime = time; } - void setExerciseId(int32_t id) { m_exerciseId = id; } - - // Utility - bool isValid() const { return m_id > 0; } - -private: - int32_t m_id; - QString m_name; - QString m_description; - QDateTime m_beginTime; - QDateTime m_endTime; - int32_t m_exerciseId; -}; - -} // namespace ExerciseManagement \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/ExerciseManagement/exm_dtc.h b/qt6-after/qt6-migrated-legatus/include/ExerciseManagement/exm_dtc.h deleted file mode 100644 index 0ed8d59a7..000000000 --- a/qt6-after/qt6-migrated-legatus/include/ExerciseManagement/exm_dtc.h +++ /dev/null @@ -1,123 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Typ-Definitionen - -#include "exm_exercise.h" -#include "ParticipantManagement/ppm_enums.hpp" -#include "FileManagement/flm_db.h" -// FileManagement::Folder (folders()/m_folders) ist ein echt generierter -// DDS-Typ und wird — wie im original von ddsdtc generierten exm_dtc.h über -// exm_dtc_types.h — aus der generierten flm.hpp (Build-Tree) eingebunden. -#include "FileManagement/flm.hpp" - -#include -#include -#include -#include -#include - -namespace ExerciseManagement -{ - -// ExercisePhase struct -struct ExercisePhase -{ - [[nodiscard]] int id() const { return m_id; } - [[nodiscard]] std::string name() const { return m_name; } - - int m_id = 0; - std::string m_name; -}; - -namespace Interface -{ - -// Dtc - Data Transfer Component für Exercise Management -class Dtc : public QObject { - Q_OBJECT - -public: - Dtc() = default; - ~Dtc() override = default; - - // Initialization methods - void enableExercise() {} - void waitForHistoricalDataExercise() {} - void enableExercisePhase() {} - void waitForHistoricalDataExercisePhase() {} - - // Exercise-Liste abrufen (Callback-basiert) - void exercises(const std::function& callback) const { - for (const auto& ex : m_exercises) { - callback(ex); - } - } - - // Einzelnes Exercise nach ID abrufen - Exercise exercise(int id) const { - for (const auto& ex : m_exercises) { - if (ex.id == id) { - return ex; - } - } - return Exercise{}; // Return empty exercise if not found - } - - // Exercise-Phase nach ID abrufen - ExercisePhase exercisePhase(int phaseId) const { - for (const auto& phase : m_phases) { - if (phase.m_id == phaseId) { - return phase; - } - } - return ExercisePhase{}; // Return empty phase if not found - } - - // Folders abrufen (Callback-basiert) - benötigt von LtsFileDialog - void folders(const std::function&)>& callback) const { - callback(m_folders); - } - - // Exercise-Liste als QList - QList exercisesList() const { return m_exercises; } - - // Exercise hinzufügen/entfernen/ändern - void addExercise(const Exercise& ex) { - m_exercises.append(ex); - emit exerciseChanged(ex, ParticipantManagement::DataModification::eAdded); - } - - void updateExercise(const Exercise& ex) { - for (auto& existing : m_exercises) { - if (existing.id == ex.id) { - existing = ex; - emit exerciseChanged(ex, ParticipantManagement::DataModification::eModified); - return; - } - } - addExercise(ex); - } - - void removeExercise(int id) { - for (auto it = m_exercises.begin(); it != m_exercises.end(); ++it) { - if (it->id == id) { - Exercise removed = *it; - m_exercises.erase(it); - emit exerciseChanged(removed, ParticipantManagement::DataModification::eRemoved); - return; - } - } - } - -signals: - void exerciseChanged(const Exercise& exercise, ParticipantManagement::DataModification modificationType); - -private: - QList m_exercises; - std::vector m_phases; - std::vector m_folders; -}; - -} // namespace Interface -} // namespace ExerciseManagement diff --git a/qt6-after/qt6-migrated-legatus/include/ExerciseManagement/exm_ftc.h b/qt6-after/qt6-migrated-legatus/include/ExerciseManagement/exm_ftc.h deleted file mode 100644 index 6ddc80050..000000000 --- a/qt6-after/qt6-migrated-legatus/include/ExerciseManagement/exm_ftc.h +++ /dev/null @@ -1,110 +0,0 @@ -/** - * ExerciseManagement Function Topic Client interface - * STUB-HEADER: Diese Datei wird normalerweise von DDS generiert - * Für die Migration erstellen wir minimale Implementierungen - */ - -#pragma once - -#include -#include -#include - -namespace DDSConnector -{ -class DdsConnector; -} - -namespace ExerciseManagement -{ -namespace Interface -{ - -// Forward declaration -class Ftc; - -// Reply Handler stub classes for Function Topics -// These are normally generated from DDS IDL definitions - -class GetExerciseDataReplyHandler -{ -public: - GetExerciseDataReplyHandler() = default; - virtual ~GetExerciseDataReplyHandler() = default; - virtual void onGetExerciseData(const void* /*reply*/) {} -}; - -class ModifyExerciseDataReplyHandler -{ -public: - ModifyExerciseDataReplyHandler() = default; - virtual ~ModifyExerciseDataReplyHandler() = default; - virtual void onModifyExerciseData(const void* /*reply*/) {} -}; - -class GetExercisePhaseDataReplyHandler -{ -public: - GetExercisePhaseDataReplyHandler() = default; - virtual ~GetExercisePhaseDataReplyHandler() = default; - virtual void onGetExercisePhaseData(const void* /*reply*/) {} -}; - -// Ftc - Function Topic Client interface for ExerciseManagement -class Ftc : public QObject -{ - Q_OBJECT - -public: - virtual ~Ftc() = default; - - /** - * Create a new instance for ExerciseManagement::Interface::Ftc. - * STUB: Returns nullptr - actual implementation would require DDS - */ - static std::shared_ptr create(const std::shared_ptr& /*ddsConnector*/, bool /*forceCreate*/ = false) - { - return nullptr; - } - - /** - * A unique identifier for this FTC - */ - static inline const char* identifier() { return "ExerciseManagement.Interface.Ftc"; } - - /** - * Initialize this Ftc instance with all function topic clients - */ - virtual bool enableAll(bool /*enable*/ = true) { return false; } - - /** - * Enable/disable specific function topic clients - */ - virtual bool enableGetExerciseData(bool /*enable*/ = true) { return false; } - virtual bool isGetExerciseDataEnabled() const { return false; } - - virtual bool enableModifyExerciseData(bool /*enable*/ = true) { return false; } - virtual bool isModifyExerciseDataEnabled() const { return false; } - - virtual bool enableGetExercisePhaseData(bool /*enable*/ = true) { return false; } - virtual bool isGetExercisePhaseDataEnabled() const { return false; } - - /** - * Request methods with reply handlers - * STUB: Return -1 to indicate no request was sent - */ - virtual int64_t requestGetExerciseData(const void* /*request*/, GetExerciseDataReplyHandler* /*handler*/) { return -1; } - virtual int64_t requestGetExerciseData(const void* /*request*/, const std::function& /*cb*/) { return -1; } - virtual int64_t lastGetExerciseDataUniqueId() const { return -1; } - - virtual int64_t requestModifyExerciseData(const void* /*request*/, ModifyExerciseDataReplyHandler* /*handler*/) { return -1; } - virtual int64_t requestModifyExerciseData(const void* /*request*/, const std::function& /*cb*/) { return -1; } - virtual int64_t lastModifyExerciseDataUniqueId() const { return -1; } - - virtual int64_t requestGetExercisePhaseData(const void* /*request*/, GetExercisePhaseDataReplyHandler* /*handler*/) { return -1; } - virtual int64_t requestGetExercisePhaseData(const void* /*request*/, const std::function& /*cb*/) { return -1; } - virtual int64_t lastGetExercisePhaseDataUniqueId() const { return -1; } -}; - -} // namespace Interface -} // namespace ExerciseManagement \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/GuezIedManagement/gim_dtc.h b/qt6-after/qt6-migrated-legatus/include/GuezIedManagement/gim_dtc.h deleted file mode 100644 index 1f16e4e83..000000000 --- a/qt6-after/qt6-migrated-legatus/include/GuezIedManagement/gim_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace GuezIedManagement -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace GuezIedManagement diff --git a/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_dtc.h b/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_dtc.h deleted file mode 100644 index 24576bf6d..000000000 --- a/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_dtc.h +++ /dev/null @@ -1,137 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Typ-Definitionen - -#include "gna_nasat_aircraft.h" -#include "gna_nasat_aircraft_participant.h" -#include -#include -#include - -#include -#include -#include -#include -#include - -// Forward declarations -namespace ExerciseManagement { namespace Interface { class Dtc; } } -namespace ParticipantManagement { namespace Interface { class Dtc; class ForeignGuiComboboxInterface; } } -namespace LtsSession { class LtsSession; } - -namespace GuezNasat -{ - -// NasatAircraftParticipant und NasatAircraft sind bereits in gna_nasat_aircraft.h definiert -// Diese Datei enthält nur die Dtc-Klasse - -namespace Interface -{ - -// Dtc - Data Transfer Component für GuezNasat -class Dtc : public QObject { - Q_OBJECT - -public: - Dtc() = default; - ~Dtc() override = default; - - // NasatAircraftParticipant-Liste abrufen (Callback-basiert) - void forEachNasatAircraftParticipant(const std::function& callback) const { - for (const auto& nap : m_nasatAircraftParticipants) { - callback(nap); - } - } - - // NasatAircraftParticipant-Liste als QMap (für Model) - QMap nasatAircraftParticipants() const { - QMap result; - for (const auto& nap : m_nasatAircraftParticipants) { - result[nap.id()] = nap; - } - return result; - } - - // NasatAircraft-Liste abrufen (Callback-basiert) - void forEachNasatAircraft(const std::function& callback) const { - for (const auto& na : m_nasatAircrafts) { - callback(na); - } - } - - // NasatAircraft-Liste als QMap - QMap nasatAircrafts() const { - QMap result; - for (const auto& na : m_nasatAircrafts) { - result[na.id()] = na; - } - return result; - } - - // Daten hinzufügen/entfernen/ändern - void addNasatAircraftParticipant(const NasatAircraftParticipant& nap) { - m_nasatAircraftParticipants.append(nap); - emit nasatAircraftParticipantChanged(nap, DataModification::eAdded); - } - - void updateNasatAircraftParticipant(const NasatAircraftParticipant& nap) { - for (auto& existing : m_nasatAircraftParticipants) { - if (existing.id() == nap.id()) { - existing = nap; - emit nasatAircraftParticipantChanged(nap, DataModification::eModified); - return; - } - } - addNasatAircraftParticipant(nap); - } - - void removeNasatAircraftParticipant(int id) { - for (auto it = m_nasatAircraftParticipants.begin(); it != m_nasatAircraftParticipants.end(); ++it) { - if (it->id() == id) { - NasatAircraftParticipant removed = *it; - m_nasatAircraftParticipants.erase(it); - emit nasatAircraftParticipantChanged(removed, DataModification::eRemoved); - return; - } - } - } - - void addNasatAircraft(const NasatAircraft& na) { - m_nasatAircrafts.append(na); - emit nasatAircraftChanged(na, DataModification::eAdded); - } - - void updateNasatAircraft(const NasatAircraft& na) { - for (auto& existing : m_nasatAircrafts) { - if (existing.id() == na.id()) { - existing = na; - emit nasatAircraftChanged(na, DataModification::eModified); - return; - } - } - addNasatAircraft(na); - } - - void removeNasatAircraft(int id) { - for (auto it = m_nasatAircrafts.begin(); it != m_nasatAircrafts.end(); ++it) { - if (it->id() == id) { - NasatAircraft removed = *it; - m_nasatAircrafts.erase(it); - emit nasatAircraftChanged(removed, DataModification::eRemoved); - return; - } - } - } - -signals: - void nasatAircraftParticipantChanged(const NasatAircraftParticipant& participant, DataModification modificationType); - void nasatAircraftChanged(const NasatAircraft& aircraft, DataModification modificationType); - -private: - QList m_nasatAircraftParticipants; - QList m_nasatAircrafts; -}; - -} // namespace Interface -} // namespace GuezNasat diff --git a/qt6-after/qt6-migrated-legatus/include/GuezNasat/logger.h b/qt6-after/qt6-migrated-legatus/include/GuezNasat/logger.h deleted file mode 100755 index 60ce0a3b1..000000000 --- a/qt6-after/qt6-migrated-legatus/include/GuezNasat/logger.h +++ /dev/null @@ -1,18 +0,0 @@ - - - -#pragma once - -#include -#include "gna_export.h" - -namespace GuezNasat -{ -using LOGGER_T = NGL::INGLLogger &; - -GNA_COMMON_EXPORT LOGGER_T getLogger(const char *name); -inline LOGGER_T getLogger(const QString &loggerName) -{ - return getLogger(loggerName.toUtf8().constData()); -} -} diff --git a/qt6-after/qt6-migrated-legatus/include/InfrastructureManagement/ism.hpp b/qt6-after/qt6-migrated-legatus/include/InfrastructureManagement/ism.hpp deleted file mode 100644 index f5cee0a24..000000000 --- a/qt6-after/qt6-migrated-legatus/include/InfrastructureManagement/ism.hpp +++ /dev/null @@ -1,233 +0,0 @@ -/** - * @file ism.hpp - * @brief DDS-Stub-Header für InfrastructureManagement - * - * Dieser Header ersetzt die von RTI DDS Generator erzeugten Typen. - */ - -#ifndef ISM_HPP -#define ISM_HPP - -#include -#include -#include -#include -#include -#include -#include -#include "InfrastructureManagement/ism_enums.hpp" -#include "ParticipantManagement/ppm.hpp" -#include "ParticipantManagement/ppm_enums.hpp" - -namespace InfrastructureManagement { - -// Using-declaration for DataModification in InfrastructureManagement namespace -using ParticipantManagement::DataModification; - -// Core namespace mit GeoPosition und RelativePosition -namespace Core { - -class GeoPosition { -public: - GeoPosition() : latitude_(0.0), longitude_(0.0), altitude_(0.0) {} - double latitude() const { return latitude_; } - double longitude() const { return longitude_; } - double altitude() const { return altitude_; } - void latitude(double v) { latitude_ = v; } - void longitude(double v) { longitude_ = v; } - void altitude(double v) { altitude_ = v; } -private: - double latitude_; - double longitude_; - double altitude_; -}; - -class RelativePosition { -public: - RelativePosition() : x_(0.0), y_(0.0), z_(0.0) {} - double x() const { return x_; } - double y() const { return y_; } - double z() const { return z_; } - void x(double v) { x_ = v; } - void y(double v) { y_ = v; } - void z(double v) { z_ = v; } -private: - double x_; - double y_; - double z_; -}; - -} // namespace Core - -// StructureElement Stub-Klasse -class StructureElement { -public: - StructureElement() : id_(0), mainStructureElementId_(0), mountingPointTypeId_(MountingPointType::Undefined), mountingPointId_(0) {} - - int32_t id() const { return id_; } - void id(int32_t v) { id_ = v; } - - int32_t mainStructureElementId() const { return mainStructureElementId_; } - void mainStructureElementId(int32_t v) { mainStructureElementId_ = v; } - - 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; } - - Core::RelativePosition relPosition() const { return relPosition_; } - void relPosition(const Core::RelativePosition& v) { relPosition_ = v; } - - std::string properties() const { return properties_; } - void properties(const std::string& v) { properties_ = 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; } - - // path() returns vector of IDs im Hierarchie-Pfad - const std::vector& path() const { return path_; } - void path(const std::vector& 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 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& elements() const { return elements_; } - void elements(const std::vector& v) { elements_ = v; } - -private: - int32_t id_; - int32_t groupId_; - std::string name_; - std::string displayName_; - Core::GeoPosition geoPosition_; - std::vector 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& elements() const { return elements_; } - void elements(const std::vector& v) { elements_ = v; } - -private: - int32_t id_; - std::vector 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 diff --git a/qt6-after/qt6-migrated-legatus/include/InfrastructureManagement/ism_db_impl.h b/qt6-after/qt6-migrated-legatus/include/InfrastructureManagement/ism_db_impl.h deleted file mode 100644 index 3f88295fa..000000000 --- a/qt6-after/qt6-migrated-legatus/include/InfrastructureManagement/ism_db_impl.h +++ /dev/null @@ -1,46 +0,0 @@ -/** - * @RDE_HEADER@ - * Stub header for CODEGEN_DATABASE generated code (BUILD_RTI=OFF) - * This file is generated by CODEGEN_DATABASE macro when BUILD_RTI=ON - * For BUILD_RTI=OFF builds, this stub provides the minimal interface - */ -#pragma once - -#include -#include - -namespace Database -{ -// Stub struct for IsmMountingPointPlan -struct IsmMountingPointPlan -{ - int scheduleId = 0; - int mountingPointId = 0; - MountingPointState mountingPointState = MountingPointState::Unknown; -}; -} // namespace Database - -namespace InfrastructureManagement -{ - -/** - * @brief Base class for database interface implementation - * - * This class is normally generated by CODEGEN_DATABASE macro. - * This stub provides minimal interface for BUILD_RTI=OFF builds. - */ -class DatabaseInterfaceImpl : public QObject -{ - Q_OBJECT -public: - explicit DatabaseInterfaceImpl(QObject *parent = nullptr) : QObject(parent) {} - virtual ~DatabaseInterfaceImpl() = default; - - // Virtual methods that can be overridden by custom implementations - virtual int copySchedule(int scheduleId) = 0; - virtual bool updateMountingPointPlan(int scheduleId, int mountingPointId, MountingPointState mountingPointState) = 0; - virtual bool deleteMountingPointPlan(int scheduleId, int mountingPointId) = 0; - virtual bool insertMountingPointPlans(const std::vector &mpps) = 0; -}; - -} // namespace InfrastructureManagement \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/InfrastructureManagement/ism_dtc.h b/qt6-after/qt6-migrated-legatus/include/InfrastructureManagement/ism_dtc.h deleted file mode 100644 index 6ca6b02ce..000000000 --- a/qt6-after/qt6-migrated-legatus/include/InfrastructureManagement/ism_dtc.h +++ /dev/null @@ -1,129 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Implementierungen - -#include -#include -#include -#include -#include "ism.hpp" -#include "ism_mounting_point.h" - -namespace InfrastructureManagement -{ -namespace Interface -{ - -// Forward declarations -class Dtc; -class Ftc; - -// DataModification Enum -enum class DataModification -{ - eAdded, - eModified, - eRemoved -}; - -// MountingPointPlan - Planungsdaten für MountingPoints (MUST come before MainSchedule) -class MountingPointPlan { -public: - MountingPointPlan() : structureElementId_(0) {} - int32_t structureElementId() const { return structureElementId_; } - void structureElementId(int32_t v) { structureElementId_ = v; } - - MountingPointState mountingPointState() const { return mountingPointState_; } - void mountingPointState(const MountingPointState& v) { mountingPointState_ = v; } - -private: - int32_t structureElementId_; - MountingPointState mountingPointState_; -}; - -// MainSchedule - benötigt für Schedule-Daten -class MainSchedule { -public: - MainSchedule() : id_(0) {} - int32_t id() const { return id_; } - void id(int32_t v) { id_ = v; } - - // elements() returns vector of MountingPointPlan - const std::vector& elements() const { return elements_; } - void elements(const std::vector& v) { elements_ = v; } - -private: - int32_t id_; - std::vector elements_; -}; - -// InstrumentationAssetState Enum -enum class InstrumentationAssetState -{ - Undefined = 0, - Ok = 1, - Defect = 2 -}; - -// InstrumentationAsset - Asset-Daten -class InstrumentationAsset { -public: - InstrumentationAsset() : assetId_(0), assetStateId_(InstrumentationAssetState::Undefined) {} - int32_t assetId() const { return assetId_; } - void assetId(int32_t v) { assetId_ = v; } - - InstrumentationAssetState assetStateId() const { return assetStateId_; } - void assetStateId(InstrumentationAssetState v) { assetStateId_ = v; } - -private: - int32_t assetId_; - InstrumentationAssetState assetStateId_; -}; - -// Dtc - Data Transfer Component (Hauptklasse für ISM-Daten) -class Dtc : public QObject -{ - Q_OBJECT - -public: - Dtc(QObject* parent = nullptr) : QObject(parent) {} - ~Dtc() override = default; - - // MainStructureElement Zugriff - virtual const QMap& mainStructureElements() const = 0; - virtual MainStructureElement mainStructureElement(int32_t id) const = 0; - virtual bool getStructureElementById(int32_t id, StructureElement& out) const = 0; - virtual void waitForHistoricalDataMainStructureElement(int timeoutMs) = 0; - - // MainSchedule Zugriff - virtual const QMap& mainSchedules() const = 0; - virtual MainSchedule mainSchedule(int32_t id) const = 0; - virtual void waitForHistoricalDataMainSchedule(int timeoutMs) = 0; - - // MountingPointAsset Zugriff - virtual void mountingPointAssets(const std::function& cb) = 0; - virtual void waitForHistoricalDataMountingPointAsset(int timeoutMs) = 0; - virtual InstrumentationAsset instrumentationAsset(int32_t assetId) const = 0; - - // MainFootprint Zugriff (wird in ism_dtc_impl_custom_p.h verwendet) - virtual MainFootprint mainFootprint(int mseId) const = 0; - -signals: - void mainStructureElementChanged(const MainStructureElement& data, DataModification modType); - void mainScheduleChanged(const MainSchedule& data, DataModification modType); - void mountingPointAssetChanged(const MountingPointAsset& data, DataModification modType); -}; - -// Ftc - Forward Declaration (wird später implementiert) -class Ftc : public QObject -{ - Q_OBJECT - -public: - Ftc(QObject* parent = nullptr) : QObject(parent) {} - ~Ftc() override = default; -}; - -} // namespace Interface -} // namespace InfrastructureManagement diff --git a/qt6-after/qt6-migrated-legatus/include/InfrastructureManagement/ism_ftc.h b/qt6-after/qt6-migrated-legatus/include/InfrastructureManagement/ism_ftc.h deleted file mode 100644 index 9687b5cff..000000000 --- a/qt6-after/qt6-migrated-legatus/include/InfrastructureManagement/ism_ftc.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once -// STUB-HEADER: Diese Datei wird normalerweise von ddsftc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace InfrastructureManagement -{ -namespace Interface -{ - class Ftc; -} -} \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/MarkerManagement/mrk_dtc.h b/qt6-after/qt6-migrated-legatus/include/MarkerManagement/mrk_dtc.h deleted file mode 100644 index 379ecca8b..000000000 --- a/qt6-after/qt6-migrated-legatus/include/MarkerManagement/mrk_dtc.h +++ /dev/null @@ -1,58 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -#include -#include -#include -#include -#include - -#include - -#include "LtsUtils/LtsUtilsCore/data_modification_enum.h" -#include "mrk_marker.h" - -namespace MarkerManagement -{ - -namespace Interface -{ - -// Dtc interface class with signals for Qt6 migration STUB -class Dtc : public QObject -{ - Q_OBJECT -public: - explicit Dtc(QObject* parent = nullptr) : QObject(parent) {} - ~Dtc() override = default; - - // Callback registration instead of enableNotification() - void markers(std::function callback) - { - m_markerCallback = callback; - } - - // Trigger marker changed (for STUB testing) - void triggerMarkerChanged(const Marker& marker, DataModification modType) - { - emit markerChanged(marker, modType); - if (m_markerCallback) - { - m_markerCallback(marker); - } - } - -signals: - void markerChanged(const Marker& marker, DataModification modType); - -private: - std::function m_markerCallback; -}; - -class Ftc; - -} // namespace Interface - -} // namespace MarkerManagement diff --git a/qt6-after/qt6-migrated-legatus/include/Messaging/msg_dtc.h b/qt6-after/qt6-migrated-legatus/include/Messaging/msg_dtc.h deleted file mode 100644 index e6a935b68..000000000 --- a/qt6-after/qt6-migrated-legatus/include/Messaging/msg_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace Messaging -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace Messaging diff --git a/qt6-after/qt6-migrated-legatus/include/MeteoDataManagement/mdm_dtc.h b/qt6-after/qt6-migrated-legatus/include/MeteoDataManagement/mdm_dtc.h deleted file mode 100644 index 9efa8bfc7..000000000 --- a/qt6-after/qt6-migrated-legatus/include/MeteoDataManagement/mdm_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace MeteoDataManagement -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace MeteoDataManagement diff --git a/qt6-after/qt6-migrated-legatus/include/NotificationManagement/nom_dtc.h b/qt6-after/qt6-migrated-legatus/include/NotificationManagement/nom_dtc.h deleted file mode 100644 index 62a762723..000000000 --- a/qt6-after/qt6-migrated-legatus/include/NotificationManagement/nom_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace NotificationManagement -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace NotificationManagement diff --git a/qt6-after/qt6-migrated-legatus/include/OcSituationServer/oss_dtc.h b/qt6-after/qt6-migrated-legatus/include/OcSituationServer/oss_dtc.h deleted file mode 100644 index cd1ffb381..000000000 --- a/qt6-after/qt6-migrated-legatus/include/OcSituationServer/oss_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace OcSituationServer -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace OcSituationServer diff --git a/qt6-after/qt6-migrated-legatus/include/OperatorManagement/opm_db.h b/qt6-after/qt6-migrated-legatus/include/OperatorManagement/opm_db.h deleted file mode 100644 index e9a127637..000000000 --- a/qt6-after/qt6-migrated-legatus/include/OperatorManagement/opm_db.h +++ /dev/null @@ -1,133 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von DDS/RTI Codegen generiert -// Für die Migration mit BUILD_RTI=OFF erstellen wir minimale Implementierungen - -#include "opm_enums.hpp" -#include -#include -#include -#include -#include -#include -#include - -namespace OperatorManagement -{ - -// Forward declarations -class Operator; -class Group; - -/** - * @brief Operator class - Stub für DDS-generierten Code - * - * Diese Klasse wird normalerweise von DDS aus opm_service.xml generiert. - * Für BUILD_RTI=OFF verwenden wir diese minimale Implementierung. - */ -class Operator -{ -public: - Operator() - : m_id(0) - , m_groupId(0) - , m_accessLevel(0) - , m_isActive(false) - , m_isHidden(false) - {} - - // Getter - int32_t id() const { return m_id; } - std::string name() const { return m_name.toStdString(); } - QString nameQString() const { return m_name; } - int32_t groupId() const { return m_groupId; } - std::string description() const { return m_description.toStdString(); } - QByteArray image() const { return m_image; } - int32_t accessLevel() const { return m_accessLevel; } - bool isActive() const { return m_isActive; } - bool isHidden() const { return m_isHidden; } - QDateTime created() const { return m_created; } - QDateTime modified() const { return m_modified; } - - // Setter - void setId(int32_t id) { m_id = id; } - void setName(const QString& name) { m_name = name; } - void setName(const std::string& name) { m_name = QString::fromStdString(name); } - void setGroupId(int32_t groupId) { m_groupId = groupId; } - void setDescription(const QString& description) { m_description = description; } - void setImage(const QByteArray& image) { m_image = image; } - void setAccessLevel(int32_t accessLevel) { m_accessLevel = accessLevel; } - void setIsActive(bool active) { m_isActive = active; } - void setIsHidden(bool hidden) { m_isHidden = hidden; } - void setCreated(const QDateTime& created) { m_created = created; } - void setModified(const QDateTime& modified) { m_modified = modified; } - - // Utility - bool isValid() const { return m_id > 0; } - -private: - int32_t m_id; - QString m_name; - int32_t m_groupId; - QString m_description; - QByteArray m_image; - int32_t m_accessLevel; - bool m_isActive; - bool m_isHidden; - QDateTime m_created; - QDateTime m_modified; -}; - -/** - * @brief Group class - Stub für DDS-generierten Code - * - * Diese Klasse wird normalerweise von DDS aus opm_service.xml generiert. - * Für BUILD_RTI=OFF verwenden wir diese minimale Implementierung. - */ -class Group -{ -public: - Group() - : m_id(0) - , m_typeId(0) - , m_isHidden(false) - {} - - // Getter - int32_t id() const { return m_id; } - std::string name() const { return m_name.toStdString(); } - QString nameQString() const { return m_name; } - std::string description() const { return m_description.toStdString(); } - int32_t typeId() const { return m_typeId; } - bool isHidden() const { return m_isHidden; } - std::vector memberIds() const { return m_memberIds; } - - // Setter - void setId(int32_t id) { m_id = id; } - void setName(const QString& name) { m_name = name; } - void setName(const std::string& name) { m_name = QString::fromStdString(name); } - void setDescription(const QString& description) { m_description = description; } - void setTypeId(int32_t typeId) { m_typeId = typeId; } - void setIsHidden(bool hidden) { m_isHidden = hidden; } - void setMemberIds(const std::vector& ids) { m_memberIds = ids; } - - // Utility - bool isValid() const { return m_id > 0; } - void addMember(int32_t operatorId) { m_memberIds.push_back(operatorId); } - void removeMember(int32_t operatorId) - { - m_memberIds.erase( - std::remove(m_memberIds.begin(), m_memberIds.end(), operatorId), - m_memberIds.end()); - } - -private: - int32_t m_id; - QString m_name; - QString m_description; - int32_t m_typeId; - bool m_isHidden; - std::vector m_memberIds; -}; - -} // namespace OperatorManagement \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/OperatorManagement/opm_dtc.h b/qt6-after/qt6-migrated-legatus/include/OperatorManagement/opm_dtc.h deleted file mode 100644 index 9e13368c5..000000000 --- a/qt6-after/qt6-migrated-legatus/include/OperatorManagement/opm_dtc.h +++ /dev/null @@ -1,43 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Implementierungen - -#include -#include -#include - -namespace OperatorManagement -{ - -struct User -{ - [[nodiscard]] qint32 id() const { return m_id; } - [[nodiscard]] std::string name() const { return m_name; } - - qint32 m_id = 0; - std::string m_name; -}; - -namespace Interface -{ -class Dtc -{ -public: - // Initialization methods - void enableUser() {} - void waitForHistoricalDataUser() {} - - User user(qint32 id) const - { - // STUB-Implementierung - leerer User - User u; - u.m_id = id; - u.m_name = "Unknown"; - return u; - } -}; - -class Ftc; -} // namespace Interface -} // namespace OperatorManagement diff --git a/qt6-after/qt6-migrated-legatus/include/OperatorManagement/opm_dtc_impl.h b/qt6-after/qt6-migrated-legatus/include/OperatorManagement/opm_dtc_impl.h deleted file mode 100644 index 7be83491c..000000000 --- a/qt6-after/qt6-migrated-legatus/include/OperatorManagement/opm_dtc_impl.h +++ /dev/null @@ -1,93 +0,0 @@ -/** - * @RDE_HEADER@ - * OperatorManagement DTC Implementation - * $Id$ - * $HeadURL$ - * $Author$ - * Stub-Header für Qt6-Migration - ersetzt DDS-generierten Header - */ -#pragma once - -#include -#include -#include - -// Forward declarations für DDS -namespace DDSConnector -{ -class DdsConnector; -} - -// User-Klasse Stub für Qt6-Migration -// Hinweis: Diese Klasse wird normalerweise von DDS generiert -// Dieser Stub stellt die benötigten Methoden für opm_dtc_impl_custom.cpp bereit -class User -{ -public: - int id() const { return m_id; } - QString name() const { return m_name; } - QVector effectiveAcls() const { return m_effectiveAcls; } - - struct VisiblePartyByExercise - { - int exerciseId() const { return m_exerciseId; } - std::optional> visibleParties() const { return m_visibleParties; } - std::optional> hiddenParties() const { return m_hiddenParties; } - QString properties() const { return m_properties; } - - int m_exerciseId = 0; - std::optional> m_visibleParties; - std::optional> m_hiddenParties; - QString m_properties; - }; - - QVector visiblePartiesByExercise() const { return m_visiblePartiesByExercise; } - QVector exerciseIds() const { return m_exerciseIds; } - QString properties() const { return m_properties; } - -private: - int m_id = 0; - QString m_name; - QVector m_effectiveAcls; - QVector m_visiblePartiesByExercise; - QVector m_exerciseIds; - QString m_properties; -}; - -//------------------------------------------------------------------------------------------------------------- -namespace OperatorManagement -{ -namespace Interface -{ -/** - * @brief DtcImpl - Basisklasse für OperatorManagement DTC - * - * Stellt Logger und User-Container für Custom-Implementierungen bereit - * Erbt von FileManagement::DatabaseInterfaceImpl für Datenbank-Zugriff - */ -class DtcImpl : public FileManagement::DatabaseInterfaceImpl -{ -public: - explicit DtcImpl(const std::shared_ptr &ddsConnector) - : FileManagement::DatabaseInterfaceImpl() - , m_ddsConnector(ddsConnector) - { - // Logger wird von DatabaseInterfaceImpl bereitgestellt - // m_logger ist in DatabaseInterfaceImpl definiert - } - - ~DtcImpl() override = default; - - // Virtuelle Methoden für Custom-Implementierung - virtual std::vector getOperatorsByOperatorRight(int operatorRight) = 0; - virtual std::vector operatorForExerciseParty(int exerciseId, int partyId) = 0; - virtual std::vector getNotificationRecipents(int exerciseId, int partyId, int operatorRight, int notificationType) = 0; - virtual bool isAdlerAllowedParty(int exerciseId, int partyId, int operatorId) = 0; - -protected: - std::shared_ptr m_ddsConnector; - QHash m_userCont; // User-Container für Operator-Daten -}; - -} // namespace Interface -} // namespace OperatorManagement \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/OperatorManagement/opm_ftc.h b/qt6-after/qt6-migrated-legatus/include/OperatorManagement/opm_ftc.h deleted file mode 100644 index f5c6ff045..000000000 --- a/qt6-after/qt6-migrated-legatus/include/OperatorManagement/opm_ftc.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef OPM_FTC_H -#define OPM_FTC_H - -// Stub header for OperatorManagement FTC functionality -// This file is part of FilterManagement which is excluded from build -// For non-FilterManagement builds, we provide this stub - -#include -#include - -// Forward declarations and stubs for FTC (Filter/Translation/Conversion) -// Actual implementation is in FilterManagement plugin - -class OpmFtc -{ -public: - virtual ~OpmFtc() = default; - // Stub methods - actual implementation in FilterManagement -}; - -#endif // OPM_FTC_H \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm.hpp b/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm.hpp deleted file mode 100644 index e12dbdc61..000000000 --- a/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm.hpp +++ /dev/null @@ -1,182 +0,0 @@ -#pragma once -// STUB-HEADER: Diese Datei wird normalerweise von DDS generiert -// Für die Migration erstellen wir minimale Typ-Definitionen - -#include "ppm_enums.hpp" - -#include -#include -#include -#include -#include -#include -#include - -namespace ParticipantManagement -{ - -// Type - Struct mit id und typeClass (nicht nur Alias!) -struct Type { - int id = 0; - TypeClass typeClass = TypeClass::eUninitialized; - - // Helper methods für Kompatibilität (andere Namen als Member!) - int getId() const { return id; } - TypeClass getTypeClass() const { return typeClass; } -}; - -// Participant - Basisdaten eines Teilnehmers -struct Participant { - int m_id = 0; - QString internalName; - QString externalName; - int typeId = 0; - int partyId = 0; - bool isVerbund = false; - int superiorId = 0; - - // Additional fields as needed - double x = 0.0; - double y = 0.0; - double z = 0.0; - double heading = 0.0; - - // Optional fields (für DDS-Kompatibilität) - std::optional equipmentNumber; - QString m_designator; - QString m_tacticalIdentifier; - - // Helper methods - QString name() const { return internalName; } - QString designator() const { return m_designator; } - QString tacticalIdentifier() const { return m_tacticalIdentifier; } - std::optional getEquipmentNumber() const { return equipmentNumber; } - int id() const { return m_id; } -}; - -// Party - Gruppe/Organisation von Teilnehmern -struct Party { - int id = 0; - QString name; - QString shortName; - int color() const { return 0xFF000000; } // Default schwarz als QRgb -}; - -// ParticipantPosition - Position eines Teilnehmers -struct ParticipantPosition { - int participantId = 0; - double x = 0.0; - double y = 0.0; - double z = 0.0; - double heading = 0.0; - double speed = 0.0; - qint64 timestamp = 0; -}; - -// DynamicParticipantData - Dynamische Teilnehmerdaten -struct DynamicParticipantData { - int participantId = 0; - QString status; - QString role; - qint64 lastUpdate = 0; -}; - -// MainSchedule - Stub für DDS-generierten Typ -struct MainSchedule { - int32_t id = 0; - QString name; - QString description; - qint64 startTime = 0; - qint64 endTime = 0; - bool isActive = false; -}; - -namespace Interface -{ - -// Using-Declaration für DataModification aus Parent-Namespace -using ParticipantManagement::DataModification; - -// Dtc - Data Transfer Component für Participant Management -// DDS-generierte Klasse mit participantChanged Signal -class Dtc : public QObject { - Q_OBJECT - -public: - Dtc() = default; - ~Dtc() override = default; - - // Teilnehmer-Liste abrufen (Callback-basiert wie im Original) - void participants(const std::function& callback) const { - for (const auto& p : m_participants) { - callback(p); - } - } - - // Teilnehmer-Liste als QList (für direkten Zugriff) - QList participantsList() const { return m_participants; } - - // Teilnehmer hinzufügen/entfernen/ändern - void addParticipant(const Participant& p) { - m_participants.append(p); - emit participantChanged(p, DataModification::eAdded); - } - - void updateParticipant(const Participant& p) { - for (auto& existing : m_participants) { - if (existing.m_id == p.m_id) { - existing = p; - emit participantChanged(p, DataModification::eModified); - return; - } - } - addParticipant(p); - } - - void removeParticipant(int id) { - for (auto it = m_participants.begin(); it != m_participants.end(); ++it) { - if (it->m_id == id) { - Participant removed = *it; - m_participants.erase(it); - emit participantChanged(removed, DataModification::eRemoved); - return; - } - } - } - - // Hierarchy-Methoden (STUB) - QString hierarchyFromParticipant(int participantId) const { - Q_UNUSED(participantId); - return QString(); - } - - // Party-Methoden (STUB) - Party party(int partyId) const { - Q_UNUSED(partyId); - return Party(); - } - -signals: - // Signal für Teilnehmer-Änderungen - void participantChanged(const Participant& participant, DataModification modificationType); - -private: - QList m_participants; - QMap m_hierarchies; - QMap m_parties; -}; - -} // namespace Interface - -// Stream operator for logging -inline std::ostream& operator<<(std::ostream& os, const Type& t) { - os << "Type(id=" << t.id << ", typeClass=" << t.typeClass << ")"; - return os; -} - -inline std::ostream& operator<<(std::ostream& os, const Participant& p) { - os << "Participant(id=" << p.m_id << ", name=" << p.name().toStdString() << ")"; - return os; -} - -} // namespace ParticipantManagement \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm_db_impl.h b/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm_db_impl.h deleted file mode 100644 index 6983236a3..000000000 --- a/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm_db_impl.h +++ /dev/null @@ -1,41 +0,0 @@ -/** - * @RDE_HEADER@ - * Stub header for CODEGEN_DATABASE generated code (BUILD_RTI=OFF) - * This file is generated by CODEGEN_DATABASE macro when BUILD_RTI=ON - * For BUILD_RTI=OFF builds, this stub provides the minimal interface - */ -#pragma once - -#include - -namespace Database -{ -// Stub struct for EquipmentExerciseMapping -struct EquipmentExerciseMapping -{ - int equipmentId = 0; - int exerciseId = 0; -}; -} // namespace Database - -namespace ParticipantManagement -{ - -/** - * @brief Base class for database interface implementation - * - * This class is normally generated by CODEGEN_DATABASE macro. - * This stub provides minimal interface for BUILD_RTI=OFF builds. - */ -class DatabaseInterfaceImpl : public QObject -{ - Q_OBJECT -public: - explicit DatabaseInterfaceImpl(QObject *parent = nullptr) : QObject(parent) {} - virtual ~DatabaseInterfaceImpl() = default; - - // Virtual methods that can be overridden by custom implementations - virtual bool removeEquipmentExerciseMapping(const Database::EquipmentExerciseMapping &equipmentExerciseMapping) = 0; -}; - -} // namespace ParticipantManagement \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm_ftc.h b/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm_ftc.h deleted file mode 100644 index c01ee6063..000000000 --- a/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm_ftc.h +++ /dev/null @@ -1,44 +0,0 @@ -#pragma once - -// DDS-Stub-Header für ParticipantManagement FTC (Filter Topic Client) -// Generiert für Qt6-Migration ohne RTI DDS - -#include -#include -#include -#include -#include - -namespace ParticipantManagement -{ -namespace Interface -{ - -class Ftc -{ -public: - class ModifyTypeReplyHandler - { - public: - virtual ~ModifyTypeReplyHandler() = default; - virtual void onModifyTypeReply(const Core::FunctionReplyObject &replyObject) = 0; - }; - - Ftc() = default; - virtual ~Ftc() = default; - - virtual std::map getTypes() const - { - return std::map(); - } - - virtual Type type(int32_t typeId) const - { - Type t; - t.id = typeId; - return t; - } -}; - -} // namespace Interface -} // namespace ParticipantManagement \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm_translation.h b/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm_translation.h deleted file mode 100644 index 7a206602f..000000000 --- a/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm_translation.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -// Translation Helper für ParticipantManagement Module -// Wrapper für QObject::tr() in nicht-QObject Klassen - -#include -#include "ppmcommon_export.h" - -namespace ParticipantManagement -{ - -PPMCOMMON_EXPORT QString tr(const char *sourceText, const char *comment = nullptr, int n = -1); - -} // namespace ParticipantManagement \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm_types.h b/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm_types.h deleted file mode 100644 index 3bcdd762f..000000000 --- a/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm_types.h +++ /dev/null @@ -1,40 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Typ-Definitionen - -#include -#include -#include "ppm_enums.hpp" - -namespace ParticipantManagement -{ - -// STUB: Type - wird durch echten DDS-Typ ersetzt -struct Type -{ - int id = 0; - QString name; - TypeClass typeClass = TypeClass::Unknown; - // Weitere Felder werden bei Bedarf ergänzt -}; - -// STUB: Participant - wird durch echten DDS-Typ ersetzt -struct Participant -{ - int id = 0; - QString name; - QString callsign; - Type type; - // Weitere Felder werden bei Bedarf ergänzt -}; - -// Stream-Operator für Logger-Unterstützung -inline std::ostream& operator<<(std::ostream& os, const Participant& participant) -{ - os << "Participant(id=" << participant.id << ", name=" << participant.name.toStdString() - << ", callsign=" << participant.callsign.toStdString() << ")"; - return os; -} - -} // namespace ParticipantManagement \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/PresentationManagement/pre_dtc.h b/qt6-after/qt6-migrated-legatus/include/PresentationManagement/pre_dtc.h deleted file mode 100644 index c962b3ebc..000000000 --- a/qt6-after/qt6-migrated-legatus/include/PresentationManagement/pre_dtc.h +++ /dev/null @@ -1,190 +0,0 @@ -/** - * @file pre_dtc.h - * @brief DDS-generated Stub-Header für PresentationManagement DTC (Data Transfer Component) - * - * Dieser Header ist ein Stub für den von RTI DDS Generator erzeugten Header. - * Ermöglicht Build ohne echte DDS-Codegenerierung. - */ - -#pragma once - -#include -#include -#include -#include -#include - -namespace PresentationManagement -{ - -// Forward declarations -struct Presentation; -struct PresentationContent; -struct GetPresentationContentReply; - -// FileStatus Enum - Status einer Präsentation -enum class FileStatus : int { Valid = 0, Deleted = 1 }; - -// Presentation - DDS-generierter Typ für Präsentationen -struct Presentation -{ - int32_t id = 0; - QString name; - QString description; - int32_t operatorId = 0; - qint64 lastModified = 0; - FileStatus fileStatus = FileStatus::Valid; -}; - -// PresentationContent - Inhalt einer Präsentation -struct PresentationContent -{ - QString attributes; - QString channel; - QString description; - int32_t duration = 0; - double height = 0.0; - int32_t id = 0; - int32_t index = 0; - int32_t presentationId = 0; - QString presentationTopicType; - qint64 startTime = 0; - double width = 0.0; - double x = 0.0; - double y = 0.0; -}; - -// GetPresentationContentReply - Reply für GetPresentationContent Request -struct GetPresentationContentReply -{ - QList content; -}; - -namespace Interface -{ - -/** - * @brief Dtc - Data Transfer Component für Presentation Management - * - * DDS-generierte Klasse mit Präsentation-Daten und Signalen für Änderungen. - */ -class Dtc : public QObject -{ - Q_OBJECT - - public: - Dtc() = default; - ~Dtc() override = default; - - // Präsentations-Liste abrufen (Callback-basiert) - void presentations(const std::function& callback) const - { - for (const auto& p : m_presentations) - { - callback(p); - } - } - - // Präsentations-Liste als QList (für direkten Zugriff) - QList presentationsList() const - { - return m_presentations; - } - - // Präsentation hinzufügen/entfernen/ändern - void addPresentation(const Presentation& p) - { - m_presentations.append(p); - emit presentationChanged(p, 0); // 0 = added - } - - void updatePresentation(const Presentation& p) - { - for (auto& existing : m_presentations) - { - if (existing.id == p.id) - { - existing = p; - emit presentationChanged(p, 1); // 1 = modified - return; - } - } - addPresentation(p); - } - - void removePresentation(int id) - { - for (auto it = m_presentations.begin(); it != m_presentations.end(); ++it) - { - if (it->id == id) - { - Presentation removed = *it; - m_presentations.erase(it); - emit presentationChanged(removed, 2); // 2 = removed - return; - } - } - } - - // Content getter/setter für PresentationContent - void content(const std::function& callback) const - { - for (const auto& c : m_content) - { - callback(c); - } - } - - QList contentList() const - { - return m_content; - } - - void setContent(const QList& content) - { - m_content = content; - } - - signals: - // Signal für Präsentations-Änderungen - void presentationChanged(const Presentation& presentation, int modificationType); - - private: - QList m_presentations; - QList m_content; -}; - -/** - * @brief Ftc - Filter Topic Client für Presentation Management - * - * DDS-generierte Klasse für Presentation-Client-Operationen. - */ -class Ftc -{ - public: - using ModifyTypeReplyHandler = std::function; - - virtual ~Ftc() = default; - - /** - * @brief Factory-Methode zur Erstellung einer Ftc-Instanz - * @param connector DDS-Connector (wird im Stub ignoriert) - * @return Shared Pointer zur Ftc-Instanz (nullptr im Stub) - */ - static std::shared_ptr create(void* /*connector*/) - { - return nullptr; // Stub returns nullptr - actual implementation requires DDS - } - - // PresentationModify Reply Handler - virtual void presentationModifyReply(ModifyTypeReplyHandler handler) = 0; - - // PresentationRemove Reply Handler - virtual void presentationRemoveReply(ModifyTypeReplyHandler handler) = 0; - - // GetPresentationContent Reply Handler - virtual void getPresentationContentReply(const GetPresentationContentReply& reply) = 0; -}; - -} // namespace Interface -} // namespace PresentationManagement diff --git a/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_dtc_impl.cpp b/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_dtc_impl.cpp deleted file mode 100644 index f65706c09..000000000 --- a/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_dtc_impl.cpp +++ /dev/null @@ -1,259 +0,0 @@ -/** - * Stub implementation for DtcImpl base class - * Qt6 Migration - provides minimal stub implementations - */ - -#include "pdm_dtc_impl.h" -#include - -namespace ProjectDataManagement -{ -namespace Interface -{ - -DtcImpl::DtcImpl(const std::shared_ptr &ddsConnector) - : m_ddsConnector(ddsConnector) -{ -} - -DtcImpl::~DtcImpl() = default; - -// Data access methods - stub implementations -ChargeTypeData DtcImpl::chargeType(int /*chargeTypeId*/) -{ - return ChargeTypeData(); -} - -IgniterType DtcImpl::igniterType(int /*igniterTypeId*/) -{ - return IgniterType(); -} - -IgniterFunction DtcImpl::igniterFunction(int /*igniterFunctionId*/) -{ - return IgniterFunction(); -} - -LoadType DtcImpl::loadType(int /*loadTypeId*/) -{ - return LoadType(); -} - -GearType DtcImpl::gearType(int /*gearTypeId*/) -{ - return GearType(); -} - -int DtcImpl::targetType(int /*targetTypeId*/) -{ - return 0; -} - -TargetSubType DtcImpl::targetSubType(int /*targetSubTypeId*/) -{ - return TargetSubType(); -} - -// Collection getters - stub implementations -QMap DtcImpl::chargeTypes() -{ - return QMap(); -} - -QVector DtcImpl::igniterTypes() -{ - return QVector(); -} - -QVector DtcImpl::igniterFunctions() -{ - return QVector(); -} - -QVector DtcImpl::loadTypes() -{ - return QVector(); -} - -QVector DtcImpl::gearTypes() -{ - return QVector(); -} - -QVector DtcImpl::targetTypes() -{ - return QVector(); -} - -QVector DtcImpl::targetSubTypes() -{ - return QVector(); -} - -QVector DtcImpl::chargeTypeIgniterTypeIgniterFunctions() -{ - return QVector(); -} - -QVector DtcImpl::chargeTypeLoadTypes() -{ - return QVector(); -} - -QVector DtcImpl::gearTypeChargeTypes() -{ - return QVector(); -} - -QVector DtcImpl::buildingChargeEffects() -{ - return QVector(); -} - -// isEnabled checks - stub implementations -bool DtcImpl::isChargeTypeEnabled() -{ - return false; -} - -bool DtcImpl::isIgniterTypeEnabled() -{ - return false; -} - -bool DtcImpl::isIgniterFunctionEnabled() -{ - return false; -} - -bool DtcImpl::isLoadTypeEnabled() -{ - return false; -} - -bool DtcImpl::isGearTypeEnabled() -{ - return false; -} - -bool DtcImpl::isTargetTypeEnabled() -{ - return false; -} - -bool DtcImpl::isTargetSubTypeEnabled() -{ - return false; -} - -bool DtcImpl::isChargeTypeIgniterTypeIgniterFunctionEnabled() -{ - return false; -} - -bool DtcImpl::isChargeTypeLoadTypeEnabled() -{ - return false; -} - -bool DtcImpl::isGearTypeChargeTypeEnabled() -{ - return false; -} - -bool DtcImpl::isBuildingChargeEffectEnabled() -{ - return false; -} - -// waitForHistoricalData methods - stub implementations -void DtcImpl::waitForHistoricalDataChargeType(int /*timeout_ms*/) -{ -} - -void DtcImpl::waitForHistoricalDataIgniterType(int /*timeout_ms*/) -{ -} - -void DtcImpl::waitForHistoricalDataIgniterFunction(int /*timeout_ms*/) -{ -} - -void DtcImpl::waitForHistoricalDataLoadType(int /*timeout_ms*/) -{ -} - -void DtcImpl::waitForHistoricalDataGearType(int /*timeout_ms*/) -{ -} - -void DtcImpl::waitForHistoricalDataTargetType(int /*timeout_ms*/) -{ -} - -void DtcImpl::waitForHistoricalDataTargetSubType(int /*timeout_ms*/) -{ -} - -void DtcImpl::waitForHistoricalDataChargeTypeIgniterTypeIgniterFunction(int /*timeout_ms*/) -{ -} - -void DtcImpl::waitForHistoricalDataChargeTypeLoadType(int /*timeout_ms*/) -{ -} - -void DtcImpl::waitForHistoricalDataGearTypeChargeType(int /*timeout_ms*/) -{ -} - -void DtcImpl::waitForHistoricalDataBuildingChargeEffect(int /*timeout_ms*/) -{ -} - -// Additional enable methods for pdm_handler.cpp -void DtcImpl::enableGearType(bool /*enable*/) -{ -} - -void DtcImpl::enableGearTypeChargeType(bool /*enable*/) -{ -} - -void DtcImpl::enableTargetTypeTargetSubType(bool /*enable*/) -{ -} - -void DtcImpl::enableRadioGroup(bool /*enable*/) -{ -} - -void DtcImpl::enableVulnerabilityKind(bool /*enable*/) -{ -} - -void DtcImpl::enableBuildingChargeEffect(bool /*enable*/) -{ -} - -// Additional waitForHistoricalData methods for pdm_handler.cpp -void DtcImpl::waitForHistoricalDataTargetTypeTargetSubType(int /*timeout_ms*/) -{ -} - -void DtcImpl::waitForHistoricalDataRadioGroup(int /*timeout_ms*/) -{ -} - -void DtcImpl::waitForHistoricalDataVulnerabilityKind(int /*timeout_ms*/) -{ -} - -// Helper methods -QJsonObject DtcImpl::propertiesToJson(const std::string & /*properties*/) -{ - return QJsonObject(); -} - -} // namespace Interface -} // namespace ProjectDataManagement diff --git a/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_enums.hpp b/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_enums.hpp deleted file mode 100644 index 1f1bb233a..000000000 --- a/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_enums.hpp +++ /dev/null @@ -1,7 +0,0 @@ -// Stub file for pdm_enums.hpp - used when BUILD_RTI=OFF -#ifndef PDM_ENUMS_HPP -#define PDM_ENUMS_HPP - -// Minimal stub - actual enums generated by rtiddsgen when BUILD_RTI=ON - -#endif // PDM_ENUMS_HPP \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_operator_rights.h b/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_operator_rights.h deleted file mode 100644 index 63929e2fc..000000000 --- a/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_operator_rights.h +++ /dev/null @@ -1,34 +0,0 @@ - -/** -* Operator Rights definitions -*/ - -// warning: this file is generated with command -// Lts/Common/CodeGen/codegen_simple.py ALL Lts/Services/ProjectDataManagement/pdm_service.xml build/Lts/Services/ProjectDataManagement/ -// at Sun Sep 6 18:00:15 2026 -// it will be overwritten by next run - do not modify! - -#pragma once - -namespace ProjectDataManagement -{ - static const int Offset = 29; -} - -namespace OperatorRights -{ -enum Charges -{ - ChargeVisibilityEdit = 0x1d010001, -}; - -enum Groups_ProjectDataManagement -{ - GroupChargeVisibility = 0x1d010000, -}; - -enum Plugins_ProjectDataManagement -{ - PluginCharges = 0x1d010000, -}; -} // namespace OperatorRights diff --git a/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_translation.h b/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_translation.h deleted file mode 100644 index 47f5b0753..000000000 --- a/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_translation.h +++ /dev/null @@ -1,7 +0,0 @@ -// Stub file for pdm_translation.h - used when BUILD_GRANTLEE=OFF -#ifndef PDM_TRANSLATION_H -#define PDM_TRANSLATION_H - -// Minimal stub - actual translation generated by codegen when BUILD_GRANTLEE=ON - -#endif // PDM_TRANSLATION_H \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_types.h b/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_types.h deleted file mode 100644 index 0ceaae0c6..000000000 --- a/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_types.h +++ /dev/null @@ -1,15 +0,0 @@ -// Stub file for pdm_types.h - used when BUILD_GRANTLEE=OFF -#ifndef PDM_TYPES_H -#define PDM_TYPES_H - -#include - -namespace ProjectDataManagement { - -enum class EventType : std::int32_t { - Unknown = 0 -}; - -} // namespace ProjectDataManagement - -#endif // PDM_TYPES_H \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/RecordingManagement/rec_db_impl.h b/qt6-after/qt6-migrated-legatus/include/RecordingManagement/rec_db_impl.h deleted file mode 100644 index 0d0c218f1..000000000 --- a/qt6-after/qt6-migrated-legatus/include/RecordingManagement/rec_db_impl.h +++ /dev/null @@ -1,41 +0,0 @@ -/** - * @RDE_HEADER@ - * Stub header for CODEGEN_DATABASE generated code (BUILD_RTI=OFF) - * This file is generated by CODEGEN_DATABASE macro when BUILD_RTI=ON - * For BUILD_RTI=OFF builds, this stub provides the minimal interface - */ -#pragma once - -#include - -namespace Database -{ -// Stub struct for RecSnapshot -struct RecSnapshot -{ - qint64 id = 0; - // Add other fields as needed -}; -} // namespace Database - -namespace RecordingManagement -{ - -/** - * @brief Base class for database interface implementation - * - * This class is normally generated by CODEGEN_DATABASE macro. - * This stub provides minimal interface for BUILD_RTI=OFF builds. - */ -class DatabaseInterfaceImpl : public QObject -{ - Q_OBJECT -public: - explicit DatabaseInterfaceImpl(QObject *parent = nullptr) : QObject(parent) {} - virtual ~DatabaseInterfaceImpl() = default; - - // Virtual methods that can be overridden by custom implementations - virtual bool removeNewerEqual(const Database::RecSnapshot &data) = 0; -}; - -} // namespace RecordingManagement \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/ReportManagement/rep_dtc.h b/qt6-after/qt6-migrated-legatus/include/ReportManagement/rep_dtc.h deleted file mode 100644 index a5c0fbce0..000000000 --- a/qt6-after/qt6-migrated-legatus/include/ReportManagement/rep_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace ReportManagement -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace ReportManagement diff --git a/qt6-after/qt6-migrated-legatus/include/ScenarioManagement/scm_dtc.h b/qt6-after/qt6-migrated-legatus/include/ScenarioManagement/scm_dtc.h deleted file mode 100644 index 22d8d9a43..000000000 --- a/qt6-after/qt6-migrated-legatus/include/ScenarioManagement/scm_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace ServiceManagement -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace ServiceManagement diff --git a/qt6-after/qt6-migrated-legatus/include/Services/AreaEffectSimulation/aes.hpp b/qt6-after/qt6-migrated-legatus/include/Services/AreaEffectSimulation/aes.hpp deleted file mode 100644 index 78bdb280b..000000000 --- a/qt6-after/qt6-migrated-legatus/include/Services/AreaEffectSimulation/aes.hpp +++ /dev/null @@ -1,93 +0,0 @@ -#pragma once -// STUB-HEADER: Diese Datei wird normalerweise von DDS generiert -// Für die Migration erstellen wir minimale Typ-Definitionen - -#include -#include -#include - -namespace AreaEffectSimulation -{ - -// Forward declarations -struct ExplosionSingle; -struct EffectCluster; -struct AirSupportImpact; -struct OffRouteMine; -struct TrajectoryAdler; - -// ExplosionSingle - Einzelne Explosion -struct ExplosionSingle { - int id = 0; - double x = 0.0; - double y = 0.0; - double z = 0.0; - double radius = 0.0; - double damage = 0.0; - qint64 timestamp = 0; - QString type; -}; - -// EffectCluster - Gruppe von Effekten -struct EffectCluster { - int id = 0; - QString name; - double x = 0.0; - double y = 0.0; - double z = 0.0; - QList effectIds; - qint64 timestamp = 0; -}; - -// AirSupportImpact - Luftunterstützungseffekt -struct AirSupportImpact { - int id = 0; - double x = 0.0; - double y = 0.0; - double z = 0.0; - QString aircraftType; - QString weaponType; - qint64 timestamp = 0; -}; - -// OffRouteMine - Abseits-Mine -struct OffRouteMine { - int id = 0; - double x = 0.0; - double y = 0.0; - double z = 0.0; - bool active = true; - QString mineType; - qint64 timestamp = 0; -}; - -// TrajectoryAdler - Flugbahn für Adler -struct TrajectoryAdler { - int id = 0; - QList xPoints; - QList yPoints; - QList zPoints; - qint64 timestamp = 0; - QString trajectoryType; -}; - -// AesFilter - Filter für Area Effect Simulation Entities -class AesFilter { -public: - AesFilter() = default; - virtual ~AesFilter() = default; - - // ID getter/setter - int id() const { return m_id; } - void setId(int id) { m_id = id; } - - // Content getter/setter für DDS-Daten - QString content() const { return m_content; } - void setContent(const QString& content) { m_content = content; } - -private: - int m_id = 0; - QString m_content; -}; - -} // namespace AreaEffectSimulation \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/Services/InfrastructureManagement/ism_dtc.h b/qt6-after/qt6-migrated-legatus/include/Services/InfrastructureManagement/ism_dtc.h deleted file mode 100644 index b62a281ef..000000000 --- a/qt6-after/qt6-migrated-legatus/include/Services/InfrastructureManagement/ism_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace InfrastructureManagement -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace InfrastructureManagement diff --git a/qt6-after/qt6-migrated-legatus/include/Services/InfrastructureManagement/ism_ftc.h b/qt6-after/qt6-migrated-legatus/include/Services/InfrastructureManagement/ism_ftc.h deleted file mode 100644 index 9687b5cff..000000000 --- a/qt6-after/qt6-migrated-legatus/include/Services/InfrastructureManagement/ism_ftc.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once -// STUB-HEADER: Diese Datei wird normalerweise von ddsftc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace InfrastructureManagement -{ -namespace Interface -{ - class Ftc; -} -} \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/Services/PresentationManagement/pre_ftc.h b/qt6-after/qt6-migrated-legatus/include/Services/PresentationManagement/pre_ftc.h deleted file mode 100644 index 5750d3dab..000000000 --- a/qt6-after/qt6-migrated-legatus/include/Services/PresentationManagement/pre_ftc.h +++ /dev/null @@ -1,59 +0,0 @@ -/** - * @file pre_ftc.h - * @brief Stub-Header für PresentationManagement FTC (Filter Topic Client) - * - * Dieser Header ist ein Stub für den von RTI DDS Generator erzeugten Header. - * Ermöglicht Build ohne echte DDS-Codegenerierung wenn BUILD_RTI=OFF. - */ - -#pragma once - -#include -#include - -namespace PresentationManagement -{ - -// Forward declarations -struct Presentation; -struct PresentationContent; -struct GetPresentationContentReply; - -namespace Interface -{ - -/** - * @brief Ftc - Filter Topic Client für Presentation Management - * - * Stub-Implementation für DDS-generierten FTC. - * Gibt nullptr zurück da keine echte DDS-Verbindung verfügbar. - */ -class Ftc -{ - public: - using ModifyTypeReplyHandler = std::function; - - virtual ~Ftc() = default; - - /** - * @brief Factory-Methode zur Erstellung einer Ftc-Instanz - * @param connector DDS-Connector (wird im Stub ignoriert) - * @return Shared Pointer zur Ftc-Instanz (nullptr im Stub) - */ - static std::shared_ptr create(void* /*connector*/) - { - return nullptr; // Stub returns nullptr - actual implementation requires DDS - } - - // PresentationModify Reply Handler - virtual void presentationModifyReply(ModifyTypeReplyHandler /*handler*/) = 0; - - // PresentationRemove Reply Handler - virtual void presentationRemoveReply(ModifyTypeReplyHandler /*handler*/) = 0; - - // GetPresentationContent Reply Handler - virtual void getPresentationContentReply(const GetPresentationContentReply& /*reply*/) = 0; -}; - -} // namespace Interface -} // namespace PresentationManagement \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/SituationReplay/srp_dtc.h b/qt6-after/qt6-migrated-legatus/include/SituationReplay/srp_dtc.h deleted file mode 100644 index 71662d223..000000000 --- a/qt6-after/qt6-migrated-legatus/include/SituationReplay/srp_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace SituationReplay -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace SituationReplay diff --git a/qt6-after/qt6-migrated-legatus/include/SituationReplayManagement/srm_dtc.h b/qt6-after/qt6-migrated-legatus/include/SituationReplayManagement/srm_dtc.h deleted file mode 100644 index 452338f5e..000000000 --- a/qt6-after/qt6-migrated-legatus/include/SituationReplayManagement/srm_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace SituationReplayManagement -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace SituationReplayManagement diff --git a/qt6-after/qt6-migrated-legatus/include/Skeleton/skl_dtc.h b/qt6-after/qt6-migrated-legatus/include/Skeleton/skl_dtc.h deleted file mode 100644 index 313cf92cd..000000000 --- a/qt6-after/qt6-migrated-legatus/include/Skeleton/skl_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace Skeleton -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace Skeleton diff --git a/qt6-after/qt6-migrated-legatus/include/SoundManagement/som_dtc.h b/qt6-after/qt6-migrated-legatus/include/SoundManagement/som_dtc.h deleted file mode 100644 index 0956c4a91..000000000 --- a/qt6-after/qt6-migrated-legatus/include/SoundManagement/som_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace SoundManagement -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace SoundManagement diff --git a/qt6-after/qt6-migrated-legatus/include/TargetManagement/tgt_dtc.h b/qt6-after/qt6-migrated-legatus/include/TargetManagement/tgt_dtc.h deleted file mode 100644 index e105df868..000000000 --- a/qt6-after/qt6-migrated-legatus/include/TargetManagement/tgt_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace TargetManagement -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace TargetManagement diff --git a/qt6-after/qt6-migrated-legatus/include/TrainingAreaBase/tab_dtc.h b/qt6-after/qt6-migrated-legatus/include/TrainingAreaBase/tab_dtc.h deleted file mode 100644 index c81da3ffd..000000000 --- a/qt6-after/qt6-migrated-legatus/include/TrainingAreaBase/tab_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace TrainingAreaBase -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace TrainingAreaBase diff --git a/qt6-after/qt6-migrated-legatus/include/TrainingAreaBaseOC/taboc_dtc.h b/qt6-after/qt6-migrated-legatus/include/TrainingAreaBaseOC/taboc_dtc.h deleted file mode 100644 index 5e5e69eb8..000000000 --- a/qt6-after/qt6-migrated-legatus/include/TrainingAreaBaseOC/taboc_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace TrainingAreaBaseOC -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace TrainingAreaBaseOC diff --git a/qt6-after/qt6-migrated-legatus/include/WarehouseGuez/whg_dtc.h b/qt6-after/qt6-migrated-legatus/include/WarehouseGuez/whg_dtc.h deleted file mode 100644 index 6bdff0ea4..000000000 --- a/qt6-after/qt6-migrated-legatus/include/WarehouseGuez/whg_dtc.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert -// Für die Migration erstellen wir minimale Forward-Declarations - -namespace WarehouseGuez -{ -namespace Interface -{ -class Dtc; -class Ftc; -} // namespace Interface -} // namespace WarehouseGuez diff --git a/qt6-after/qt6-migrated-legatus/tests/test_ces_dtc.cpp b/qt6-after/qt6-migrated-legatus/tests/test_ces_dtc.cpp deleted file mode 100644 index fc75c1f28..000000000 --- a/qt6-after/qt6-migrated-legatus/tests/test_ces_dtc.cpp +++ /dev/null @@ -1,16 +0,0 @@ -/** - * @file test_ces_dtc.cpp - * @brief Compilation test for CentralEffectSimulation/ces_dtc.h - * - * This test verifies that the migrated header compiles correctly with Qt6/C++23. - */ - -#include "CentralEffectSimulation/ces_dtc.h" - -#include - -TEST(ces_dtc_Compilation, HeaderCompiles) -{ - // This test verifies that the header compiles without errors - EXPECT_TRUE(true); -} diff --git a/qt6-after/qt6-migrated-legatus/tests/test_cmo_dtc.cpp b/qt6-after/qt6-migrated-legatus/tests/test_cmo_dtc.cpp deleted file mode 100644 index b56f21fc8..000000000 --- a/qt6-after/qt6-migrated-legatus/tests/test_cmo_dtc.cpp +++ /dev/null @@ -1,16 +0,0 @@ -/** - * @file test_cmo_dtc.cpp - * @brief Compilation test for ComponentMonitor/cmo_dtc.h - * - * This test verifies that the migrated header compiles correctly with Qt6/C++23. - */ - -#include "ComponentMonitor/cmo_dtc.h" - -#include - -TEST(cmo_dtc_Compilation, HeaderCompiles) -{ - // This test verifies that the header compiles without errors - EXPECT_TRUE(true); -} diff --git a/qt6-after/qt6-migrated-legatus/tests/test_gna_dtc.cpp b/qt6-after/qt6-migrated-legatus/tests/test_gna_dtc.cpp deleted file mode 100644 index a40b8d143..000000000 --- a/qt6-after/qt6-migrated-legatus/tests/test_gna_dtc.cpp +++ /dev/null @@ -1,16 +0,0 @@ -/** - * @file test_gna_dtc.cpp - * @brief Compilation test for GuezNasat/gna_dtc.h - * - * This test verifies that the migrated header compiles correctly with Qt6/C++23. - */ - -#include "GuezNasat/gna_dtc.h" - -#include - -TEST(gna_dtc_Compilation, HeaderCompiles) -{ - // This test verifies that the header compiles without errors - EXPECT_TRUE(true); -} diff --git a/qt6-after/qt6-migrated-legatus/tests/test_migration_stubs.cpp b/qt6-after/qt6-migrated-legatus/tests/test_migration_stubs.cpp deleted file mode 100644 index 3de5c5354..000000000 --- a/qt6-after/qt6-migrated-legatus/tests/test_migration_stubs.cpp +++ /dev/null @@ -1,227 +0,0 @@ -/** - * @file test_migration_stubs.cpp - * @brief Compilation tests for migrated stub headers (DTCs and enums) - * - * This test file verifies that all migrated stub headers compile correctly - * with Qt6 and C++23. These are forward declaration stubs that would normally - * be generated by DDS DTC tooling. - */ - -#include -#include - -// Test that the test framework is working -TEST(MigrationStubs, TestFrameworkWorks) -{ - EXPECT_TRUE(true); -} - -// Test that basic Qt6 types are available -TEST(MigrationStubs, Qt6TypesAvailable) -{ - QString test = QStringLiteral("Qt6 migration"); - EXPECT_FALSE(test.isEmpty()); -} - -// DTC Stub Headers - these are forward declarations only -// Each include verifies the header compiles without errors - -// AlarmManagement -#include "AlarmManagement/alm_dtc.h" - -TEST(MigrationStubs, AlarmManagementDtcCompiles) -{ - // Forward declaration only - verify namespace exists - using namespace AlarmManagement::Interface; - EXPECT_TRUE(true); -} - -// AreaEffectSimulation -#include "AreaEffectSimulation/aes_dtc.h" - -TEST(MigrationStubs, AreaEffectSimulationDtcCompiles) -{ - using namespace AreaEffectSimulation::Interface; - EXPECT_TRUE(true); -} - -// AssetManagement -#include "AssetManagement/asm_dtc.h" - -TEST(MigrationStubs, AssetManagementDtcCompiles) -{ - using namespace AssetManagement::Interface; - EXPECT_TRUE(true); -} - -// AudioVideoManagement -#include "AudioVideoManagement/avm_dtc.h" - -TEST(MigrationStubs, AudioVideoManagementDtcCompiles) -{ - using namespace AudioVideoManagement::Interface; - EXPECT_TRUE(true); -} - -// Buildings -#include "Buildings/bld_dtc.h" - -TEST(MigrationStubs, BuildingsDtcCompiles) -{ - using namespace Buildings::Interface; - EXPECT_TRUE(true); -} - -// CentralEffectSimulation -#include "CentralEffectSimulation/ces_dtc.h" - -TEST(MigrationStubs, CentralEffectSimulationDtcCompiles) -{ - using namespace CentralEffectSimulation::Interface; - EXPECT_TRUE(true); -} - -// CodificationManagement -#include "CodificationManagement/cod_dtc.h" - -TEST(MigrationStubs, CodificationManagementDtcCompiles) -{ - using namespace CodificationManagement::Interface; - EXPECT_TRUE(true); -} - -// ComponentMonitor -#include "ComponentMonitor/cmo_dtc.h" - -TEST(MigrationStubs, ComponentMonitorDtcCompiles) -{ - using namespace ComponentMonitor::Interface; - EXPECT_TRUE(true); -} - -// Core -#include "Core/core_dtc.h" - -TEST(MigrationStubs, CoreDtcCompiles) -{ - using namespace DDS::Core::Interface; - EXPECT_TRUE(true); -} - -// DDS Core -#include "Core/core_dtc.h" - -TEST(MigrationStubs, DDSCoreDtcCompiles) -{ - using namespace DDS::Core::Interface; - EXPECT_TRUE(true); -} - -// DDS DTC -#include "DDS/DTC/generic_dtc.h" - -TEST(MigrationStubs, DDSDtcCompiles) -{ - using namespace DTC; - EXPECT_TRUE(true); -} - -// EffectShowClient -#include "EffectShowClient/esc_dtc.h" - -TEST(MigrationStubs, EffectShowClientDtcCompiles) -{ - using namespace EffectShowClient::Interface; - EXPECT_TRUE(true); -} - -// EffectShowManagement -#include "EffectShowManagement/esm_dtc.h" - -TEST(MigrationStubs, EffectShowManagementDtcCompiles) -{ - using namespace EffectShowManagement::Interface; - EXPECT_TRUE(true); -} - -// Evaluations -#include "Evaluations/evl_dtc.h" - -TEST(MigrationStubs, EvaluationsDtcCompiles) -{ - using namespace Evaluations::Interface; - EXPECT_TRUE(true); -} - -// ExerciseEventManagement -#include "ExerciseEventManagement/eem_dtc.h" - -TEST(MigrationStubs, ExerciseEventManagementDtcCompiles) -{ - using namespace ExerciseEventManagement::Interface; - EXPECT_TRUE(true); -} - -// ExerciseManagement -#include "ExerciseManagement/exm_dtc.h" - -TEST(MigrationStubs, ExerciseManagementDtcCompiles) -{ - using namespace ExerciseManagement::Interface; - EXPECT_TRUE(true); -} - -// FileManagement -#include "FileManagement/flm_dtc.h" - -TEST(MigrationStubs, FileManagementDtcCompiles) -{ - using namespace FileManagement::Interface; - EXPECT_TRUE(true); -} - -// GuezIedManagement -#include "GuezIedManagement/gim_dtc.h" - -TEST(MigrationStubs, GuezIedManagementDtcCompiles) -{ - using namespace GuezIedManagement::Interface; - EXPECT_TRUE(true); -} - -// GuezNasat -#include "GuezNasat/gna_dtc.h" - -TEST(MigrationStubs, GuezNasatDtcCompiles) -{ - using namespace GuezNasat::Interface; - EXPECT_TRUE(true); -} - -// InfrastructureManagement -#include "InfrastructureManagement/ism_dtc.h" - -TEST(MigrationStubs, InfrastructureManagementDtcCompiles) -{ - using namespace InfrastructureManagement::Interface; - EXPECT_TRUE(true); -} - -// Generic DTC (already included via DDS/DTC/generic_dtc.h) -// Classes are in DTC namespace, not Generic - -TEST(MigrationStubs, GenericDtcCompiles) -{ - using namespace DTC; - // Verify GenericDtc template is accessible - EXPECT_TRUE(true); -} - -// AES DTC (root level) - uses AreaEffectSimulation::Interface namespace -#include "aes_dtc.h" - -TEST(MigrationStubs, AesDtcCompiles) -{ - using namespace AreaEffectSimulation::Interface; - EXPECT_TRUE(true); -} diff --git a/qt6-after/qt6-migrated-legatus/tests/test_scm_dtc.cpp b/qt6-after/qt6-migrated-legatus/tests/test_scm_dtc.cpp deleted file mode 100644 index dc1a21e89..000000000 --- a/qt6-after/qt6-migrated-legatus/tests/test_scm_dtc.cpp +++ /dev/null @@ -1,16 +0,0 @@ -/** - * @file test_scm_dtc.cpp - * @brief Compilation test for include/ScenarioManagement/scm_dtc.h - * - * This test verifies that the migrated header compiles correctly with Qt6/C++23. - */ - -#include "include/ScenarioManagement/scm_dtc.h" - -#include - -TEST(scm_dtc_Compilation, HeaderCompiles) -{ - // This test verifies that the header compiles without errors - EXPECT_TRUE(true); -} diff --git a/qt6-after/qt6-migrated-legatus/tests/test_skl_dtc.cpp b/qt6-after/qt6-migrated-legatus/tests/test_skl_dtc.cpp deleted file mode 100644 index b399ecd6c..000000000 --- a/qt6-after/qt6-migrated-legatus/tests/test_skl_dtc.cpp +++ /dev/null @@ -1,16 +0,0 @@ -/** - * @file test_skl_dtc.cpp - * @brief Compilation test for include/Skeleton/skl_dtc.h - * - * This test verifies that the migrated header compiles correctly with Qt6/C++23. - */ - -#include "include/Skeleton/skl_dtc.h" - -#include - -TEST(skl_dtc_Compilation, HeaderCompiles) -{ - // This test verifies that the header compiles without errors - EXPECT_TRUE(true); -}