WIP: Build fixes und EXTERNAL_DEPENDENCIES.md

2026-08-21 07:04:40 +02:00
1 parent 85bae2e60a
commit 27fe03a03a
@@ -19,7 +19,7 @@
 #include <QUrl>
 #include <AreaEffectSimulation/aes_dtc.h>
 #include <AreaEffectSimulation/aes_ftc.h>
-#include <LtsUtilsCore/data_modification_enum.h>
+#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <ParticipantManagement/ppm.hpp>
 #include <ParticipantManagement/ppm.hpp>
@@ -14,7 +14,7 @@
 #include <TrainingAreaBase/dds_handler.h>
 #include <ProjectDataManagement/pdm.hpp>
 #include <ProjectDataManagement/pdm_dtc.h>
-#include <LtsUtilsCore/data_modification_enum.h>
+#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
 #include <QObject>
 #include <QHash>
 #include <QUrl>
@@ -15,7 +15,7 @@
 #include <ParticipantManagement/ppm.hpp>
 #include <ParticipantManagement/ppm.hpp>
 #include <ParticipantManagement/ppm_ftc.h>
-#include <LtsUtilsCore/data_modification_enum.h>
+#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
 #include <QTimer>
 #include <QObject>
 #include <QHash>
@@ -10,7 +10,7 @@

 #include <QObject>

-#include "LtsUtils/data_modification_enum.h"
+#include "LtsUtils/LtsUtilsCore/data_modification_enum.h"
 #include "ProjectDataManagement/pdm_types.h"

 namespace AlarmManagement
@@ -10,7 +10,7 @@

 #include <QObject>

-#include "LtsUtils/data_modification_enum.h"
+#include "LtsUtils/LtsUtilsCore/data_modification_enum.h"

 namespace AreaEffectSimulation
 {
@@ -5,9 +5,9 @@

 #include "gna_nasat_aircraft.h"
 #include "gna_nasat_aircraft_participant.h"
-#include "../ParticipantManagement/ppm_enums.hpp"
-#include "../ParticipantManagement/ppm.hpp"
-#include "../../Lts/Common/LtsUtils/LtsUtilsCore/data_modification_enum.h"
+#include <ParticipantManagement/ppm_enums.hpp>
+#include <ParticipantManagement/ppm.hpp>
+#include <LtsUtilsCore/data_modification_enum.h>

 #include <QObject>
 #include <QList>
@@ -3,11 +3,56 @@
 // STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
 // Für die Migration erstellen wir minimale Forward-Declarations

+#include <cstdint>
+#include <functional>
+#include <optional>
+#include <string>
+#include <vector>
+
+#include <QObject>
+
+#include "LtsUtils/LtsUtilsCore/data_modification_enum.h"
+#include "mrk_marker.h"
+
 namespace MarkerManagement
 {
+
 namespace Interface
 {
-class Dtc;
+
+// 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<void(const Marker&)> 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<void(const Marker&)> m_markerCallback;
+};
+
 class Ftc;
+
 } // namespace Interface
+
 } // namespace MarkerManagement
@@ -4,6 +4,7 @@
 // Für die Migration erstellen wir minimale Typ-Definitionen

 #include <QString>
+#include <vector>
 #include "mrkcommon_export.h"

 namespace MarkerManagement
@@ -12,6 +13,17 @@ namespace MarkerManagement
 // STUB: MarkerType enum
 enum class MarkerType : int { Unknown = 0, Situation = 1, Audio = 2, Video = 3 };

