From c7fa97c8bf24e0b6dda02de33ed74d01e5750eff Mon Sep 17 00:00:00 2001 From: twi-devel Date: Fri, 21 Aug 2026 00:15:12 +0200 Subject: [PATCH] GuezNasat: DataModification-Type-Konsistenz und Include-Pfade korrigiert MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - gna_nasat_aircraft_model.h/.cpp: Include-Pfad zu 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. --- .../Lts/Common/LtsSession/lts_session.h | 2 + .../GuezNasat/Gui/Common/CMakeLists.txt | 2 +- .../Gui/Common/gna_nasat_aircraft_model.cpp | 9 ++- .../Common/gna_nasat_aircraft_part_model.cpp | 69 ++++++++++--------- .../Common/gna_nasat_aircraft_part_model.h | 8 +-- .../include/GuezNasat/gna_dtc.h | 12 ++-- .../include/GuezNasat/gna_nasat_aircraft.h | 39 +++++++---- 7 files changed, 81 insertions(+), 60 deletions(-) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.h index 8ca831e10..1b97e0f8f 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.h @@ -409,7 +409,9 @@ const QString workspaceId() const; friend class LtsSessionManager; #endif +#ifdef BUILD_RTI bool event(QEvent* e) override; +#endif void createBaseLayout(); #ifdef BUILD_RTI void initializePlugins(const QVector& dataPluginList, diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/CMakeLists.txt index 0cb463c6f..5903f1d85 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/CMakeLists.txt @@ -21,7 +21,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(GnaCommon ${CMAKE_CURRENT_SOURCE_DIR}/../../ ${CMAKE_CURRENT_SOURCE_DIR}/../../Services/ ${CMAKE_SOURCE_DIR}/Lts/Plugins/ - ${CMAKE_CURRENT_SOURCE_DIR}/../../../../Proxies/ + ${CMAKE_SOURCE_DIR}/Lts/Proxies/ ) NGL_TARGET_LINK_LIBRARIES(GnaCommon PRIVATE diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_model.cpp index f56ac27e9..266a1b3f3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_model.cpp @@ -4,6 +4,8 @@ #include "gna_nasat_aircraft_model.h" #include #include +#include +#include namespace GuezNasat @@ -20,6 +22,7 @@ NasatAircraftModel::NasatAircraftModel(QObject *parent) tr("Simulation Activated") }, parent) +, m_logger(GuezNasat::getLogger("NasatAircraftModel")) , m_dtc(nullptr) {} @@ -30,7 +33,9 @@ bool NasatAircraftModel::initModel(const std::shared_ptr #include +#include namespace GuezNasat { @@ -52,22 +53,22 @@ bool NasatAircraftParticipantModel::initModel(const std::shared_ptrnasatAircraftParticipants(cb); } { - auto cb = [this](const NasatAircraft &d) { onNasatAircraftChanged(d, ParticipantManagement::DataModification::eAdded); }; + auto cb = [this](const NasatAircraft &d) { onNasatAircraftChanged(d, DataModification::eAdded); }; m_dtc->nasatAircrafts(cb); } { - auto cb = [this](const ExerciseManagement::Exercise &d) { onExerciseChanged(d, ParticipantManagement::DataModification::eAdded); }; + auto cb = [this](const ExerciseManagement::Exercise &d) { onExerciseChanged(d, DataModification::eAdded); }; m_exm_dtc->exercises(cb); } { - auto cb = [this](const ParticipantManagement::Participant &d) { onParticipantChanged(d, ParticipantManagement::DataModification::eAdded); }; + auto cb = [this](const ParticipantManagement::Participant &d) { onParticipantChanged(d, DataModification::eAdded); }; m_ppm_dtc->participants(cb); } @@ -86,35 +87,35 @@ QVariant NasatAircraftParticipantModel::data(const QModelIndex &index, int role) if (role == Qt::DecorationRole) { if (index.column() == Participant) - return m_participantDecorations.value(nasatAircraftParticipant.participantId); + return m_participantDecorations.value(nasatAircraftParticipant.participantId()); return QVariant(); } if (index.column() == Id) { - INFO_LOG(m_logger) << "nasatAircraftParticipant.id=" << nasatAircraftParticipant.id; - return nasatAircraftParticipant.id; + INFO_LOG(m_logger) << "nasatAircraftParticipant.id=" << nasatAircraftParticipant.id(); + return nasatAircraftParticipant.id(); } switch (index.column()) { case NasatAircreaftId: - return nasatAircraftParticipant.nasatAircraftId; + return nasatAircraftParticipant.nasatAircraftId(); case Nasat: - if (m_nasatNames.contains(nasatAircraftParticipant.nasatAircraftId)) - return m_nasatNames[nasatAircraftParticipant.nasatAircraftId]; + if (m_nasatNames.contains(nasatAircraftParticipant.nasatAircraftId())) + return m_nasatNames[nasatAircraftParticipant.nasatAircraftId()]; return tr("No Participant"); case ExerciseId: - return nasatAircraftParticipant.exerciseId; + return nasatAircraftParticipant.exerciseId(); case ExerciseName: - if (m_exerciseNames.contains(nasatAircraftParticipant.exerciseId)) - return m_exerciseNames[nasatAircraftParticipant.exerciseId]; + if (m_exerciseNames.contains(nasatAircraftParticipant.exerciseId())) + return m_exerciseNames[nasatAircraftParticipant.exerciseId()]; return tr("No exercise name available"); case ParticipantId: - return nasatAircraftParticipant.participantId; + return nasatAircraftParticipant.participantId(); case Participant: - if (m_participantHierarchies.contains(nasatAircraftParticipant.participantId)) - return m_participantHierarchies[nasatAircraftParticipant.participantId]; + if (m_participantHierarchies.contains(nasatAircraftParticipant.participantId())) + return m_participantHierarchies[nasatAircraftParticipant.participantId()]; return tr("No participant name available"); } @@ -126,7 +127,7 @@ QSet NasatAircraftParticipantModel::getAssociatedNasatIds() const QSet ret; ret.reserve(m_vecData.size()); for (const NasatAircraftParticipant &data : m_vecData) - ret += data.nasatAircraftId; + ret += data.nasatAircraftId(); return ret; } @@ -135,14 +136,14 @@ QSet NasatAircraftParticipantModel::getAssociatedParticipantIds() const QSet ret; ret.reserve(m_vecData.size()); for (const NasatAircraftParticipant &data : m_vecData) - ret += data.participantId; + ret += data.participantId(); return ret; } void NasatAircraftParticipantModel::onNasatAircraftParticipantChanged(const GuezNasat::NasatAircraftParticipant &data, const DataModification modType) { - if (data.exerciseId != m_session->exerciseId()) + if (data.exerciseId() != m_session->exerciseId()) return; LtsWidgets::LtsAbstractTableModel::onDataChanged(data, modType); @@ -152,35 +153,35 @@ void NasatAircraftParticipantModel::onNasatAircraftParticipantChanged(const Guez } void NasatAircraftParticipantModel::onExerciseChanged(const ExerciseManagement::Exercise &data, - const ParticipantManagement::DataModification modType) + const DataModification modType) { INFO_LOG(m_logger) << "onExerciseChanged: id=" << data.id << ", name=" << data.name << ", modType=" << static_cast(modType); switch (modType) { - case ParticipantManagement::DataModification::eRemoved: + case DataModification::eRemoved: m_exerciseNames.remove(data.id); break; - case ParticipantManagement::DataModification::eModified: - case ParticipantManagement::DataModification::eAdded: + case DataModification::eModified: + case DataModification::eAdded: m_exerciseNames.insert(data.id, data.name); break; } } void NasatAircraftParticipantModel::onParticipantChanged(const ParticipantManagement::Participant &data, - ParticipantManagement::DataModification modType) + DataModification modType) { INFO_LOG(m_logger) << "onParticipantChanged: id=" << data.id << ", name=" << data.name() << ", modType=" << static_cast(modType); // isDeleted() existiert im STUB nicht - entfernen switch (modType) { - case ParticipantManagement::DataModification::eRemoved: + case DataModification::eRemoved: m_participantHierarchies.remove(data.id); break; - case ParticipantManagement::DataModification::eModified: - case ParticipantManagement::DataModification::eAdded: + case DataModification::eModified: + case DataModification::eAdded: { DEBUG_LOG(m_logger) << "DataModification::eAdded Participant" << " TypeId=" << data.typeId @@ -205,17 +206,17 @@ void NasatAircraftParticipantModel::onParticipantChanged(const ParticipantManage } void NasatAircraftParticipantModel::onNasatAircraftChanged(const GuezNasat::NasatAircraft &data, - const ParticipantManagement::DataModification modType) + const DataModification modType) { - DEBUG_LOG(m_logger) << "onNasatAircraftChanged: id=" << data.id << ", name=" << data.name << ", modType=" << static_cast(modType); + DEBUG_LOG(m_logger) << "onNasatAircraftChanged: id=" << data.id() << ", name=" << data.name() << ", modType=" << static_cast(modType); switch (modType) { - case ParticipantManagement::DataModification::eRemoved: - m_nasatNames.remove(data.id); + case DataModification::eRemoved: + m_nasatNames.remove(data.id()); break; - case ParticipantManagement::DataModification::eModified: - case ParticipantManagement::DataModification::eAdded: - m_nasatNames.insert(data.id, data.name); + case DataModification::eModified: + case DataModification::eAdded: + m_nasatNames.insert(data.id(), data.name()); break; } emit signalNasatNamesChanged(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_part_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_part_model.h index 4c7a09c32..40d7856ae 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_part_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_part_model.h @@ -62,13 +62,13 @@ signals: private slots: void onNasatAircraftParticipantChanged(const GuezNasat::NasatAircraftParticipant &data, - const ParticipantManagement::DataModification modType); + const DataModification modType); void onExerciseChanged(const ExerciseManagement::Exercise &data, - const ParticipantManagement::DataModification modType); + const DataModification modType); void onParticipantChanged(const ParticipantManagement::Participant &data, - ParticipantManagement::DataModification modType); + DataModification modType); void onNasatAircraftChanged(const GuezNasat::NasatAircraft &data, - const ParticipantManagement::DataModification modType); + const DataModification modType); private: diff --git a/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_dtc.h b/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_dtc.h index 012340ec8..dd024d933 100644 --- a/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_dtc.h +++ b/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_dtc.h @@ -47,7 +47,7 @@ public: QMap nasatAircraftParticipants() const { QMap result; for (const auto& nap : m_nasatAircraftParticipants) { - result[nap.id] = nap; + result[nap.id()] = nap; } return result; } @@ -63,7 +63,7 @@ public: QMap nasatAircrafts() const { QMap 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); diff --git a/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_nasat_aircraft.h b/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_nasat_aircraft.h index 1ee309280..25de5aa7c 100644 --- a/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_nasat_aircraft.h +++ b/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_nasat_aircraft.h @@ -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 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; } \ No newline at end of file