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>
This commit is contained in:
2785 files changed
+18754
-18316
No files matched your search
@@ -0,0 +1,121 @@
|
||||
#pragma once
|
||||
// STUB-HEADER: Diese Datei wird normalerweise von DDS generiert
|
||||
// Für die Migration erstellen wir minimale Typ-Definitionen
|
||||
|
||||
#include <QString>
|
||||
#include <QList>
|
||||
|
||||
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
|
||||
};
|
||||
|
||||
// Participant - Basisdaten eines Teilnehmers
|
||||
struct Participant {
|
||||
int id = 0;
|
||||
QString internalName;
|
||||
QString externalName;
|
||||
int partyId = 0;
|
||||
bool isVerbund = false;
|
||||
|
||||
// Additional fields as needed
|
||||
double x = 0.0;
|
||||
double y = 0.0;
|
||||
double z = 0.0;
|
||||
double heading = 0.0;
|
||||
};
|
||||
|
||||
// Party - Gruppe/Organisation von Teilnehmern
|
||||
struct Party {
|
||||
int id = 0;
|
||||
QString name;
|
||||
QString shortName;
|
||||
};
|
||||
|
||||
// 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;
|
||||
};
|
||||
|
||||
// Dtc - Data Transfer Component für Participant Management
|
||||
// DDS-generierte Klasse mit participantChanged Signal
|
||||
class Dtc {
|
||||
public:
|
||||
Dtc() = default;
|
||||
virtual ~Dtc() = default;
|
||||
|
||||
// Teilnehmer-Liste abrufen
|
||||
QList<Participant> participants() const { return m_participants; }
|
||||
|
||||
// Teilnehmer hinzufügen/entfernen/ändern
|
||||
void addParticipant(const Participant& p) {
|
||||
m_participants.append(p);
|
||||
emit participantChanged(p, static_cast<int>(DataModification::eAdded));
|
||||
}
|
||||
|
||||
void updateParticipant(const Participant& p) {
|
||||
for (auto& existing : m_participants) {
|
||||
if (existing.id == p.id) {
|
||||
existing = p;
|
||||
emit participantChanged(p, static_cast<int>(DataModification::eModified));
|
||||
return;
|
||||
}
|
||||
}
|
||||
addParticipant(p);
|
||||
}
|
||||
|
||||
void removeParticipant(int id) {
|
||||
for (auto it = m_participants.begin(); it != m_participants.end(); ++it) {
|
||||
if (it->id == id) {
|
||||
Participant removed = *it;
|
||||
m_participants.erase(it);
|
||||
emit participantChanged(removed, static_cast<int>(DataModification::eRemoved));
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Signal für Teilnehmer-Änderungen (Qt6: als normale Methode, wird von Connects verwendet)
|
||||
void emit participantChanged(const Participant& participant, int modificationType);
|
||||
|
||||
private:
|
||||
QList<Participant> m_participants;
|
||||
};
|
||||
|
||||
} // namespace ParticipantManagement
|
||||
@@ -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 ParticipantManagement
|
||||
{
|
||||
namespace Interface
|
||||
{
|
||||
class Dtc;
|
||||
class Ftc;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
#pragma once
|
||||
// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
|
||||
// Für die Migration erstellen wir minimale Typ-Definitionen
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
// Placeholder enums - werden durch echte DDS-Typen ersetzt
|
||||
enum class SymbolAppearance : int {
|
||||
Solid = 0,
|
||||
Dashed = 1,
|
||||
Dotted = 2
|
||||
};
|
||||
|
||||
enum class SymbolVisibility : int {
|
||||
Visible = 0,
|
||||
Hidden = 1
|
||||
};
|
||||
|
||||
struct UnitSymbolPosition {
|
||||
double x = 0.0;
|
||||
double y = 0.0;
|
||||
double z = 0.0;
|
||||
};
|
||||
}
|
||||
Reference in new issue
Block a user