+// STUB: MarkerDescription - wird durch echten DDS-Typ ersetzt (muss VOR Marker deklariert werden)
+struct MRKCOMMON_EXPORT MarkerDescription
+{
+    int id = 0;
+    QString name;
+    MarkerType markerType() const { return MarkerType::Unknown; }
+    void setMarkerType(MarkerType type) { Q_UNUSED(type); }
+    std::string content() const { return ""; }
+    // Weitere Felder werden bei Bedarf ergänzt
+};
+
 // STUB: Marker - wird durch echten DDS-Typ ersetzt
 struct MRKCOMMON_EXPORT Marker
 {
@@ -19,17 +31,25 @@ struct MRKCOMMON_EXPORT Marker
    QString name;
    int exerciseId = 0;
    qint64 timeStamp() const { return 0; }
+    qint64 timeStampOffset() const { return 0; }
+    int operatorId() const { return 0; }
+    int fileContentId() const { return 0; }
+    std::string note() const { return ""; }
+    std::vector<MarkerDescription> descriptions() const { return {}; }
    // Weitere Felder werden bei Bedarf ergänzt
 };

-// STUB: MarkerDescription - wird durch echten DDS-Typ ersetzt
-struct MRKCOMMON_EXPORT MarkerDescription
+// STUB: toString Funktion für MarkerType
+inline QString toString(MarkerType type)
 {
-    int id = 0;
-    QString name;
-    MarkerType markerType() const { return MarkerType::Unknown; }
-    void setMarkerType(MarkerType type) { Q_UNUSED(type); }
-    // Weitere Felder werden bei Bedarf ergänzt
-};
+    switch (type)
+    {
+        case MarkerType::Unknown: return QStringLiteral("Unknown");
+        case MarkerType::Situation: return QStringLiteral("Situation");
+        case MarkerType::Audio: return QStringLiteral("Audio");
+        case MarkerType::Video: return QStringLiteral("Video");
+        default: return QStringLiteral("Unknown");
+    }
+}

 } // namespace MarkerManagement
@@ -3,8 +3,20 @@
 // STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
 // Für die Migration erstellen wir minimale Forward-Declarations

+#include <string>
+
 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;
@@ -12,8 +12,6 @@
 #include <memory>
 #include <ostream>

-#include "LtsUtils/data_modification_enum.h"
-
 namespace ParticipantManagement
 {

@@ -52,7 +50,7 @@ struct Participant {
  QString name() const { return internalName; }
  QString designator() const { return m_designator; }
  QString tacticalIdentifier() const { return m_tacticalIdentifier; }
-  std::optional<int> equipmentNumber() const { return equipmentNumber; }
+  std::optional<int> getEquipmentNumber() const { return equipmentNumber; }
  int id() const { return m_id; }
 };

@@ -33,7 +33,8 @@ enum class TypeClass : int {
    TargetVehicle = 16,
    VehicleWithGear = 17,
    VehicleMarker = 18,
-    None = 19
+    None = 19,
+    Other = 20
 };

 enum class DataModification : int { eAdded = 0, eModified = 1, eRemoved = 2 };
@@ -143,4 +143,16 @@ inline PDM_COMMON_EXPORT QString toString(L48_TrajectoryRocket state)
    }
 }

+inline PDM_COMMON_EXPORT QString toString(EventType et)
+{
+    switch (et) {
+        case EventType::Unknown: return QStringLiteral("Unknown");
+        case EventType::Alarm: return QStringLiteral("Alarm");
+        case EventType::Warning: return QStringLiteral("Warning");
+        case EventType::Info: return QStringLiteral("Info");
+        case EventType::Status: return QStringLiteral("Status");
+        default: return QStringLiteral("Unknown");
+    }
+}
+
 } // namespace ProjectDataManagement
@@ -1,6 +1,6 @@
 #pragma once

-// STUB-HEADER: Diese Datei wird normalerweise von DDS/Codegenerator generiert
+// STUB-Header: Diese Datei wird normalerweise von DDS/Codegenerator generiert
 // Für die Migration erstellen wir minimale Typ-Definitionen

 #include "pdm_types.h"
@@ -8,14 +8,7 @@
 namespace ProjectDataManagement
 {

-// STUB: EventType Enum
-enum class EventType : int
-{
-    Unknown = 0,
-    Alarm = 1,
-    Warning = 2,
-    Info = 3
-};
+// EventType wird bereits in pdm_types.h definiert

 // STUB: EventType_def - Platzhalter für DDS-generierten Typ
 // Wird in AlarmManagement für Event-Typisierung verwendet