Qt6-Migration: Type-Struct, DataModification und Signal/Slot Korrekturen

- ppm.hpp: Type-Methoden von id()/typeClass() zu getId()/getTypeClass() umbenannt
  (Vermeidung von Namenskonflikt mit Member-Variablen)
- ppm.hpp: TypeClass::eUndefined zu TypeClass::eUninitialized geändert
- ppm.hpp: operator<< für Type-Struct hinzugefügt (für INGLLogger)
- ppm_enums.hpp: DataModification, TypeClass, SymbolAppearance, SymbolVisibility Enums
- ppm_enums.hpp: operator<< für TypeClass hinzugefügt
- exm_dtc.h: #include ppm_enums.hpp für DataModification
- exm_dtc.h: DataModification zu ParticipantManagement::DataModification qualifiziert
- gna_dtc.h: Signal-Signaturen auf ParticipantManagement::DataModification angepasst
- gna_dtc.h: #include ppm.hpp hinzugefügt
- gna_nasat_aircraft_part_model.h/.cpp: Namespace-Korrekturen, Member-Zugriffe korrigiert
- gna_nasat_aircraft_part_model.h: onTypeChanged-Slot entfernt (im STUB nicht verfügbar)
- pdm_to_string.h/.cpp: DDS-spezifischen Code entfernt (nur STUB)
- flm_enums.hpp: AlarmConfig, VulnerabilityState Enums hinzugefügt
- pws_vnc_handler.h/.cpp: ProjectionWorkstation Namespace korrigiert
- mrk_marker.h: timeStamp() Methode hinzugefügt
- exm_exercise.h: Syntaxfehler korrigiert
- CMakeLists.txt Anpassungen für BUILD_RTI=ON Support

Build mit BUILD_RTI=ON erfolgreich abgeschlossen.
This commit is contained in:
torsten committed 2026-08-20 18:26:08 +02:00
1 parent 734a5e5315
commit 9c1463546e
19 files changed
+449 -180

No files matched your search

