lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AlarmManagement: DataModification-Namespace und Export-Macro korrigiert

Browse Source 
- 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
This commit is contained in:
torsten committed 2026-08-21 01:49:35 +02:00
1 parent c7fa97c8bf
commit bd10a8db89
6 files changed
+44 -38
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.cpp
+7 -6
View File
@@ -4,6 +4,7 @@
#include <AlarmManagement/alm_translation.h> #include <AlarmManagement/alm_translation.h>
#include <LtsSession/lts_session_data.h> #include <LtsSession/lts_session_data.h>
#include <LtsUtilsCore/data_modification_enum.h>
#include <ProjectDataManagement/pdm_to_string.h> #include <ProjectDataManagement/pdm_to_string.h>
namespace AlarmManagement namespace AlarmManagement
@@ -33,7 +34,7 @@ bool ConfigAlarmModel::initModel(const std::shared_ptr<AlarmManagement::Interfac
connect(m_dtc.get(), &Interface::Dtc::alarmConfigChanged, this, &ConfigAlarmModel::onAlarmConfigChanged); connect(m_dtc.get(), &Interface::Dtc::alarmConfigChanged, this, &ConfigAlarmModel::onAlarmConfigChanged);
m_dtc->enableAlarmConfig(); m_dtc->enableAlarmConfig();
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); m_dtc->alarmConfigs(cb);
return true; return true;
} }
@@ -108,7 +109,7 @@ void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig&
switch (modType) switch (modType)
{ {
case DataModification::eRemoved: { case Lts::DataModification::eRemoved: {
DEBUG_LOG(m_logger) << "AlarmConfig was removed: " << id; DEBUG_LOG(m_logger) << "AlarmConfig was removed: " << id;
AlarmManagement::AlarmConfig data1 = data; AlarmManagement::AlarmConfig data1 = data;
@@ -118,8 +119,8 @@ void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig&
removeRow(row); removeRow(row);
return; return;
} }
case DataModification::eModified: { case Lts::DataModification::eModified: {
DEBUG_LOG(m_logger) << "DataModification::eModified: "; DEBUG_LOG(m_logger) << "Lts::DataModification::eModified: ";
if (row < 0) if (row < 0)
{ {
@@ -129,8 +130,8 @@ void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig&
setRowData(row, data); setRowData(row, data);
break; break;
} }
case DataModification::eAdded: { case Lts::DataModification::eAdded: {
DEBUG_LOG(m_logger) << "DataModification::eAdded"; DEBUG_LOG(m_logger) << "Lts::DataModification::eAdded";
insertRow(data); insertRow(data);
} }
break; break;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.h
+3 -1
View File
@@ -6,9 +6,11 @@
#include "almcommon_export.h" #include "almcommon_export.h"
#include <AlarmManagement/alm_dtc.h> #include <AlarmManagement/alm_dtc.h>
#include <AlarmManagement/alm_types.h>
#include <AlarmManagement/logger.h> #include <AlarmManagement/logger.h>
#include <LtsSession/lts_session.h> #include <LtsSession/lts_session.h>
#include <LtsWidgets/lts_abstract_table_model.h> #include <LtsWidgets/lts_abstract_table_model.h>
#include <LtsUtils/data_modification_enum.h>
namespace AlarmManagement 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; QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
private slots: private slots:
void onAlarmConfigChanged(const AlarmManagement::AlarmConfig& data, const DataModification modType); void onAlarmConfigChanged(const AlarmManagement::AlarmConfig& data, const Lts::DataModification modType);
private: private:
NGL::INGLLogger& m_logger; NGL::INGLLogger& m_logger;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.cpp
+16 -15
View File
@@ -5,6 +5,7 @@
#include <AlarmManagement/alm_translation.h> #include <AlarmManagement/alm_translation.h>
#include <LtsCoordTrans/lts_coord_trans.h> #include <LtsCoordTrans/lts_coord_trans.h>
#include <LtsSession/lts_session_data.h> #include <LtsSession/lts_session_data.h>
#include <LtsUtilsCore/data_modification_enum.h>
#include <ParticipantManagement/ppm_translation.h> #include <ParticipantManagement/ppm_translation.h>
#include <ProjectDataManagement/pdm_translation.h> #include <ProjectDataManagement/pdm_translation.h>
#include <QJsonDocument> #include <QJsonDocument>
@@ -50,7 +51,7 @@ bool AlarmHistoryModel::initModel(const std::shared_ptr<AlarmManagement::Interfa
m_dtc->enableNotification(); m_dtc->enableNotification();
const auto cbParticipants = [this](const ParticipantManagement::Participant& participant) { const auto cbParticipants = [this](const ParticipantManagement::Participant& participant) {
onParticipantChanged(participant, DataModification::eAdded); onParticipantChanged(participant, Lts::DataModification::eAdded);
}; };
m_ppmDtc->participants(cbParticipants); m_ppmDtc->participants(cbParticipants);
@@ -72,7 +73,7 @@ bool AlarmHistoryModel::initModel(const std::shared_ptr<AlarmManagement::Interfa
&AlarmHistoryModel::onOffRouteMineChanged); &AlarmHistoryModel::onOffRouteMineChanged);
auto cbAesItem = [this](const AreaEffectSimulation::AesItem& item) { auto cbAesItem = [this](const AreaEffectSimulation::AesItem& item) {
onAesItemChanged(item, DataModification::eAdded); onAesItemChanged(item, Lts::DataModification::eAdded);
}; };
m_aesDtc->borderlines(cbAesItem); m_aesDtc->borderlines(cbAesItem);
m_aesDtc->dangerAreas(cbAesItem); m_aesDtc->dangerAreas(cbAesItem);
@@ -133,7 +134,7 @@ QVariant AlarmHistoryModel::data(const QModelIndex& index, int role) const
return QVariant(); return QVariant();
} }
bool AlarmHistoryModel::isFiltered(const NotificationEx& data, DataModification modType) const bool AlarmHistoryModel::isFiltered(const NotificationEx& data, Lts::DataModification modType) const
{ {
Q_UNUSED(modType); Q_UNUSED(modType);
if (data.operatorId() == 0) if (data.operatorId() == 0)
@@ -141,9 +142,9 @@ bool AlarmHistoryModel::isFiltered(const NotificationEx& data, DataModification
return data.operatorId() != LtsSessionData::LtsSessionData::getInstance()->getOperatorId(); 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; return;
NotificationEx notification(data); NotificationEx notification(data);
@@ -167,9 +168,9 @@ void AlarmHistoryModel::onNotificationChanged(const AlarmManagement::Notificatio
} }
void AlarmHistoryModel::onParticipantChanged(const ParticipantManagement::Participant& participant, void AlarmHistoryModel::onParticipantChanged(const ParticipantManagement::Participant& participant,
const DataModification modType) const Lts::DataModification modType)
{ {
if (modType == DataModification::eRemoved) if (modType == Lts::DataModification::eRemoved)
return; return;
QString designator = QString::fromStdString(participant.designator()); QString designator = QString::fromStdString(participant.designator());
m_idDesignatorMap.insert(participant.id(), 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, void AlarmHistoryModel::onBCContaminationChanged(const AreaEffectSimulation::BCContamination& data,
const DataModification modType) const Lts::DataModification modType)
{ {
if (modType == DataModification::eRemoved) if (modType == Lts::DataModification::eRemoved)
return; return;
int id = data.id(); int id = data.id();
QString name = QString::fromStdString(data.name()); 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; 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; return;
int id = data.id(); int id = data.id();
QString name = QString::fromStdString(data.name()); QString name = QString::fromStdString(data.name());
@@ -228,9 +229,9 @@ void AlarmHistoryModel::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap
} }
void AlarmHistoryModel::onOffRouteMineChanged(const AreaEffectSimulation::OffRouteMine& data, void AlarmHistoryModel::onOffRouteMineChanged(const AreaEffectSimulation::OffRouteMine& data,
const DataModification modType) const Lts::DataModification modType)
{ {
if (modType == DataModification::eRemoved) if (modType == Lts::DataModification::eRemoved)
return; return;
int id = data.id(); int id = data.id();
QString name = QString::fromStdString(data.name()); 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; 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; return;
QString name = QString::fromStdString(item.name()); QString name = QString::fromStdString(item.name());
int id = item.id(); int id = item.id();
qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.h
+8 -7
View File
@@ -7,6 +7,7 @@
#include <AlarmManagement/alm_dtc.h> #include <AlarmManagement/alm_dtc.h>
#include <AlarmManagement/logger.h> #include <AlarmManagement/logger.h>
#include <AreaEffectSimulation/aes_dtc.h> #include <AreaEffectSimulation/aes_dtc.h>
#include <LtsUtilsCore/data_modification_enum.h>
#include <LtsWidgets/lts_abstract_table_model.h> #include <LtsWidgets/lts_abstract_table_model.h>
#include <LtsWidgets/lts_column_filter_proxy_model.h> #include <LtsWidgets/lts_column_filter_proxy_model.h>
#include <ParticipantManagement/ppm.hpp> #include <ParticipantManagement/ppm.hpp>
@@ -46,14 +47,14 @@ class ALMCOMMON_EXPORT AlarmHistoryModel final : public LtsWidgets::LtsAbstractT
protected: protected:
NGL::INGLLogger& m_logger; 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: private slots:
void onNotificationChanged(const AlarmManagement::Notification& data, const DataModification modType); void onNotificationChanged(const AlarmManagement::Notification& data, const Lts::DataModification modType);
void onParticipantChanged(const ParticipantManagement::Participant& participant, const DataModification modType); void onParticipantChanged(const ParticipantManagement::Participant& participant, const Lts::DataModification modType);
void onAesItemChanged(const AreaEffectSimulation::AesItem& item, const DataModification modType); void onAesItemChanged(const AreaEffectSimulation::AesItem& item, const Lts::DataModification modType);
void onBCContaminationChanged(const AreaEffectSimulation::BCContamination& data, const DataModification modType); void onBCContaminationChanged(const AreaEffectSimulation::BCContamination& data, const Lts::DataModification modType);
void onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap& data, const DataModification modType); void onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap& data, const Lts::DataModification modType);
void onOffRouteMineChanged(const AreaEffectSimulation::OffRouteMine& data, const DataModification modType); void onOffRouteMineChanged(const AreaEffectSimulation::OffRouteMine& data, const Lts::DataModification modType);
private: private:
std::shared_ptr<AlarmManagement::Interface::Dtc> m_dtc; std::shared_ptr<AlarmManagement::Interface::Dtc> m_dtc;
qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/logger.h
+1 -1
View File
@@ -15,7 +15,7 @@ namespace AlarmManagement
{ {
using LOGGER_T = NGL::INGLLogger &; 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) inline LOGGER_T getLogger(const QString &loggerName)
{ {
return getLogger(loggerName.toUtf8().constData()); return getLogger(loggerName.toUtf8().constData());
qt6-after/qt6-migrated-legatus/include/GuezNasat/gna_dtc.h
+9 -8
View File
@@ -7,6 +7,7 @@
#include "gna_nasat_aircraft_participant.h" #include "gna_nasat_aircraft_participant.h"
#include "../ParticipantManagement/ppm_enums.hpp" #include "../ParticipantManagement/ppm_enums.hpp"
#include "../ParticipantManagement/ppm.hpp" #include "../ParticipantManagement/ppm.hpp"
#include "../../Lts/Common/LtsUtils/LtsUtilsCore/data_modification_enum.h"
#include <QObject> #include <QObject>
#include <QList> #include <QList>
@@ -71,14 +72,14 @@ public:
// Daten hinzufügen/entfernen/ändern // Daten hinzufügen/entfernen/ändern
void addNasatAircraftParticipant(const NasatAircraftParticipant& nap) { void addNasatAircraftParticipant(const NasatAircraftParticipant& nap) {
m_nasatAircraftParticipants.append(nap); m_nasatAircraftParticipants.append(nap);
emit nasatAircraftParticipantChanged(nap, ParticipantManagement::DataModification::eAdded); emit nasatAircraftParticipantChanged(nap, DataModification::eAdded);
} }
void updateNasatAircraftParticipant(const NasatAircraftParticipant& nap) { void updateNasatAircraftParticipant(const NasatAircraftParticipant& nap) {
for (auto& existing : m_nasatAircraftParticipants) { for (auto& existing : m_nasatAircraftParticipants) {
if (existing.id() == nap.id()) { if (existing.id() == nap.id()) {
existing = nap; existing = nap;
emit nasatAircraftParticipantChanged(nap, ParticipantManagement::DataModification::eModified); emit nasatAircraftParticipantChanged(nap, DataModification::eModified);
return; return;
} }
} }
@@ -90,7 +91,7 @@ public:
if (it->id() == id) { if (it->id() == id) {
NasatAircraftParticipant removed = *it; NasatAircraftParticipant removed = *it;
m_nasatAircraftParticipants.erase(it); m_nasatAircraftParticipants.erase(it);
emit nasatAircraftParticipantChanged(removed, ParticipantManagement::DataModification::eRemoved); emit nasatAircraftParticipantChanged(removed, DataModification::eRemoved);
return; return;
} }
} }
@@ -98,14 +99,14 @@ public:
void addNasatAircraft(const NasatAircraft& na) { void addNasatAircraft(const NasatAircraft& na) {
m_nasatAircrafts.append(na); m_nasatAircrafts.append(na);
emit nasatAircraftChanged(na, ParticipantManagement::DataModification::eAdded); emit nasatAircraftChanged(na, DataModification::eAdded);
} }
void updateNasatAircraft(const NasatAircraft& na) { void updateNasatAircraft(const NasatAircraft& na) {
for (auto& existing : m_nasatAircrafts) { for (auto& existing : m_nasatAircrafts) {
if (existing.id() == na.id()) { if (existing.id() == na.id()) {
existing = na; existing = na;
emit nasatAircraftChanged(na, ParticipantManagement::DataModification::eModified); emit nasatAircraftChanged(na, DataModification::eModified);
return; return;
} }
} }
@@ -117,15 +118,15 @@ public:
if (it->id() == id) { if (it->id() == id) {
NasatAircraft removed = *it; NasatAircraft removed = *it;
m_nasatAircrafts.erase(it); m_nasatAircrafts.erase(it);
emit nasatAircraftChanged(removed, ParticipantManagement::DataModification::eRemoved); emit nasatAircraftChanged(removed, DataModification::eRemoved);
return; return;
} }
} }
} }
signals: signals:
void nasatAircraftParticipantChanged(const NasatAircraftParticipant& participant, ParticipantManagement::DataModification modificationType); void nasatAircraftParticipantChanged(const NasatAircraftParticipant& participant, DataModification modificationType);
void nasatAircraftChanged(const NasatAircraft& aircraft, ParticipantManagement::DataModification modificationType); void nasatAircraftChanged(const NasatAircraft& aircraft, DataModification modificationType);
private: private:
QList<NasatAircraftParticipant> m_nasatAircraftParticipants; QList<NasatAircraftParticipant> m_nasatAircraftParticipants;