GuezNasat: DataModification-Type-Konsistenz und Include-Pfade korrigiert

- gna_nasat_aircraft_model.h/.cpp: Include-Pfad zu <GuezNasat/logger.h>
  korrigiert, Logger-Initialisierung auf GuezNasat::getLogger() umgestellt
- gna_nasat_aircraft_part_model.h/.cpp: Methodensignaturen von
  ParticipantManagement::DataModification zu globalem DataModification
  geändert für konsistente Type-Verwendung
- gna_dtc.h: Include-Pfad für logger.h korrigiert
- gna_nasat_aircraft.h: Member-Variablen zu Getter-Methoden geändert
- CMakeLists.txt: Include-Verzeichnis für GuezNasat-Modul hinzugefügt

Alle Callback-Lambdas verwenden jetzt das globale DataModification-Enum
aus LtsUtilsCore statt dem veralteten ParticipantManagement-Namespace.
This commit is contained in:
torsten committed 2026-08-21 01:49:35 +02:00
1 parent e22dd98040
commit c7fa97c8bf
7 files changed
+81 -60

No files matched your search

@@ -47,7 +47,7 @@ public:
QMap<qint32, NasatAircraftParticipant> nasatAircraftParticipants() const {
QMap<qint32, NasatAircraftParticipant> result;
for (const auto& nap : m_nasatAircraftParticipants) {
result[nap.id] = nap;
result[nap.id()] = nap;
}
return result;
}
@@ -63,7 +63,7 @@ public:
QMap<qint32, NasatAircraft> nasatAircrafts() const {
QMap<qint32, NasatAircraft> result;
for (const auto& na : m_nasatAircrafts) {
result[na.id] = na;
result[na.id()] = na;
}
return result;
}
@@ -76,7 +76,7 @@ public:
void updateNasatAircraftParticipant(const NasatAircraftParticipant& nap) {
for (auto& existing : m_nasatAircraftParticipants) {
if (existing.id == nap.id) {
if (existing.id() == nap.id()) {
existing = nap;
emit nasatAircraftParticipantChanged(nap, ParticipantManagement::DataModification::eModified);
return;
@@ -87,7 +87,7 @@ public:
void removeNasatAircraftParticipant(int id) {
for (auto it = m_nasatAircraftParticipants.begin(); it != m_nasatAircraftParticipants.end(); ++it) {
if (it->id == id) {
if (it->id() == id) {
NasatAircraftParticipant removed = *it;
m_nasatAircraftParticipants.erase(it);
emit nasatAircraftParticipantChanged(removed, ParticipantManagement::DataModification::eRemoved);
@@ -103,7 +103,7 @@ public:
void updateNasatAircraft(const NasatAircraft& na) {
for (auto& existing : m_nasatAircrafts) {
if (existing.id == na.id) {
if (existing.id() == na.id()) {
existing = na;
emit nasatAircraftChanged(na, ParticipantManagement::DataModification::eModified);
return;
@@ -114,7 +114,7 @@ public:
void removeNasatAircraft(int id) {
for (auto it = m_nasatAircrafts.begin(); it != m_nasatAircrafts.end(); ++it) {
if (it->id == id) {
if (it->id() == id) {
NasatAircraft removed = *it;
m_nasatAircrafts.erase(it);
emit nasatAircraftChanged(removed, ParticipantManagement::DataModification::eRemoved);
@@ -12,21 +12,32 @@ namespace GuezNasat
// STUB: NasatAircraft - wird durch echten DDS-Typ ersetzt
struct GNACOMMON_EXPORT NasatAircraft
{
int id = 0;
QString name;
int exerciseId = 0;
// Weitere Felder werden bei Bedarf ergänzt
int idValue = 0;
QString nameValue;
int exerciseIdValue = 0;
int nasatIdValue = 0;
bool simulationActiveValue = false;
// Getter-Methoden für Kompatibilität
int id() const { return idValue; }
QString name() const { return nameValue; }
int exerciseId() const { return exerciseIdValue; }
int nasatId() const { return nasatIdValue; }
bool simulationActive() const { return simulationActiveValue; }
};
// STUB: NasatAircraftParticipant - wird durch echten DDS-Typ ersetzt
struct GNACOMMON_EXPORT NasatAircraftParticipant
{
int id = 0;
int nasatAircraftId = 0;
int exerciseId = 0;
int idValue = 0;
int nasatAircraftIdValue = 0;
int exerciseIdValue = 0;
int participantIdValue = 0;
// Helper method für Kompatibilität
// Getter-Methoden für Kompatibilität
int id() const { return idValue; }
int nasatAircraftId() const { return nasatAircraftIdValue; }
int exerciseId() const { return exerciseIdValue; }
int participantId() const { return participantIdValue; }
};
@@ -36,15 +47,17 @@ struct GNACOMMON_EXPORT NasatAircraftParticipant
#include <ostream>
inline std::ostream& operator<<(std::ostream& os, const GuezNasat::NasatAircraft& aircraft)
{
os << "NasatAircraft{id=" << aircraft.id << ", name=" << aircraft.name.toStdString()
<< ", exerciseId=" << aircraft.exerciseId << "}";
os << "NasatAircraft{id=" << aircraft.id() << ", name=" << aircraft.name().toStdString()
<< ", exerciseId=" << aircraft.exerciseId() << ", nasatId=" << aircraft.nasatId()
<< ", simulationActive=" << aircraft.simulationActive() << "}";
return os;
}
inline std::ostream& operator<<(std::ostream& os, const GuezNasat::NasatAircraftParticipant& participant)
{
os << "NasatAircraftParticipant{id=" << participant.id
<< ", nasatAircraftId=" << participant.nasatAircraftId
<< ", participantId=" << participant.participantIdValue << "}";
os << "NasatAircraftParticipant{id=" << participant.id()
<< ", nasatAircraftId=" << participant.nasatAircraftId()
<< ", exerciseId=" << participant.exerciseId()
<< ", participantId=" << participant.participantId() << "}";
return os;
}