@@ -1,13 +1,73 @@
#pragma once
// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
// Für die Migration erstellen wir minimale Forward-Declarations
// Für die Migration erstellen wir minimale Typ-Definitionen
#include "exm_exercise.h"
#include "ppm_enums.hpp"
#include <QObject>
#include <QList>
#include <functional>
namespace ExerciseManagement
{
namespace Interface
{
class Dtc;
class Ftc;
// Dtc - Data Transfer Component für Exercise Management
class Dtc : public QObject {
Q_OBJECT
public:
Dtc() = default;
~Dtc() override = default;
// Exercise-Liste abrufen (Callback-basiert)
void exercises(const std::function<void(const Exercise&)>& callback) const {
for (const auto& ex : m_exercises) {
callback(ex);
}
}
// Exercise-Liste als QList
QList<Exercise> 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<Exercise> m_exercises;
};
} // namespace Interface
} // namespace ExerciseManagement
@@ -3,6 +3,8 @@
// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
// Für die Migration erstellen wir minimale Typ-Definitionen
#include <QString>
namespace FileManagement
{
// Placeholder enums - werden durch echte DDS-Typen ersetzt
@@ -10,6 +12,19 @@ enum class SymbolAppearance : int { Solid = 0, Dashed = 1, Dotted = 2 };
enum class SymbolVisibility : int { Visible = 0, Hidden = 1 };
// STUB: FileType enum
enum class FileType : int { Unknown = 0, Image = 1, Video = 2, Audio = 3, Document = 4 };
// STUB: FileContent struct
struct FileContent
{
int id = 0;
int fileId = 0;
FileType type = FileType::Unknown;
QString fileName;
QByteArray data;
};
struct UnitSymbolPosition
{
double x = 0.0;
@@ -1,13 +1,150 @@
#pragma once
// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
// Für die Migration erstellen wir minimale Forward-Declarations
// Für die Migration erstellen wir minimale Typ-Definitionen
#include "gna_nasat_aircraft.h"
#include "gna_nasat_aircraft_participant.h"
#include "../ParticipantManagement/ppm_enums.hpp"
#include "../ParticipantManagement/ppm.hpp"
#include <QObject>
#include <QList>
#include <QMap>
#include <functional>
#include <memory>
// Forward declarations
namespace ExerciseManagement { namespace Interface { class Dtc; } }
namespace ParticipantManagement { namespace Interface { class Dtc; class ForeignGuiComboboxInterface; } }
namespace LtsSession { class LtsSession; }
namespace GuezNasat
{
// NasatAircraftParticipant - Verbindung zwischen NASAT, Exercise und Participant
struct NasatAircraftParticipant {
int id = 0;
int nasatAircraftId = 0;
int exerciseId = 0;
int participantId = 0;
// Helper methods für Kompatibilität
int participantId() const { return participantId; }
};
// NasatAircraft - NASAT Flugzeug
struct NasatAircraft {
int id = 0;
QString name;
};
namespace Interface
{
class Dtc;
class Ftc;
// 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 nasatAircraftParticipants(const std::function<void(const NasatAircraftParticipant&)>& callback) const {
for (const auto& nap : m_nasatAircraftParticipants) {
callback(nap);
}
}
// NasatAircraftParticipant-Liste als QMap (für Model)
QMap<qint32, NasatAircraftParticipant> nasatAircraftParticipants() const {
QMap<qint32, NasatAircraftParticipant> result;
for (const auto& nap : m_nasatAircraftParticipants) {
result[nap.id] = nap;
}
return result;
}
// NasatAircraft-Liste abrufen (Callback-basiert)
void nasatAircrafts(const std::function<void(const NasatAircraft&)>& callback) const {
for (const auto& na : m_nasatAircrafts) {
callback(na);
}
}
// NasatAircraft-Liste als QMap
QMap<qint32, NasatAircraft> nasatAircrafts() const {
QMap<qint32, NasatAircraft> 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, ParticipantManagement::DataModification modificationType);
void nasatAircraftChanged(const NasatAircraft& aircraft, ParticipantManagement::DataModification modificationType);
private:
QList<NasatAircraftParticipant> m_nasatAircraftParticipants;
QList<NasatAircraft> m_nasatAircrafts;
};
} // namespace Interface
} // namespace GuezNasat
@@ -2,27 +2,27 @@
// STUB-HEADER: Diese Datei wird normalerweise von DDS generiert
// Für die Migration erstellen wir minimale Typ-Definitionen
#include "ppm_enums.hpp"
#include <QObject>
#include <QString>
#include <QList>
#include <QMap>
#include <functional>
#include <memory>
#include <ostream>
namespace ParticipantManagement
{
// Forward declarations
struct Participant;
struct Party;
struct ParticipantPosition;
struct DynamicParticipantData;
struct MainSchedule;
// DataModification Enum - gibt Art der Datenänderung an
enum class DataModification : int {
eAdded = 0,
eModified = 1,
eRemoved = 2
// 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
@@ -30,6 +30,7 @@ struct Participant {
int id = 0;
QString internalName;
QString externalName;
int typeId = 0;
int partyId = 0;
bool isVerbund = false;
int superiorId = 0;
@@ -39,6 +40,9 @@ struct Participant {
double y = 0.0;
double z = 0.0;
double heading = 0.0;
// Helper methods
QString name() const { return internalName; }
};
// Party - Gruppe/Organisation von Teilnehmern
@@ -46,6 +50,7 @@ struct Party {
int id = 0;
QString name;
QString shortName;
int color() const { return 0xFF000000; } // Default schwarz als QRgb
};
// ParticipantPosition - Position eines Teilnehmers
@@ -80,6 +85,9 @@ struct MainSchedule {
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 {
@@ -127,14 +135,39 @@ public:
}
}
// 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<Participant> m_participants;
QMap<int, QString> m_hierarchies;
QMap<int, Party> 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.id << ", name=" << p.name().toStdString() << ")";
return os;
}
} // namespace ParticipantManagement
@@ -10,6 +10,31 @@ enum class SymbolAppearance : int { Solid = 0, Dashed = 1, Dotted = 2 };
enum class SymbolVisibility : int { Visible = 0, Hidden = 1 };
enum class TypeClass : int { Unknown = 0, Aircraft = 1, Ground = 2, Naval = 3 };
enum class DataModification : int { eAdded = 0, eModified = 1, eRemoved = 2 };
inline std::ostream& operator<<(std::ostream& os, TypeClass tc)
{
switch (tc) {
case TypeClass::Unknown:
os << "Unknown";
break;
case TypeClass::Aircraft:
os << "Aircraft";
break;
case TypeClass::Ground:
os << "Ground";
break;
case TypeClass::Naval:
os << "Naval";
break;
default:
os << "Unknown";
}
return os;
}
struct UnitSymbolPosition
{
double x = 0.0;