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,88 @@
|
||||
#pragma once
|
||||
// STUB-HEADER: Diese Datei wird normalerweise von DDS generiert
|
||||
// Für die Migration erstellen wir minimale Typ-Definitionen
|
||||
|
||||
#include <QString>
|
||||
#include <QList>
|
||||
#include <QVector>
|
||||
|
||||
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<int> 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<double> xPoints;
|
||||
QList<double> yPoints;
|
||||
QList<double> zPoints;
|
||||
qint64 timestamp = 0;
|
||||
QString trajectoryType;
|
||||
};
|
||||
|
||||
// AesFilter - Filter für Area Effect Simulation Entities
|
||||
class AesFilter {
|
||||
public:
|
||||
AesFilter() = default;
|
||||
virtual ~AesFilter() = default;
|
||||
|
||||
// Content getter/setter für DDS-Daten
|
||||
QString content() const { return m_content; }
|
||||
void setContent(const QString& content) { m_content = content; }
|
||||
|
||||
private:
|
||||
QString m_content;
|
||||
};
|
||||
|
||||
} // namespace AreaEffectSimulation
|
||||
@@ -0,0 +1,72 @@
|
||||
#pragma once
|
||||
// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
|
||||
// Für die Migration erstellen wir minimale Typ-Definitionen
|
||||
|
||||
#include <QString>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
// 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;
|
||||
};
|
||||
|
||||
// AesType - Arten von Area Effect Simulation Entities
|
||||
enum class AesType : int {
|
||||
AtBCContamination = 0,
|
||||
AtNContamination = 1,
|
||||
AtDangerArea = 2,
|
||||
AtMineArea = 3,
|
||||
AtMineCorridor = 4,
|
||||
AtExplosionSingle = 5,
|
||||
AtExplosionArea = 6,
|
||||
AtFunctionalArea = 7,
|
||||
AtBorderline = 8,
|
||||
AtMineAreaSingleMines = 9,
|
||||
AtDusSingleMine = 10,
|
||||
AtGasPipe = 11,
|
||||
AtTechnicalArea = 12,
|
||||
AtAirSupportImpact = 13,
|
||||
AtUnknown = 99
|
||||
};
|
||||
|
||||
// AesEffectState_def - Status eines AES Effekts (mit _def Suffix wie DDS generiert)
|
||||
enum class AesEffectState_def : int {
|
||||
EsCreated = 0,
|
||||
EsPrepared = 1,
|
||||
EsFired = 2,
|
||||
EsActivated = 3,
|
||||
EsPaused = 4,
|
||||
EsExpired = 5,
|
||||
EsRemoved = 6,
|
||||
EsReceived = 7,
|
||||
EsUnknown = 99,
|
||||
EsError = 100
|
||||
};
|
||||
|
||||
// AesEffectState - Alias für AesEffectState_def (Backward Compatibility)
|
||||
using AesEffectState = AesEffectState_def;
|
||||
|
||||
// EffectStateStruct - Filter-Struktur für Effect States
|
||||
struct EffectStateStruct {
|
||||
bool showCreated = true;
|
||||
bool showPrepared = true;
|
||||
bool showActive = true;
|
||||
bool showInactive = false;
|
||||
bool showExpired = false;
|
||||
};
|
||||
|
||||
} // namespace AreaEffectSimulation
|
||||
Reference in new issue
Block a user