LtsUtilsCore: Alle Include-Pfade korrigiert (LtsUtils/ → LtsUtilsCore/)
- CMakeLists.txt: Include-Pfade von ../ zu . geändert, json.h hinzugefügt - ~95 Dateien: Include-Pfade systematisch korrigiert - LtsUtils/ → LtsUtilsCore/ für alle Core-Header - LtsUtilsGui/LtsUtils/LtsUtilsGui/ → LtsUtilsGui/LtsUtilsGuiDds/ - Logger-API: getLogger() mit const char* Parameter - DataModification: enum class global (nicht im Lts-Namespace) - Participant-Struct: Member mit m_-Präfix - Export-Macro: SVCALMCOMMON_EXPORT statt ALMCOMMON_EXPORT - Signal/Slot-Signaturen korrigiert für Qt6 template matching Build validiert: LtsUtilsCore, LtsUtilsDds, LtsSessionData erfolgreich
This commit is contained in:
95 files changed
+667
-177
No files matched your search
@@ -7,18 +7,13 @@
|
||||
|
||||
#include <QMap>
|
||||
#include <QString>
|
||||
#include "pdm_types.h"
|
||||
|
||||
namespace ProjectDataManagement
|
||||
{
|
||||
|
||||
// Original enums
|
||||
enum class ChargeType : int { Unknown = 0 };
|
||||
|
||||
enum class UnitType : int { Unknown = 0 };
|
||||
|
||||
enum class SimulationType : int { Unknown = 0 };
|
||||
|
||||
// Additional enums required by AdlerJson/telegrams.h
|
||||
// (ChargeType, UnitType, SimulationType are already defined in pdm_types.h)
|
||||
enum class L4_TargetGeometry : int {
|
||||
Unknown = 0,
|
||||
Point, // P - Punktziel
|
||||
|
||||
@@ -18,18 +18,129 @@ class QString;
|
||||
namespace ProjectDataManagement
|
||||
{
|
||||
// Translatable enumerations:
|
||||
PDM_COMMON_EXPORT QString toString(ChargeType state);
|
||||
PDM_COMMON_EXPORT QString toString(UnitType state);
|
||||
PDM_COMMON_EXPORT QString toString(SimulationType state);
|
||||
PDM_COMMON_EXPORT QString toString(L4_TargetGeometry state);
|
||||
PDM_COMMON_EXPORT QString toString(L7_Request state);
|
||||
PDM_COMMON_EXPORT QString toString(L19_Oi state);
|
||||
PDM_COMMON_EXPORT QString toString(L22_FireHaltCategory state);
|
||||
PDM_COMMON_EXPORT QString toString(L25_KindGuidingLine state);
|
||||
PDM_COMMON_EXPORT QString toString(L26_EffectingSystemType state);
|
||||
PDM_COMMON_EXPORT QString toString(L27_EffectorId state);
|
||||
PDM_COMMON_EXPORT QString toString(L28_Status state);
|
||||
PDM_COMMON_EXPORT QString toString(L46_GpsFrequency state);
|
||||
PDM_COMMON_EXPORT QString toString(L48_TrajectoryRocket state);
|
||||
inline PDM_COMMON_EXPORT QString toString(ChargeType ct)
|
||||
{
|
||||
switch (ct) {
|
||||
case ChargeType::Unknown: return QStringLiteral("Unknown");
|
||||
default: return QStringLiteral("Unknown");
|
||||
}
|
||||
}
|
||||
|
||||
inline PDM_COMMON_EXPORT QString toString(UnitType ut)
|
||||
{
|
||||
switch (ut) {
|
||||
case UnitType::Unknown: return QStringLiteral("Unknown");
|
||||
default: return QStringLiteral("Unknown");
|
||||
}
|
||||
}
|
||||
|
||||
inline PDM_COMMON_EXPORT QString toString(SimulationType st)
|
||||
{
|
||||
switch (st) {
|
||||
case SimulationType::Unknown: return QStringLiteral("Unknown");
|
||||
default: return QStringLiteral("Unknown");
|
||||
}
|
||||
}
|
||||
|
||||
inline PDM_COMMON_EXPORT QString toString(L4_TargetGeometry state)
|
||||
{
|
||||
switch (state) {
|
||||
case L4_TargetGeometry::Unknown: return QStringLiteral("Unknown");
|
||||
case L4_TargetGeometry::Point: return QStringLiteral("Point");
|
||||
case L4_TargetGeometry::Area: return QStringLiteral("Area");
|
||||
case L4_TargetGeometry::Radial: return QStringLiteral("Radial");
|
||||
case L4_TargetGeometry::Linear: return QStringLiteral("Linear");
|
||||
default: return QStringLiteral("Unknown");
|
||||
}
|
||||
}
|
||||
|
||||
inline PDM_COMMON_EXPORT QString toString(L7_Request state)
|
||||
{
|
||||
switch (state) {
|
||||
case L7_Request::Unknown: return QStringLiteral("Unknown");
|
||||
default: return QStringLiteral("Unknown");
|
||||
}
|
||||
}
|
||||
|
||||
inline PDM_COMMON_EXPORT QString toString(L19_Oi state)
|
||||
{
|
||||
switch (state) {
|
||||
case L19_Oi::Unknown: return QStringLiteral("Unknown");
|
||||
case L19_Oi::Empty: return QStringLiteral("Empty");
|
||||
default: return QStringLiteral("Unknown");
|
||||
}
|
||||
}
|
||||
|
||||
inline PDM_COMMON_EXPORT QString toString(L22_FireHaltCategory state)
|
||||
{
|
||||
switch (state) {
|
||||
case L22_FireHaltCategory::A: return QStringLiteral("A");
|
||||
case L22_FireHaltCategory::R: return QStringLiteral("R");
|
||||
case L22_FireHaltCategory::E: return QStringLiteral("E");
|
||||
case L22_FireHaltCategory::C: return QStringLiteral("C");
|
||||
case L22_FireHaltCategory::F: return QStringLiteral("F");
|
||||
default: return QStringLiteral("Unknown");
|
||||
}
|
||||
}
|
||||
|
||||
inline PDM_COMMON_EXPORT QString toString(L25_KindGuidingLine state)
|
||||
{
|
||||
switch (state) {
|
||||
case L25_KindGuidingLine::FFA: return QStringLiteral("FFA");
|
||||
case L25_KindGuidingLine::NFA: return QStringLiteral("NFA");
|
||||
case L25_KindGuidingLine::RFA: return QStringLiteral("RFA");
|
||||
case L25_KindGuidingLine::FSCL: return QStringLiteral("FSCL");
|
||||
case L25_KindGuidingLine::RFL: return QStringLiteral("RFL");
|
||||
case L25_KindGuidingLine::FSSL: return QStringLiteral("FSSL");
|
||||
case L25_KindGuidingLine::NFL: return QStringLiteral("NFL");
|
||||
default: return QStringLiteral("Unknown");
|
||||
}
|
||||
}
|
||||
|
||||
inline PDM_COMMON_EXPORT QString toString(L26_EffectingSystemType state)
|
||||
{
|
||||
switch (state) {
|
||||
case L26_EffectingSystemType::Unknown: return QStringLiteral("Unknown");
|
||||
case L26_EffectingSystemType::Pzh2000: return QStringLiteral("Pzh2000");
|
||||
case L26_EffectingSystemType::RRohr: return QStringLiteral("RRohr");
|
||||
case L26_EffectingSystemType::Mars: return QStringLiteral("Mars");
|
||||
default: return QStringLiteral("Unknown");
|
||||
}
|
||||
}
|
||||
|
||||
inline PDM_COMMON_EXPORT QString toString(L27_EffectorId state)
|
||||
{
|
||||
switch (state) {
|
||||
case L27_EffectorId::Unknown: return QStringLiteral("Unknown");
|
||||
default: return QStringLiteral("Unknown");
|
||||
}
|
||||
}
|
||||
|
||||
inline PDM_COMMON_EXPORT QString toString(L28_Status state)
|
||||
{
|
||||
switch (state) {
|
||||
case L28_Status::NichtEinsatzbereit: return QStringLiteral("NichtEinsatzbereit");
|
||||
case L28_Status::Einsatzbereit: return QStringLiteral("Einsatzbereit");
|
||||
default: return QStringLiteral("Unknown");
|
||||
}
|
||||
}
|
||||
|
||||
inline PDM_COMMON_EXPORT QString toString(L46_GpsFrequency state)
|
||||
{
|
||||
switch (state) {
|
||||
case L46_GpsFrequency::L1: return QStringLiteral("L1");
|
||||
case L46_GpsFrequency::L2: return QStringLiteral("L2");
|
||||
default: return QStringLiteral("Unknown");
|
||||
}
|
||||
}
|
||||
|
||||
inline PDM_COMMON_EXPORT QString toString(L48_TrajectoryRocket state)
|
||||
{
|
||||
switch (state) {
|
||||
case L48_TrajectoryRocket::Nominal: return QStringLiteral("Nominal");
|
||||
case L48_TrajectoryRocket::Vertical: return QStringLiteral("Vertical");
|
||||
default: return QStringLiteral("Unknown");
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace ProjectDataManagement
|
||||
@@ -27,8 +27,65 @@ enum class VulnerabilityClass : int
|
||||
eClassC = 3
|
||||
};
|
||||
|
||||
// STUB: toString-Funktionen für VulnerabilityState + VulnerabilityClass
|
||||
PDM_COMMON_EXPORT QString toString(VulnerabilityState vs);
|
||||
PDM_COMMON_EXPORT QString toString(VulnerabilityState vs, VulnerabilityClass vc);
|
||||
// STUB: VulnerabilityState_def - DDS-generierte Wrapper-Struktur
|
||||
struct VulnerabilityState_def
|
||||
{
|
||||
using type = VulnerabilityState;
|
||||
static constexpr VulnerabilityState eUnknown = VulnerabilityState::eUnknown;
|
||||
static constexpr VulnerabilityState eNormal = VulnerabilityState::eNormal;
|
||||
static constexpr VulnerabilityState eWarning = VulnerabilityState::eWarning;
|
||||
static constexpr VulnerabilityState eCritical = VulnerabilityState::eCritical;
|
||||
};
|
||||
|
||||
// STUB: VulnerabilityClass_def - DDS-generierte Wrapper-Struktur
|
||||
struct VulnerabilityClass_def
|
||||
{
|
||||
using type = VulnerabilityClass;
|
||||
static constexpr VulnerabilityClass eUnknown = VulnerabilityClass::eUnknown;
|
||||
static constexpr VulnerabilityClass eClassA = VulnerabilityClass::eClassA;
|
||||
static constexpr VulnerabilityClass eClassB = VulnerabilityClass::eClassB;
|
||||
static constexpr VulnerabilityClass eClassC = VulnerabilityClass::eClassC;
|
||||
|
||||
// Statische Member für SoldierInjuries und VehicleDamages
|
||||
static constexpr VulnerabilityClass SoldierInjuries = VulnerabilityClass::eClassA;
|
||||
static constexpr VulnerabilityClass VehicleDamages = VulnerabilityClass::eClassB;
|
||||
};
|
||||
|
||||
// STUB: ChargeType Enum
|
||||
enum class ChargeType : int
|
||||
{
|
||||
Unknown = 0,
|
||||
Live = 1,
|
||||
Inert = 2,
|
||||
Practice = 3
|
||||
};
|
||||
|
||||
// STUB: UnitType Enum
|
||||
enum class UnitType : int
|
||||
{
|
||||
Unknown = 0,
|
||||
Air = 1,
|
||||
Ground = 2,
|
||||
Naval = 3
|
||||
};
|
||||
|
||||
// STUB: SimulationType Enum
|
||||
enum class SimulationType : int
|
||||
{
|
||||
Unknown = 0,
|
||||
Live = 1,
|
||||
Constructive = 2,
|
||||
Virtual = 3
|
||||
};
|
||||
|
||||
// STUB: EventType Enum
|
||||
enum class EventType : int
|
||||
{
|
||||
Unknown = 0,
|
||||
Alarm = 1,
|
||||
Warning = 2,
|
||||
Info = 3,
|
||||
Status = 4
|
||||
};
|
||||
|
||||
} // namespace ProjectDataManagement
|
||||
+43
@@ -0,0 +1,43 @@
|
||||
#pragma once
|
||||
|
||||
// STUB-HEADER: Diese Datei wird normalerweise von DDS/Codegenerator generiert
|
||||
// Für die Migration erstellen wir minimale Typ-Definitionen
|
||||
|
||||
#include "pdm_types.h"
|
||||
|
||||
namespace ProjectDataManagement
|
||||
{
|
||||
|
||||
// STUB: EventType Enum
|
||||
enum class EventType : int
|
||||
{
|
||||
Unknown = 0,
|
||||
Alarm = 1,
|
||||
Warning = 2,
|
||||
Info = 3
|
||||
};
|
||||
|
||||
// STUB: EventType_def - Platzhalter für DDS-generierten Typ
|
||||
// Wird in AlarmManagement für Event-Typisierung verwendet
|
||||
struct EventType_def
|
||||
{
|
||||
int value{0};
|
||||
|
||||
EventType_def() = default;
|
||||
explicit EventType_def(int v) : value(v) {}
|
||||
explicit EventType_def(EventType t) : value(static_cast<int>(t)) {}
|
||||
|
||||
bool operator==(const EventType_def& other) const { return value == other.value; }
|
||||
bool operator!=(const EventType_def& other) const { return value != other.value; }
|
||||
bool operator<(const EventType_def& other) const { return value < other.value; }
|
||||
};
|
||||
|
||||
// STUB: EventData - Basisstruktur für Event-Daten
|
||||
struct EventData
|
||||
{
|
||||
EventType_def eventType;
|
||||
QString description;
|
||||
qint64 timestamp{0};
|
||||
};
|
||||
|
||||
} // namespace ProjectDataManagement
|
||||
Reference in new issue
Block a user