LtsSession-STUB und GuezNasat-Fixes für BUILD_RTI=OFF

- CMakeLists.txt: Conditional compilation für BUILD_RTI=ON/OFF
- lts_session_stub.h/cpp: NEU - STUB-Implementation ohne RTI-Abhängigkeit
- lts_session_data_dds_stub.h: Doppeltes Namespace-Closing entfernt
- gna_nasat_aircraft.h: participantId zu participantIdValue umbenannt (Konflikt)
- gna_dtc.h: Doppeldefinitionen entfernt
- gna_nasat_aircraft_participant.h: Doppeldefinitionen entfernt
- ppm_enums.hpp: DataModification-Enum im ParticipantManagement-Namespace
- ElevationMap-STUB: ArcGIS-Abhängigkeit für BUILD_RTI=OFF gekapselt
- Viewer-STUB: Header für BUILD_RTI=OFF Build

Build-Validierung: Configure erfolgreich, LtsSession-Fehler behoben
This commit is contained in:
torsten committed 2026-08-20 19:01:05 +02:00
1 parent b0a281ddf4
commit 32041db9a7
17 files changed
+543 -50

No files matched your search

@@ -22,22 +22,8 @@ namespace LtsSession { class LtsSession; }
namespace GuezNasat
{
// NasatAircraftParticipant - Verbindung zwischen NASAT, Exercise und Participant
struct NasatAircraftParticipant {
int id = 0;
int nasatAircraftId = 0;
int exerciseId = 0;
int participantId = 0;
// Helper methods für Kompatibilität
int participantId() const { return participantId; }
};
// NasatAircraft - NASAT Flugzeug
struct NasatAircraft {
int id = 0;
QString name;
};
// NasatAircraftParticipant und NasatAircraft sind bereits in gna_nasat_aircraft.h definiert
// Diese Datei enthält nur die Dtc-Klasse
namespace Interface
{
@@ -85,14 +71,14 @@ public:
// Daten hinzufügen/entfernen/ändern
void addNasatAircraftParticipant(const NasatAircraftParticipant& nap) {
m_nasatAircraftParticipants.append(nap);
emit nasatAircraftParticipantChanged(nap, DataModification::eAdded);
emit nasatAircraftParticipantChanged(nap, ParticipantManagement::DataModification::eAdded);
}
void updateNasatAircraftParticipant(const NasatAircraftParticipant& nap) {
for (auto& existing : m_nasatAircraftParticipants) {
if (existing.id == nap.id) {
existing = nap;
emit nasatAircraftParticipantChanged(nap, DataModification::eModified);
emit nasatAircraftParticipantChanged(nap, ParticipantManagement::DataModification::eModified);
return;
}
}
@@ -104,7 +90,7 @@ public:
if (it->id == id) {
NasatAircraftParticipant removed = *it;
m_nasatAircraftParticipants.erase(it);
emit nasatAircraftParticipantChanged(removed, DataModification::eRemoved);
emit nasatAircraftParticipantChanged(removed, ParticipantManagement::DataModification::eRemoved);
return;
}
}
@@ -112,14 +98,14 @@ public:
void addNasatAircraft(const NasatAircraft& na) {
m_nasatAircrafts.append(na);
emit nasatAircraftChanged(na, DataModification::eAdded);
emit nasatAircraftChanged(na, ParticipantManagement::DataModification::eAdded);
}
void updateNasatAircraft(const NasatAircraft& na) {
for (auto& existing : m_nasatAircrafts) {
if (existing.id == na.id) {
existing = na;
emit nasatAircraftChanged(na, DataModification::eModified);
emit nasatAircraftChanged(na, ParticipantManagement::DataModification::eModified);
return;
}
}
@@ -131,7 +117,7 @@ public:
if (it->id == id) {
NasatAircraft removed = *it;
m_nasatAircrafts.erase(it);
emit nasatAircraftChanged(removed, DataModification::eRemoved);
emit nasatAircraftChanged(removed, ParticipantManagement::DataModification::eRemoved);
return;
}
}
@@ -24,10 +24,10 @@ struct GNACOMMON_EXPORT NasatAircraftParticipant
int id = 0;
int nasatAircraftId = 0;
int exerciseId = 0;
int participantId = 0;
int participantIdValue = 0;
// Helper method für Kompatibilität
int participantId() const { return participantId; }
int participantId() const { return participantIdValue; }
};
} // namespace GuezNasat
@@ -45,6 +45,6 @@ inline std::ostream& operator<<(std::ostream& os, const GuezNasat::NasatAircraft
{
os << "NasatAircraftParticipant{id=" << participant.id
<< ", nasatAircraftId=" << participant.nasatAircraftId
<< ", participantId=" << participant.participantId << "}";
<< ", participantId=" << participant.participantIdValue << "}";
return os;
}
@@ -1,15 +1,5 @@
#pragma once
// STUB-HEADER: Diese Datei wird normalerweise von DDS generiert
namespace GuezNasat
{
// NasatAircraftParticipant - Verbindung zwischen NASAT, Exercise und Participant
struct NasatAircraftParticipant {
int id = 0;
int nasatAircraftId = 0;
int exerciseId = 0;
int participantId = 0;
};
} // namespace GuezNasat
// NasatAircraftParticipant ist bereits in gna_nasat_aircraft.h definiert
#include "gna_nasat_aircraft.h"