Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen

- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung - 44 Export-Header Include-Pfade korrigiert (_export.h) - 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h) - INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros - Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits) - FATAL_LOG Makro hinzugefügt - InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h) - FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h) - AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp) - SymbolAppearance Klasse vollständig definiert mit content() Methode - BuildingComponentFilter Klasse definiert mit Copy-Konstruktor - Ftc Factory: nullptr Return (abstract class) - AesFilter Klasse in aes.hpp hinzugefügt - Dtc Klasse in ppm.hpp mit participantChanged Signal - AesType Enum: alle 15 At* Werte definiert - AesEffectState_def: EsReceived hinzugefügt - DataModification Enum: eAdded/eModified/eRemoved - function_reply_object.h → core_types.h Include-Pfad (72 Dateien) - Enum-Class-Streaming Template-Operator in INGLLogger.h - ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen - ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge - QRegExp → QRegularExpression in tpm_js_parser.cpp - .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert - Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
@@ -0,0 +1,94 @@
+/**
+ * @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 <cstdint>
+#include <string>
+#include "InfrastructureManagement/ism_enums.hpp"
+
+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) {}
+    
+    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; }
+    
+    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; }
+    
+private:
+    int32_t id_;
+    int32_t mainStructureElementId_;
+    MountingPointType mountingPointTypeId_;
+    Core::GeoPosition geoPosition_;
+    Core::RelativePosition relPosition_;
+    std::string properties_;
+    std::string name_;
+    std::string displayName_;
+};
+
+} // namespace InfrastructureManagement
+
+#endif // ISM_HPP
@@ -0,0 +1,12 @@
+#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;
+}
+}
@@ -0,0 +1,88 @@
+/**
+ * @file ism_enums.hpp
+ * @brief DDS-Stub-Header für InfrastructureManagement Enums
+ */
+
+#ifndef ISM_ENUMS_HPP
+#define ISM_ENUMS_HPP
+
+#include <cstdint>
+
+namespace InfrastructureManagement {
+
+// MountingPointType als enum class mit allen Werten
+enum class MountingPointType : int32_t {
+    Undefined = 0,
+    Generic = 1,
+    Sensor = 2,
+    Actuator = 3,
+    BuildingSensorModule = 4,
+    OutdoorCamera = 5,
+    IndoorCamera = 6,
+    OutdoorIPS = 7,
+    IndoorIPS = 8,
+    MeteoDataUnit = 9,
+    AnnouncementUnit = 10,
+    BuildingNetworkSwitch = 11,
+    EffectGenerationControlUnit = 12,
+    Unknown = 13
+};
+
+// MountingPointState als enum class mit allen Werten
+enum class MountingPointState : int32_t {
+    Undefined = 0,
+    Equipped = 1,
+    Empty = 2,
+    Idle = 3
+};
+
+// AimState als enum class
+enum class AimState : int32_t {
+    Undefined = 0,
+    Active = 1,
+    Inactive = 2
+};
+
+// DDS type wrapper für MountingPointType
+struct MountingPointType_def {
+    using type = MountingPointType;
+    
+    // Enum values als static members für Kompatibilität
+    static constexpr MountingPointType Undefined = MountingPointType::Undefined;
+    static constexpr MountingPointType Generic = MountingPointType::Generic;
+    static constexpr MountingPointType Sensor = MountingPointType::Sensor;
+    static constexpr MountingPointType Actuator = MountingPointType::Actuator;
+    static constexpr MountingPointType BuildingSensorModule = MountingPointType::BuildingSensorModule;
+    static constexpr MountingPointType OutdoorCamera = MountingPointType::OutdoorCamera;
+    static constexpr MountingPointType IndoorCamera = MountingPointType::IndoorCamera;
+    static constexpr MountingPointType OutdoorIPS = MountingPointType::OutdoorIPS;
+    static constexpr MountingPointType IndoorIPS = MountingPointType::IndoorIPS;
+    static constexpr MountingPointType MeteoDataUnit = MountingPointType::MeteoDataUnit;
+    static constexpr MountingPointType AnnouncementUnit = MountingPointType::AnnouncementUnit;
+    static constexpr MountingPointType BuildingNetworkSwitch = MountingPointType::BuildingNetworkSwitch;
+    static constexpr MountingPointType EffectGenerationControlUnit = MountingPointType::EffectGenerationControlUnit;
+    static constexpr MountingPointType Unknown = MountingPointType::Unknown;
+};
+
+// DDS type wrapper für MountingPointState
+struct MountingPointState_def {
+    using type = MountingPointState;
+    
+    static constexpr MountingPointState Undefined = MountingPointState::Undefined;
+    static constexpr MountingPointState Equipped = MountingPointState::Equipped;
+    static constexpr MountingPointState Empty = MountingPointState::Empty;
+    static constexpr MountingPointState Idle = MountingPointState::Idle;
+};
+
+// DDS type wrapper für AimState
+struct AimState_def {
+    using type = AimState;
+    
+    static constexpr AimState Undefined = AimState::Undefined;
+    static constexpr AimState Active = AimState::Active;
+    static constexpr AimState Inactive = AimState::Inactive;
+};
+
+} // namespace InfrastructureManagement
+
+#endif // ISM_ENUMS_HPP
@@ -0,0 +1,11 @@
+#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;
+}
+}