From bd10a8db89ac7f78d789c4826a2996deb45c1ba4 Mon Sep 17 00:00:00 2001 From: twi-devel Date: Fri, 21 Aug 2026 00:25:15 +0200 Subject: [PATCH] AlarmManagement: DataModification-Namespace und Export-Macro korrigiert MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - SVCALMCOMMON_EXPORT in logger.h verwendet (statt ALM_COMMON_EXPORT) - Include für alm_types.h in alm_config_alarm_model.h hinzugefügt - Include für data_modification_enum.h in allen AlarmManagement-Modellen hinzugefügt - DataModification → Lts::DataModification in allen Gui-Modellen korrigiert - GuezNasat gna_dtc.h: Include für data_modification_enum.h hinzugefügt --- .../Gui/Common/alm_config_alarm_model.cpp | 13 ++++---- .../Gui/Common/alm_config_alarm_model.h | 4 ++- .../Gui/Common/alm_history_alarm_model.cpp | 31 ++++++++++--------- .../Gui/Common/alm_history_alarm_model.h | 15 ++++----- .../Lts/Services/AlarmManagement/logger.h | 2 +- .../include/GuezNasat/gna_dtc.h | 17 +++++----- 6 files changed, 44 insertions(+), 38 deletions(-) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.cpp index a9d88c334..cf54eae7f 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.cpp @@ -4,6 +4,7 @@ #include #include +#include #include namespace AlarmManagement @@ -33,7 +34,7 @@ bool ConfigAlarmModel::initModel(const std::shared_ptrenableAlarmConfig(); - auto cb = [this](const AlarmManagement::AlarmConfig& d) { onAlarmConfigChanged(d, DataModification::eAdded); }; + auto cb = [this](const AlarmManagement::AlarmConfig& d) { onAlarmConfigChanged(d, Lts::DataModification::eAdded); }; m_dtc->alarmConfigs(cb); return true; } @@ -108,7 +109,7 @@ void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig& switch (modType) { - case DataModification::eRemoved: { + case Lts::DataModification::eRemoved: { DEBUG_LOG(m_logger) << "AlarmConfig was removed: " << id; AlarmManagement::AlarmConfig data1 = data; @@ -118,8 +119,8 @@ void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig& removeRow(row); return; } - case DataModification::eModified: { - DEBUG_LOG(m_logger) << "DataModification::eModified: "; + case Lts::DataModification::eModified: { + DEBUG_LOG(m_logger) << "Lts::DataModification::eModified: "; if (row < 0) { @@ -129,8 +130,8 @@ void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig& setRowData(row, data); break; } - case DataModification::eAdded: { - DEBUG_LOG(m_logger) << "DataModification::eAdded"; + case Lts::DataModification::eAdded: { + DEBUG_LOG(m_logger) << "Lts::DataModification::eAdded"; insertRow(data); } break; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.h index 9422adc0b..631dc046a 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.h @@ -6,9 +6,11 @@ #include "almcommon_export.h" #include +#include #include #include #include +#include namespace AlarmManagement { @@ -37,7 +39,7 @@ class ALMCOMMON_EXPORT ConfigAlarmModel final : public LtsWidgets::LtsAbstractTa QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; private slots: - void onAlarmConfigChanged(const AlarmManagement::AlarmConfig& data, const DataModification modType); + void onAlarmConfigChanged(const AlarmManagement::AlarmConfig& data, const Lts::DataModification modType); private: NGL::INGLLogger& m_logger; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.cpp index 021d506d8..c10e4b4df 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -50,7 +51,7 @@ bool AlarmHistoryModel::initModel(const std::shared_ptrenableNotification(); const auto cbParticipants = [this](const ParticipantManagement::Participant& participant) { - onParticipantChanged(participant, DataModification::eAdded); + onParticipantChanged(participant, Lts::DataModification::eAdded); }; m_ppmDtc->participants(cbParticipants); @@ -72,7 +73,7 @@ bool AlarmHistoryModel::initModel(const std::shared_ptrborderlines(cbAesItem); m_aesDtc->dangerAreas(cbAesItem); @@ -133,7 +134,7 @@ QVariant AlarmHistoryModel::data(const QModelIndex& index, int role) const return QVariant(); } -bool AlarmHistoryModel::isFiltered(const NotificationEx& data, DataModification modType) const +bool AlarmHistoryModel::isFiltered(const NotificationEx& data, Lts::DataModification modType) const { Q_UNUSED(modType); if (data.operatorId() == 0) @@ -141,9 +142,9 @@ bool AlarmHistoryModel::isFiltered(const NotificationEx& data, DataModification return data.operatorId() != LtsSessionData::LtsSessionData::getInstance()->getOperatorId(); } -void AlarmHistoryModel::onNotificationChanged(const AlarmManagement::Notification& data, const DataModification modType) +void AlarmHistoryModel::onNotificationChanged(const AlarmManagement::Notification& data, const Lts::DataModification modType) { - if (modType == DataModification::eRemoved) + if (modType == Lts::DataModification::eRemoved) return; NotificationEx notification(data); @@ -167,9 +168,9 @@ void AlarmHistoryModel::onNotificationChanged(const AlarmManagement::Notificatio } void AlarmHistoryModel::onParticipantChanged(const ParticipantManagement::Participant& participant, - const DataModification modType) + const Lts::DataModification modType) { - if (modType == DataModification::eRemoved) + if (modType == Lts::DataModification::eRemoved) return; QString designator = QString::fromStdString(participant.designator()); m_idDesignatorMap.insert(participant.id(), designator); @@ -207,9 +208,9 @@ QString AlarmHistoryModel::getTactIdentifier(const int participantId) const } void AlarmHistoryModel::onBCContaminationChanged(const AreaEffectSimulation::BCContamination& data, - const DataModification modType) + const Lts::DataModification modType) { - if (modType == DataModification::eRemoved) + if (modType == Lts::DataModification::eRemoved) return; int id = data.id(); QString name = QString::fromStdString(data.name()); @@ -217,9 +218,9 @@ void AlarmHistoryModel::onBCContaminationChanged(const AreaEffectSimulation::BCC DEBUG_LOG(m_logger) << "onBCContaminationChanged: " << data << " Name=" << name << " id=" << id; } -void AlarmHistoryModel::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap& data, const DataModification modType) +void AlarmHistoryModel::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap& data, const Lts::DataModification modType) { - if (modType == DataModification::eRemoved) + if (modType == Lts::DataModification::eRemoved) return; int id = data.id(); QString name = QString::fromStdString(data.name()); @@ -228,9 +229,9 @@ void AlarmHistoryModel::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap } void AlarmHistoryModel::onOffRouteMineChanged(const AreaEffectSimulation::OffRouteMine& data, - const DataModification modType) + const Lts::DataModification modType) { - if (modType == DataModification::eRemoved) + if (modType == Lts::DataModification::eRemoved) return; int id = data.id(); QString name = QString::fromStdString(data.name()); @@ -238,9 +239,9 @@ void AlarmHistoryModel::onOffRouteMineChanged(const AreaEffectSimulation::OffRou DEBUG_LOG(m_logger) << "OffRouteMine: " << data << " Name=" << name << " id=" << id; } -void AlarmHistoryModel::onAesItemChanged(const AreaEffectSimulation::AesItem& item, const DataModification modType) +void AlarmHistoryModel::onAesItemChanged(const AreaEffectSimulation::AesItem& item, const Lts::DataModification modType) { - if (modType == DataModification::eRemoved) + if (modType == Lts::DataModification::eRemoved) return; QString name = QString::fromStdString(item.name()); int id = item.id(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.h index 23184ef51..7afcdac33 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.h @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -46,14 +47,14 @@ class ALMCOMMON_EXPORT AlarmHistoryModel final : public LtsWidgets::LtsAbstractT protected: NGL::INGLLogger& m_logger; - bool isFiltered(const NotificationEx& data, DataModification modType) const override; + bool isFiltered(const NotificationEx& data, Lts::DataModification modType) const override; private slots: - void onNotificationChanged(const AlarmManagement::Notification& data, const DataModification modType); - void onParticipantChanged(const ParticipantManagement::Participant& participant, const DataModification modType); - void onAesItemChanged(const AreaEffectSimulation::AesItem& item, const DataModification modType); - void onBCContaminationChanged(const AreaEffectSimulation::BCContamination& data, const DataModification modType); - void onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap& data, const DataModification modType); - void onOffRouteMineChanged(const AreaEffectSimulation::OffRouteMine& data, const DataModification modType); + void onNotificationChanged(const AlarmManagement::Notification& data, const Lts::DataModification modType); + void onParticipantChanged(const ParticipantManagement::Participant& participant, const Lts::DataModification modType); + void onAesItemChanged(const AreaEffectSimulation::AesItem& item, const Lts::DataModification modType); + void onBCContaminationChanged(const AreaEffectSimulation::BCContamination& data, const Lts::DataModification modType); + void onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap& data, const Lts::DataModification modType); + void onOffRouteMineChanged(const AreaEffectSimulation::OffRouteMine& data, const Lts::DataModification modType); private: std::shared_ptr m_dtc; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/logger.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/logger.h index 23651ec30..c3afa47f9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/logger.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/logger.h @@ -15,7 +15,7 @@ namespace AlarmManagement { using LOGGER_T = NGL::INGLLogger &; -ALM_COMMON_EXPORT LOGGER_T getLogger(const char *name); +SVCALMCOMMON_EXPORT LOGGER_T getLogger(const char *name); inline LOGGER_T getLogger(const QString &loggerName) { return getLogger(loggerName.toUtf8().constData()); 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 dd024d933..055bdbb41 100644 --- a/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_dtc.h +++ b/qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_dtc.h @@ -7,6 +7,7 @@ #include "gna_nasat_aircraft_participant.h" #include "../ParticipantManagement/ppm_enums.hpp" #include "../ParticipantManagement/ppm.hpp" +#include "../../Lts/Common/LtsUtils/LtsUtilsCore/data_modification_enum.h" #include #include @@ -71,14 +72,14 @@ public: // Daten hinzufügen/entfernen/ändern void addNasatAircraftParticipant(const NasatAircraftParticipant& nap) { m_nasatAircraftParticipants.append(nap); - emit nasatAircraftParticipantChanged(nap, ParticipantManagement::DataModification::eAdded); + emit nasatAircraftParticipantChanged(nap, DataModification::eAdded); } void updateNasatAircraftParticipant(const NasatAircraftParticipant& nap) { for (auto& existing : m_nasatAircraftParticipants) { if (existing.id() == nap.id()) { existing = nap; - emit nasatAircraftParticipantChanged(nap, ParticipantManagement::DataModification::eModified); + emit nasatAircraftParticipantChanged(nap, DataModification::eModified); return; } } @@ -90,7 +91,7 @@ public: if (it->id() == id) { NasatAircraftParticipant removed = *it; m_nasatAircraftParticipants.erase(it); - emit nasatAircraftParticipantChanged(removed, ParticipantManagement::DataModification::eRemoved); + emit nasatAircraftParticipantChanged(removed, DataModification::eRemoved); return; } } @@ -98,14 +99,14 @@ public: void addNasatAircraft(const NasatAircraft& na) { m_nasatAircrafts.append(na); - emit nasatAircraftChanged(na, ParticipantManagement::DataModification::eAdded); + emit nasatAircraftChanged(na, DataModification::eAdded); } void updateNasatAircraft(const NasatAircraft& na) { for (auto& existing : m_nasatAircrafts) { if (existing.id() == na.id()) { existing = na; - emit nasatAircraftChanged(na, ParticipantManagement::DataModification::eModified); + emit nasatAircraftChanged(na, DataModification::eModified); return; } } @@ -117,15 +118,15 @@ public: if (it->id() == id) { NasatAircraft removed = *it; m_nasatAircrafts.erase(it); - emit nasatAircraftChanged(removed, ParticipantManagement::DataModification::eRemoved); + emit nasatAircraftChanged(removed, DataModification::eRemoved); return; } } } signals: - void nasatAircraftParticipantChanged(const NasatAircraftParticipant& participant, ParticipantManagement::DataModification modificationType); - void nasatAircraftChanged(const NasatAircraft& aircraft, ParticipantManagement::DataModification modificationType); + void nasatAircraftParticipantChanged(const NasatAircraftParticipant& participant, DataModification modificationType); + void nasatAircraftChanged(const NasatAircraft& aircraft, DataModification modificationType); private: QList m_nasatAircraftParticipants;