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.
2026-08-21 01:49:35 +02:00
1 parent e22dd98040
commit c7fa97c8bf
@@ -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<LtsPluginManager::AppPluginInstance>& dataPluginList,
@@ -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
@@ -4,6 +4,8 @@
 #include "gna_nasat_aircraft_model.h"
 #include <GuezNasat/gna_translation.h>
 #include <LtsSession/lts_session_data.h>
+#include <ParticipantManagement/ppm_enums.hpp>
+#include <LtsUtilsCore/data_modification_enum.h>


 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<GuezNasat::Interface::D

  
  connect(m_dtc.get(), &Interface::Dtc::nasatAircraftChanged,
-          this, &NasatAircraftModel::onDataChanged);
+          this, [this](const NasatAircraft& data, DataModification modType) {
+            onDataChanged(data, modType);
+          });
  auto cb = [this](const NasatAircraft &data)
  {
    onDataChanged(data, DataModification::eAdded);
@@ -58,7 +63,7 @@ QVariant NasatAircraftModel::data(const QModelIndex &index, int role) const
  case SimulationActive:
    return nasatAircraft.simulationActive() ? tr("Yes") : tr("No");
  case Name:
-    return QString::fromStdString(nasatAircraft.name());
+    return nasatAircraft.name();
  }

  return QVariant();
@@ -4,6 +4,7 @@
 #include "gna_nasat_aircraft_part_model.h"
 #include <GuezNasat/gna_translation.h>
 #include <ParticipantManagement/ppm_translation.h>
+#include <LtsUtilsCore/data_modification_enum.h>

 namespace GuezNasat
 {
@@ -52,22 +53,22 @@ bool NasatAircraftParticipantModel::initModel(const std::shared_ptr<GuezNasat::I
          this, &NasatAircraftParticipantModel::onParticipantChanged);

  {
-    auto cb = [this](const NasatAircraftParticipant &d) { onNasatAircraftParticipantChanged(d, ParticipantManagement::DataModification::eAdded); };
+    auto cb = [this](const NasatAircraftParticipant &d) { onNasatAircraftParticipantChanged(d, DataModification::eAdded); };
    m_dtc->nasatAircraftParticipants(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<int> NasatAircraftParticipantModel::getAssociatedNasatIds() const
  QSet<int> 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<int> NasatAircraftParticipantModel::getAssociatedParticipantIds() const
  QSet<int> 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<GuezNasat::NasatAircraftParticipant>::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<int>(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<int>(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<int>(modType);
+  DEBUG_LOG(m_logger) << "onNasatAircraftChanged: id=" << data.id() << ", name=" << data.name() << ", modType=" << static_cast<int>(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();
@@ -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: