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
@@ -12,6 +12,8 @@
|
||||
#include <memory>
|
||||
#include <ostream>
|
||||
|
||||
#include "LtsUtils/data_modification_enum.h"
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
@@ -27,7 +29,7 @@ struct Type {
|
||||
|
||||
// Participant - Basisdaten eines Teilnehmers
|
||||
struct Participant {
|
||||
int id = 0;
|
||||
int m_id = 0;
|
||||
QString internalName;
|
||||
QString externalName;
|
||||
int typeId = 0;
|
||||
@@ -41,8 +43,17 @@ struct Participant {
|
||||
double z = 0.0;
|
||||
double heading = 0.0;
|
||||
|
||||
// Optional fields (für DDS-Kompatibilität)
|
||||
std::optional<int> equipmentNumber;
|
||||
QString m_designator;
|
||||
QString m_tacticalIdentifier;
|
||||
|
||||
// Helper methods
|
||||
QString name() const { return internalName; }
|
||||
QString designator() const { return m_designator; }
|
||||
QString tacticalIdentifier() const { return m_tacticalIdentifier; }
|
||||
std::optional<int> equipmentNumber() const { return equipmentNumber; }
|
||||
int id() const { return m_id; }
|
||||
};
|
||||
|
||||
// Party - Gruppe/Organisation von Teilnehmern
|
||||
@@ -115,7 +126,7 @@ public:
|
||||
|
||||
void updateParticipant(const Participant& p) {
|
||||
for (auto& existing : m_participants) {
|
||||
if (existing.id == p.id) {
|
||||
if (existing.m_id == p.m_id) {
|
||||
existing = p;
|
||||
emit participantChanged(p, DataModification::eModified);
|
||||
return;
|
||||
@@ -126,7 +137,7 @@ public:
|
||||
|
||||
void removeParticipant(int id) {
|
||||
for (auto it = m_participants.begin(); it != m_participants.end(); ++it) {
|
||||
if (it->id == id) {
|
||||
if (it->m_id == id) {
|
||||
Participant removed = *it;
|
||||
m_participants.erase(it);
|
||||
emit participantChanged(removed, DataModification::eRemoved);
|
||||
@@ -166,7 +177,7 @@ inline std::ostream& operator<<(std::ostream& os, const Type& t) {
|
||||
}
|
||||
|
||||
inline std::ostream& operator<<(std::ostream& os, const Participant& p) {
|
||||
os << "Participant(id=" << p.id << ", name=" << p.name().toStdString() << ")";
|
||||
os << "Participant(id=" << p.m_id << ", name=" << p.name().toStdString() << ")";
|
||||
return os;
|
||||
}
|
||||
|
||||
|
||||
@@ -13,7 +13,28 @@ enum class SymbolAppearance : int { Solid = 0, Dashed = 1, Dotted = 2 };
|
||||
|
||||
enum class SymbolVisibility : int { Visible = 0, Hidden = 1 };
|
||||
|
||||
enum class TypeClass : int { eUninitialized = 0, Unknown = 1, Aircraft = 2, Ground = 3, Naval = 4 };
|
||||
enum class TypeClass : int {
|
||||
eUninitialized = 0,
|
||||
Unknown = 1,
|
||||
Aircraft = 2,
|
||||
Ground = 3,
|
||||
Naval = 4,
|
||||
Human = 5,
|
||||
Unit = 6,
|
||||
SupportUnit = 7,
|
||||
SupportEntity = 8,
|
||||
Vehicle = 9,
|
||||
GroundVehicle = 10,
|
||||
Airborne = 11,
|
||||
Vessel = 12,
|
||||
Building = 13,
|
||||
WeaponSystem = 14,
|
||||
TargetHuman = 15,
|
||||
TargetVehicle = 16,
|
||||
VehicleWithGear = 17,
|
||||
VehicleMarker = 18,
|
||||
None = 19
|
||||
};
|
||||
|
||||
enum class DataModification : int { eAdded = 0, eModified = 1, eRemoved = 2 };
|
||||
|
||||
@@ -35,6 +56,51 @@ inline std::ostream& operator<<(std::ostream& os, TypeClass tc)
|
||||
case TypeClass::Naval:
|
||||
os << "Naval";
|
||||
break;
|
||||
case TypeClass::Human:
|
||||
os << "Human";
|
||||
break;
|
||||
case TypeClass::Unit:
|
||||
os << "Unit";
|
||||
break;
|
||||
case TypeClass::SupportUnit:
|
||||
os << "SupportUnit";
|
||||
break;
|
||||
case TypeClass::SupportEntity:
|
||||
os << "SupportEntity";
|
||||
break;
|
||||
case TypeClass::Vehicle:
|
||||
os << "Vehicle";
|
||||
break;
|
||||
case TypeClass::GroundVehicle:
|
||||
os << "GroundVehicle";
|
||||
break;
|
||||
case TypeClass::Airborne:
|
||||
os << "Airborne";
|
||||
break;
|
||||
case TypeClass::Vessel:
|
||||
os << "Vessel";
|
||||
break;
|
||||
case TypeClass::Building:
|
||||
os << "Building";
|
||||
break;
|
||||
case TypeClass::WeaponSystem:
|
||||
os << "WeaponSystem";
|
||||
break;
|
||||
case TypeClass::TargetHuman:
|
||||
os << "TargetHuman";
|
||||
break;
|
||||
case TypeClass::TargetVehicle:
|
||||
os << "TargetVehicle";
|
||||
break;
|
||||
case TypeClass::VehicleWithGear:
|
||||
os << "VehicleWithGear";
|
||||
break;
|
||||
case TypeClass::VehicleMarker:
|
||||
os << "VehicleMarker";
|
||||
break;
|
||||
case TypeClass::None:
|
||||
os << "None";
|
||||
break;
|
||||
default:
|
||||
os << std::string("Unknown");
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user