From d17d397fe772481f47ad077c2ec1c87e3d2787bb Mon Sep 17 00:00:00 2001 From: twi-devel Date: Fri, 21 Aug 2026 01:46:56 +0200 Subject: [PATCH] =?UTF-8?q?LtsUtilsCore:=20Alle=20Include-Pfade=20korrigie?= =?UTF-8?q?rt=20(LtsUtils/=20=E2=86=92=20LtsUtilsCore/)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - CMakeLists.txt: Include-Pfade von ../ zu . geändert, json.h hinzugefügt - ~95 Dateien: Include-Pfade systematisch korrigiert - LtsUtils/ → LtsUtilsCore/ für alle Core-Header - LtsUtilsGui/LtsUtils/LtsUtilsGui/ → LtsUtilsGui/LtsUtilsGuiDds/ - Logger-API: getLogger() mit const char* Parameter - DataModification: enum class global (nicht im Lts-Namespace) - Participant-Struct: Member mit m_-Präfix - Export-Macro: SVCALMCOMMON_EXPORT statt ALMCOMMON_EXPORT - Signal/Slot-Signaturen korrigiert für Qt6 template matching Build validiert: LtsUtilsCore, LtsUtilsDds, LtsSessionData erfolgreich --- .../LtsUtils/LtsUtilsCore/CMakeLists.txt | 9 +- .../LtsUtilsGuiDds/dds_vector_to_pixmap.h | 2 +- .../Gui/Common/alm_config_alarm_model.cpp | 30 ++-- .../Gui/Common/alm_config_alarm_model.h | 7 +- .../Gui/Common/alm_history_alarm_model.cpp | 79 +++++----- .../Gui/Common/alm_history_alarm_model.h | 18 +-- .../asm_edit_training_area_dialog.cpp | 2 +- .../ExerciseEdit/CustomViews/exm_exercise.cpp | 2 +- .../Gui/ExerciseEdit/exm_edit_dialog.cpp | 2 +- .../Gui/Explorer/TopicEditor/topic_editor.cpp | 2 +- .../Gui/Explorer/flm_dialog_model_folder.cpp | 2 +- .../Gui/Explorer/flm_explorer_gui_plugin.cpp | 2 +- .../Gui/Explorer/flm_preview_file_dialog.cpp | 2 +- .../Gui/Explorer/flm_preview_playback.cpp | 2 +- .../Gui/Common/CustomViews/mrk_marker.cpp | 2 +- .../Gui/MarkerEdit/mrk_create_snapshot.cpp | 2 +- .../Gui/MarkerEdit/mrk_set_markers.cpp | 2 +- .../Gui/MarkerEdit/snapshot_dialog.cpp | 2 +- .../Gui/MarkerEdit/snapshot_dialog_model.cpp | 2 +- .../Gui/Common/operator_dialog_model.cpp | 2 +- .../Gui/Login/opm_login_dialog_gui_plugin.cpp | 2 +- .../Gui/OperatorEdit/operator_edit_dialog.cpp | 2 +- .../operator_settings_dialog.cpp | 2 +- .../Gui/plan_overlays_gui_plugin.cpp | 2 +- .../AdapterDds/dus_single_mine_to_map.cpp | 2 +- .../AdapterDds/effect_cluster_to_map.cpp | 2 +- .../AdapterDds/explosion_area_to_map.cpp | 2 +- .../AdapterDds/explosion_cluster_to_map.cpp | 2 +- .../AdapterDds/gas_pipe_to_map.cpp | 2 +- .../AdapterDds/mine_area_null_to_map.cpp | 2 +- .../AdapterDds/mine_area_to_map.cpp | 2 +- .../AdapterDds/mine_corridor_to_map.cpp | 2 +- .../AdapterDds/shootback_area_to_map.cpp | 2 +- .../AdapterDds/special_areas_to_map.cpp | 2 +- .../AdapterDds/technical_area_to_map.cpp | 2 +- .../AdapterDds/training_area_to_map.cpp | 2 +- .../Lts/Proxies/Buildings/settings.cpp | 2 +- .../Apache/aes_handler.cpp | 2 +- .../Guez/aes_handler.cpp | 2 +- .../Plugins/AdlerJson/settings.cpp | 2 +- .../Lts/Proxies/TrainingAreaBase/settings.cpp | 2 +- .../TrainingAreaBaseOC/canag_handler.cpp | 2 +- .../TrainingAreaBaseOC/handler_aes_data.cpp | 2 +- .../AreaEffectSimulation/Utils/aes_helper.h | 2 +- .../object_effect_cluster.cpp | 2 +- .../object_explosion_area.cpp | 4 +- .../object_explosion_cluster.cpp | 2 +- .../AreaEffectSimulation/object_mine_area.cpp | 2 +- .../object_mine_area_null.cpp | 2 +- .../AudioVideoManagement/ava_control.cpp | 2 +- .../AudioVideoManagement/vd_control.cpp | 2 +- .../Plugins/Buildings/handler_aes_data.cpp | 2 +- .../Plugins/Ces2D/handler_aes_data.cpp | 2 +- .../Ces2D/handler_participant_area.cpp | 2 +- .../Plugins/Explosions/handler_explosions.cpp | 2 +- .../Plugins/Explosions/handler_vulcano.cpp | 2 +- .../handler_functional_area.cpp | 2 +- .../Plugins/GasPipes/handler_aes_data.cpp | 2 +- .../Plugins/Jamming/handler_jamming.cpp | 2 +- .../Plugins/MineAreas/handler_mine_areas.cpp | 2 +- .../MissionPlan/ces_mission_plan_handler.cpp | 2 +- .../Plugins/NBC/handler_nbc.cpp | 2 +- .../handler_building_data.cpp | 2 +- .../EffectShowClient/esc_convert_from_tab.cpp | 2 +- .../EffectShowClient/esc_convert_to_tab.cpp | 2 +- .../esm_convert_from_tab.cpp | 2 +- .../esm_convert_to_tab.cpp | 2 +- .../ExerciseManagement/handler_exercise.cpp | 2 +- .../Services/ExerciseManagement/settings.cpp | 2 +- .../FileManagement/ModuleTests/flm_tests.cpp | 2 +- .../Lts/Services/FileManagement/settings.cpp | 2 +- .../ModuleTests/ism_tests.cpp | 2 +- .../central_aes_byte_reader.cpp | 2 +- .../OcSituationClient/handler_oc_aes_data.cpp | 2 +- .../handler_oc_central_aes_data.cpp | 2 +- .../OcSituationClient/handler_oc_data.cpp | 2 +- .../handler_oc_situation_data.cpp | 2 +- .../OcSituationServer/handler_oc_aes_data.cpp | 2 +- .../handler_oc_central_aes_data.cpp | 2 +- .../OcSituationServer/handler_oc_data.cpp | 2 +- .../handler_oc_situation_data.cpp | 2 +- .../Services/OperatorManagement/settings.cpp | 2 +- .../ParticipantManagement/settings.cpp | 2 +- .../handler_target_config.cpp | 2 +- .../TetraIF/PrtCnv/PrtCnvCentralThread.cpp | 2 +- .../include/AlarmManagement/alm_dtc.h | 83 ++++++++++- .../include/AlarmManagement/alm_types.h | 4 + .../include/AreaEffectSimulation/aes_dtc.h | 111 +++++++++++++- .../include/ParticipantManagement/ppm.hpp | 19 ++- .../ParticipantManagement/ppm_enums.hpp | 68 ++++++++- .../ProjectDataManagement/pdm_enums.hpp | 9 +- .../ProjectDataManagement/pdm_translation.h | 137 ++++++++++++++++-- .../include/ProjectDataManagement/pdm_types.h | 63 +++++++- .../project_data_management.hpp | 43 ++++++ .../ElevationMap/elevation_map_manager.h | 2 +- 95 files changed, 667 insertions(+), 177 deletions(-) create mode 100644 qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/project_data_management.hpp diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/CMakeLists.txt index 1b7d90411..6b9850873 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/CMakeLists.txt @@ -10,6 +10,7 @@ SET(SRCS_hdr_only ${CMAKE_CURRENT_SOURCE_DIR}/dds_vector.h ${CMAKE_CURRENT_SOURCE_DIR}/connection.h ${CMAKE_CURRENT_SOURCE_DIR}/json_object.h + ${CMAKE_CURRENT_SOURCE_DIR}/json.h ${CMAKE_CURRENT_SOURCE_DIR}/outdated_position.h ${CMAKE_CURRENT_SOURCE_DIR}/qbytearray_byteaccess.h ${CMAKE_CURRENT_SOURCE_DIR}/qpoint3d.h @@ -18,8 +19,8 @@ SET(SRCS_hdr_only ADD_LIBRARY(LtsUtilsCoreHeaderOnly INTERFACE) TARGET_INCLUDE_DIRECTORIES(LtsUtilsCoreHeaderOnly INTERFACE - ${CMAKE_CURRENT_SOURCE_DIR}/../ - ${CMAKE_CURRENT_BINARY_DIR}/../ + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} ) TARGET_SOURCES(LtsUtilsCoreHeaderOnly INTERFACE ${SRCS_hdr_only}) @@ -38,8 +39,8 @@ SET(SRCS NGL_ADD_LIBRARY2(ALL LtsUtilsCore SHARED ${SRCS}) NGL_TARGET_INCLUDE_DIRECTORIES(LtsUtilsCore PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR}/../ - ${CMAKE_CURRENT_BINARY_DIR}/../ + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} ) NGL_TARGET_LINK_LIBRARIES(LtsUtilsCore PUBLIC diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h index e9af9729d..edcb7fa3d 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h @@ -2,7 +2,7 @@ #pragma once -#include +#include #include #include 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 cf54eae7f..d344f2faf 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 @@ -3,6 +3,7 @@ #include "alm_config_alarm_model.h" #include +#include #include #include #include @@ -10,6 +11,15 @@ namespace AlarmManagement { +namespace +{ +NGL::INGLLogger& getLogger() +{ + static auto& logger = GuezNasat::getLogger("AlarmManagement.ConfigAlarmModel"); + return logger; +} +} // namespace + ConfigAlarmModel::ConfigAlarmModel(QObject* parent) : LtsWidgets::LtsAbstractTableModel( {tr("Id"), tr("Equip. No."), tr("Designator"), tr("Tact. Identifier"), tr("Vulnerability State"), @@ -29,19 +39,19 @@ bool ConfigAlarmModel::initModel(const std::shared_ptr alarmConfigs = m_dtc->alarmConfigs(); - INFO_LOG(m_logger) << "initModel - #AlarmConfig: " << alarmConfigs.size(); + INFO_LOG(getLogger()) << "initModel - #AlarmConfig: " << alarmConfigs.size(); connect(m_dtc.get(), &Interface::Dtc::alarmConfigChanged, this, &ConfigAlarmModel::onAlarmConfigChanged); m_dtc->enableAlarmConfig(); - auto cb = [this](const AlarmManagement::AlarmConfig& d) { onAlarmConfigChanged(d, Lts::DataModification::eAdded); }; + auto cb = [this](const AlarmManagement::AlarmConfig& d) { onAlarmConfigChanged(d, DataModification::eAdded); }; m_dtc->alarmConfigs(cb); return true; } QVariant ConfigAlarmModel::data(const QModelIndex& index, int role) const { - DEBUG_LOG(m_logger) << "AlarmManagementModel::data"; + DEBUG_LOG(getLogger()) << "AlarmManagementModel::data"; if (role != Qt::DisplayRole || !indexIsValid(index)) return QVariant(); @@ -104,14 +114,14 @@ void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig& const int eventTypeId = data.eventTypeId().underlying(); const bool messageWindow = data.messageWindow(); const bool setMarker = data.setMarker(); - DEBUG_LOG(m_logger) << "onAlarmConfigChanged: " << eventTypeId << " messageWindow=" << messageWindow << "setMarker" + DEBUG_LOG(getLogger()) << "onAlarmConfigChanged: " << eventTypeId << " messageWindow=" << messageWindow << "setMarker" << setMarker; switch (modType) { - case Lts::DataModification::eRemoved: { + case DataModification::eRemoved: { - DEBUG_LOG(m_logger) << "AlarmConfig was removed: " << id; + DEBUG_LOG(getLogger()) << "AlarmConfig was removed: " << id; AlarmManagement::AlarmConfig data1 = data; data1.messageWindow(false); data1.setMarker(false); @@ -119,8 +129,8 @@ void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig& removeRow(row); return; } - case Lts::DataModification::eModified: { - DEBUG_LOG(m_logger) << "Lts::DataModification::eModified: "; + case DataModification::eModified: { + DEBUG_LOG(getLogger()) << "DataModification::eModified: "; if (row < 0) { @@ -130,8 +140,8 @@ void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig& setRowData(row, data); break; } - case Lts::DataModification::eAdded: { - DEBUG_LOG(m_logger) << "Lts::DataModification::eAdded"; + case DataModification::eAdded: { + DEBUG_LOG(getLogger()) << "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 631dc046a..7a9814b43 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 @@ -7,10 +7,10 @@ #include #include -#include +#include #include #include -#include +#include namespace AlarmManagement { @@ -39,10 +39,9 @@ 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 Lts::DataModification modType); + void onAlarmConfigChanged(const AlarmManagement::AlarmConfig& data, const DataModification modType); private: - NGL::INGLLogger& m_logger; std::shared_ptr m_dtc; std::shared_ptr m_ppmDtc; AlarmHistoryModel* m_alarmHistoryModel; 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 c10e4b4df..4cc902cb8 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 @@ -30,7 +30,7 @@ AlarmHistoryModel::AlarmHistoryModel(QObject* parent) tr("Aes Name"), }, parent), - m_dtc(nullptr), m_ppmDtc(nullptr) + m_dtc(nullptr), m_ppmDtc(nullptr), m_aesDtc(nullptr) { } @@ -47,14 +47,17 @@ bool AlarmHistoryModel::initModel(const std::shared_ptrenableParticipant(); - m_dtc->enableNotification(); - + // Register callbacks instead of enableParticipant() const auto cbParticipants = [this](const ParticipantManagement::Participant& participant) { - onParticipantChanged(participant, Lts::DataModification::eAdded); + onParticipantChanged(participant, ParticipantManagement::DataModification::eAdded); }; m_ppmDtc->participants(cbParticipants); + const auto cbNotifications = [this](const AlarmManagement::Notification& notification) { + onNotificationChanged(notification, DataModification::eAdded); + }; + m_dtc->notifications(cbNotifications); + connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::borderlineChanged, this, &AlarmHistoryModel::onAesItemChanged); connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::dangerAreaChanged, this, @@ -73,7 +76,7 @@ bool AlarmHistoryModel::initModel(const std::shared_ptrborderlines(cbAesItem); m_aesDtc->dangerAreas(cbAesItem); @@ -134,7 +137,7 @@ QVariant AlarmHistoryModel::data(const QModelIndex& index, int role) const return QVariant(); } -bool AlarmHistoryModel::isFiltered(const NotificationEx& data, Lts::DataModification modType) const +bool AlarmHistoryModel::isFiltered(const NotificationEx& data, DataModification modType) const { Q_UNUSED(modType); if (data.operatorId() == 0) @@ -142,9 +145,9 @@ bool AlarmHistoryModel::isFiltered(const NotificationEx& data, Lts::DataModifica return data.operatorId() != LtsSessionData::LtsSessionData::getInstance()->getOperatorId(); } -void AlarmHistoryModel::onNotificationChanged(const AlarmManagement::Notification& data, const Lts::DataModification modType) +void AlarmHistoryModel::onNotificationChanged(const AlarmManagement::Notification& data, const DataModification modType) { - if (modType == Lts::DataModification::eRemoved) + if (modType == DataModification::eRemoved) return; NotificationEx notification(data); @@ -153,48 +156,48 @@ void AlarmHistoryModel::onNotificationChanged(const AlarmManagement::Notificatio const QJsonObject propertieJsonObj = propertieJsonDoc.object(); notification.equipmentNumber = data.equipmentNumber(); - if (data.participantId().is_set()) - notification.participantId = data.participantId().get(); - notification.eventTypeId = data.eventType(); - if (data.aesId().is_set()) - notification.aesId = data.aesId().get(); + if (data.participantId().has_value()) + notification.participantId = data.participantId().value(); + notification.eventTypeId = static_cast(data.eventType()); + if (data.aesId().has_value()) + notification.aesId = data.aesId().value(); const int global = propertieJsonObj[QStringLiteral("Global")].toInt(); const int friendlyFire = propertieJsonObj[QStringLiteral("FriendlyFire")].toInt(); - DEBUG_LOG(m_logger) << Q_FUNC_INFO << " notification:" << data << ", Global: " << global - << ", FriendlyFire: " << friendlyFire; + DEBUG_LOG(getLogger("AlarmHistoryModel")) << Q_FUNC_INFO << " notification id=" << data.id() + << ", Global: " << global << ", FriendlyFire: " << friendlyFire; onDataChanged(notification, modType); } void AlarmHistoryModel::onParticipantChanged(const ParticipantManagement::Participant& participant, - const Lts::DataModification modType) + const ParticipantManagement::DataModification modType) { - if (modType == Lts::DataModification::eRemoved) + if (modType == ParticipantManagement::DataModification::eRemoved) return; - QString designator = QString::fromStdString(participant.designator()); + QString designator = participant.designator(); m_idDesignatorMap.insert(participant.id(), designator); - const int equipNo = participant.equipmentNumber().is_set() ? participant.equipmentNumber().get() : 0; + const int equipNo = participant.equipmentNumber().has_value() ? participant.equipmentNumber().value() : 0; m_partId2EquipNoMap.insert(participant.id(), equipNo); - QString tacticalIdentifier = QString::fromStdString(participant.tacticalIdentifier()); + QString tacticalIdentifier = participant.tacticalIdentifier(); m_idTactIdentifierMap.insert(participant.id(), tacticalIdentifier); - DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id=" << participant.id() << " designator=" << designator + DEBUG_LOG(getLogger("AlarmHistoryModel")) << Q_FUNC_INFO << " id=" << participant.id() << " designator=" << designator << " tacticalIdentifier=" << tacticalIdentifier; } int AlarmHistoryModel::participantId2EquipNo(const int participantId) const { int ret = m_partId2EquipNoMap.value(participantId, 0); - INFO_LOG(m_logger) << "participantId2EquipNo participantId=" << participantId << " EquipmentNumber=" << ret; + INFO_LOG(getLogger("AlarmHistoryModel")) << "participantId2EquipNo participantId=" << participantId << " EquipmentNumber=" << ret; return ret; } QString AlarmHistoryModel::getDesignator(const int participantId) const { QString designator = m_idDesignatorMap.value(participantId); - DEBUG_LOG(m_logger) << "m_idDesignatorMap.value(participantId)=" << designator; + DEBUG_LOG(getLogger("AlarmHistoryModel")) << "m_idDesignatorMap.value(participantId)=" << designator; return designator; } @@ -202,52 +205,52 @@ QString AlarmHistoryModel::getDesignator(const int participantId) const QString AlarmHistoryModel::getTactIdentifier(const int participantId) const { QString tactIdentifier = m_idTactIdentifierMap.value(participantId); - DEBUG_LOG(m_logger) << "m_idTactIdentifierMap.value(participantId)=" << tactIdentifier; + DEBUG_LOG(getLogger("AlarmHistoryModel")) << "m_idTactIdentifierMap.value(participantId)=" << tactIdentifier; return tactIdentifier; } void AlarmHistoryModel::onBCContaminationChanged(const AreaEffectSimulation::BCContamination& data, - const Lts::DataModification modType) + const DataModification modType) { - if (modType == Lts::DataModification::eRemoved) + if (modType == DataModification::eRemoved) return; int id = data.id(); QString name = QString::fromStdString(data.name()); m_aesNameMap[id] = name; - DEBUG_LOG(m_logger) << "onBCContaminationChanged: " << data << " Name=" << name << " id=" << id; + DEBUG_LOG(getLogger("AlarmHistoryModel")) << "onBCContaminationChanged: id=" << id << " Name=" << name; } -void AlarmHistoryModel::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap& data, const Lts::DataModification modType) +void AlarmHistoryModel::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap& data, const DataModification modType) { - if (modType == Lts::DataModification::eRemoved) + if (modType == DataModification::eRemoved) return; int id = data.id(); QString name = QString::fromStdString(data.name()); m_aesNameMap[id] = name; - DEBUG_LOG(m_logger) << "BoobyTrap: " << data << " Name=" << name << " id=" << id; + DEBUG_LOG(getLogger("AlarmHistoryModel")) << "BoobyTrap: id=" << id << " Name=" << name; } void AlarmHistoryModel::onOffRouteMineChanged(const AreaEffectSimulation::OffRouteMine& data, - const Lts::DataModification modType) + const DataModification modType) { - if (modType == Lts::DataModification::eRemoved) + if (modType == DataModification::eRemoved) return; int id = data.id(); QString name = QString::fromStdString(data.name()); m_aesNameMap[id] = name; - DEBUG_LOG(m_logger) << "OffRouteMine: " << data << " Name=" << name << " id=" << id; + DEBUG_LOG(getLogger("AlarmHistoryModel")) << "OffRouteMine: id=" << id << " Name=" << name; } -void AlarmHistoryModel::onAesItemChanged(const AreaEffectSimulation::AesItem& item, const Lts::DataModification modType) +void AlarmHistoryModel::onAesItemChanged(const AreaEffectSimulation::AesItem& item, const DataModification modType) { - if (modType == Lts::DataModification::eRemoved) + if (modType == DataModification::eRemoved) return; QString name = QString::fromStdString(item.name()); int id = item.id(); m_aesNameMap[id] = name; - DEBUG_LOG(m_logger) << "AreaEffectSimulation::AesItem onAesItemChanged: " << item << " Name=" << name - << " id=" << item.id(); + DEBUG_LOG(getLogger("AlarmHistoryModel")) << "AreaEffectSimulation::AesItem onAesItemChanged: id=" << id + << " Name=" << name; } void AlarmHistoryProxyModel::setSourceModel(QAbstractItemModel* sourceModel) 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 7afcdac33..3ae8b4b56 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 @@ -11,6 +11,7 @@ #include #include #include +#include namespace AlarmManagement { @@ -46,15 +47,14 @@ class ALMCOMMON_EXPORT AlarmHistoryModel final : public LtsWidgets::LtsAbstractT QString getTactIdentifier(const int participantId) const; protected: - NGL::INGLLogger& m_logger; - bool isFiltered(const NotificationEx& data, Lts::DataModification modType) const override; - private slots: - 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); + bool isFiltered(const NotificationEx& data, DataModification modType) const override; + public slots: + void onNotificationChanged(const AlarmManagement::Notification& data, const DataModification modType); + void onParticipantChanged(const ParticipantManagement::Participant& participant, const ParticipantManagement::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); private: std::shared_ptr m_dtc; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_edit_training_area_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_edit_training_area_dialog.cpp index a3f9dc216..8f99c8f8e 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_edit_training_area_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/asm_edit_training_area_dialog.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/CustomViews/exm_exercise.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/CustomViews/exm_exercise.cpp index 4d2b75d53..8de787589 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/CustomViews/exm_exercise.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/CustomViews/exm_exercise.cpp @@ -6,7 +6,7 @@ #include "exm_dialog_model.h" #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_dialog.cpp index 254b56ba1..301e34288 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_dialog.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/TopicEditor/topic_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/TopicEditor/topic_editor.cpp index 568ff7532..3ade2b086 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/TopicEditor/topic_editor.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/TopicEditor/topic_editor.cpp @@ -5,7 +5,7 @@ #include "ui_topic_editor.h" #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_folder.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_folder.cpp index d22da6671..5f95d3179 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_folder.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog_model_folder.cpp @@ -4,7 +4,7 @@ #include "flm_dialog_model_folder.h" #include "ParticipantManagement/ppm.hpp" -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_explorer_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_explorer_gui_plugin.cpp index e531a5203..87a2ac0ff 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_explorer_gui_plugin.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_explorer_gui_plugin.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_file_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_file_dialog.cpp index 49262e406..fcc9466cb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_file_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_file_dialog.cpp @@ -4,7 +4,7 @@ #include "flm_preview_file_dialog.h" #include "ui_flm_preview_file_dialog.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_playback.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_playback.cpp index 203a7acb3..69233d271 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_playback.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_playback.cpp @@ -4,7 +4,7 @@ #include "flm_preview_playback.h" #include "ui_flm_preview_playback.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/CustomViews/mrk_marker.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/CustomViews/mrk_marker.cpp index bebc5d332..21cf2a7fd 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/CustomViews/mrk_marker.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/CustomViews/mrk_marker.cpp @@ -5,7 +5,7 @@ #include "ui_mrk_marker.h" #include "mrk_dialog_model.h" -#include +#include namespace MarkerManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_create_snapshot.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_create_snapshot.cpp index 1ceb38e87..b555e6143 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_create_snapshot.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_create_snapshot.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_set_markers.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_set_markers.cpp index 5f7839d3e..bcfad3a97 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_set_markers.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_set_markers.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog.cpp index e0d7afaf7..b14ca1fb5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog.cpp @@ -9,7 +9,7 @@ #include "mrk_create_snapshot.h" #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog_model.cpp index 1a184dc44..b79c60f55 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/snapshot_dialog_model.cpp @@ -5,7 +5,7 @@ #include "snapshot_dialog_model.h" #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Common/operator_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Common/operator_dialog_model.cpp index 5ddb44fb6..555e70281 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Common/operator_dialog_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Common/operator_dialog_model.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog_gui_plugin.cpp index 0ab489d0e..642c93f77 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog_gui_plugin.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog_gui_plugin.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_dialog.cpp index bc6a680d3..d4d5387bb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_dialog.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/operator_settings_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/operator_settings_dialog.cpp index 4e040a98d..a9409821b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/operator_settings_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorSettings/operator_settings_dialog.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlays_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlays_gui_plugin.cpp index 72f2d3c1f..8dc270909 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlays_gui_plugin.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanOverlays/Gui/plan_overlays_gui_plugin.cpp @@ -8,7 +8,7 @@ #include "TopicEditor/topic_editor.h" #include "flm_reply_handler.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/dus_single_mine_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/dus_single_mine_to_map.cpp index eb5803865..2c09200fb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/dus_single_mine_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/dus_single_mine_to_map.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/effect_cluster_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/effect_cluster_to_map.cpp index cd5037e7c..25d09bf7a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/effect_cluster_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/effect_cluster_to_map.cpp @@ -4,7 +4,7 @@ #include "effect_cluster_to_map.h" #include #include "pdm_handler.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_area_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_area_to_map.cpp index cc0b97dec..cc6353977 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_area_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_area_to_map.cpp @@ -2,7 +2,7 @@ #include "explosion_area_to_map.h" -#include +#include namespace SituationMap diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_cluster_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_cluster_to_map.cpp index 0f995888b..a03c49b34 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_cluster_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_cluster_to_map.cpp @@ -4,7 +4,7 @@ #include "explosion_cluster_to_map.h" #include #include "pdm_handler.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/gas_pipe_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/gas_pipe_to_map.cpp index 8ca85d77d..0155bf100 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/gas_pipe_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/gas_pipe_to_map.cpp @@ -2,7 +2,7 @@ #include "gas_pipe_to_map.h" -#include +#include namespace SituationMap diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_null_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_null_to_map.cpp index c5653e742..8232fbdbf 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_null_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_null_to_map.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_to_map.cpp index 4714ca708..974cf69d0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_to_map.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_corridor_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_corridor_to_map.cpp index a8ab96949..a464906ca 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_corridor_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_corridor_to_map.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include namespace SituationMap diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/shootback_area_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/shootback_area_to_map.cpp index 504d80397..9f5f050b6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/shootback_area_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/shootback_area_to_map.cpp @@ -2,7 +2,7 @@ #include "shootback_area_to_map.h" -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/special_areas_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/special_areas_to_map.cpp index 9bc6f499a..c5741bf6c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/special_areas_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/special_areas_to_map.cpp @@ -3,7 +3,7 @@ #include "special_areas_to_map.h" #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/technical_area_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/technical_area_to_map.cpp index 3c46649eb..8483e84bd 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/technical_area_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/technical_area_to_map.cpp @@ -2,7 +2,7 @@ #include "technical_area_to_map.h" -#include +#include namespace SituationMap diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/training_area_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/training_area_to_map.cpp index ac5489652..54c8ef4b4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/training_area_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/training_area_to_map.cpp @@ -2,7 +2,7 @@ #include "training_area_to_map.h" -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/settings.cpp index cead58145..4a6cbe0ee 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/settings.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/settings.cpp @@ -7,7 +7,7 @@ #include #include -#include "LtsUtilsCore/lts_portrange.h" +#include "LtsUtils/lts_portrange.h" namespace Buildings { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/aes_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/aes_handler.cpp index dce46acb0..10883fe5e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/aes_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/aes_handler.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/aes_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/aes_handler.cpp index 044dc3b85..77893eb64 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/aes_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/aes_handler.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/settings.cpp index 10009ec4f..5155e70df 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/settings.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/settings.cpp @@ -8,7 +8,7 @@ #include #include -#include "LtsUtilsCore/lts_portrange.h" +#include "LtsUtils/lts_portrange.h" namespace TrainingAreaBase { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/settings.cpp index 587016d99..bf388c4d4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/settings.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/settings.cpp @@ -8,7 +8,7 @@ #include #include -#include "LtsUtilsCore/lts_portrange.h" +#include "LtsUtils/lts_portrange.h" namespace TrainingAreaBase { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/canag_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/canag_handler.cpp index c9652e544..5b80385ef 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/canag_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/canag_handler.cpp @@ -4,7 +4,7 @@ #include "canag_handler.h" #include -#include +#include #include "connection_handler.h" #include "main_handler.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/handler_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/handler_aes_data.cpp index a28d403f0..d5715eb53 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/handler_aes_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/handler_aes_data.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include "handler_aes_data.h" #include "settings.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/aes_helper.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/aes_helper.h index 143714d75..5e5fa6e9b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/aes_helper.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/aes_helper.h @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include "aes_db.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effect_cluster.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effect_cluster.cpp index 4c4dc9736..bf17087c5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effect_cluster.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effect_cluster.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_area.cpp index 6fd839c97..05a832e62 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_area.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_area.cpp @@ -9,11 +9,11 @@ #include "special_area_provider.h" #include "Utils/polygons.h" -#include +#include #include "handler_charge_administration.h" #include #include -#include +#include namespace AreaEffectSimulation { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_cluster.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_cluster.cpp index c32f53b0b..ee4cd7860 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_cluster.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_cluster.cpp @@ -14,7 +14,7 @@ #include "special_area_provider.h" #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_area.cpp index 0f30bff87..076d024fc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_area.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_area.cpp @@ -18,7 +18,7 @@ #include #include #include // LtsUtils::toOptional -#include +#include #include namespace AreaEffectSimulation diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_area_null.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_area_null.cpp index 2da2152a7..78be68241 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_area_null.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_area_null.cpp @@ -10,7 +10,7 @@ #include "special_area_provider.h" #include -#include +#include #include namespace AreaEffectSimulation diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_control.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_control.cpp index 81e3c1b5d..19e8f5fe2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_control.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_control.cpp @@ -27,7 +27,7 @@ #include "AvsCommands/set_abs_position.h" #include "AvsCommands/set_volume.h" #include "AvsCommands/keep_alive.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_control.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_control.cpp index b4dafc043..7bf4d0ebc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_control.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/vd_control.cpp @@ -13,7 +13,7 @@ #include "AvsCommands/simple_command.h" #include "AvsCommands/vd_set_script.h" #include "AvsCommands/keep_alive.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.cpp index 0c4831b2d..f4229d805 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.cpp index 49d45f663..89b341da8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_participant_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_participant_area.cpp index 7bb800033..ed11dc2ae 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_participant_area.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_participant_area.cpp @@ -12,7 +12,7 @@ #include "CentralEffectSimulation/handler_participant.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.cpp index 8a2eca970..fae6bfde6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.cpp @@ -10,7 +10,7 @@ #include #include "expand_polygon.h" -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.cpp index 993cc7d9c..ecb2c40c6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.cpp @@ -12,7 +12,7 @@ #include "isInCone.h" #include "settings.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.cpp index a8c227811..476e98bef 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.cpp index af2bc6d2e..acf8337d0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/handler_jamming.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/handler_jamming.cpp index a49f101ce..59c6a5bee 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/handler_jamming.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/handler_jamming.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/handler_mine_areas.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/handler_mine_areas.cpp index 6857ae483..d6efa9cdc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/handler_mine_areas.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/handler_mine_areas.cpp @@ -11,7 +11,7 @@ #include "CentralEffectSimulation/handler_participant.h" #include "settings.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_handler.cpp index c8660b765..c02c69650 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_handler.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/NBC/handler_nbc.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/NBC/handler_nbc.cpp index 5f7425674..474b7dd1e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/NBC/handler_nbc.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/NBC/handler_nbc.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_building_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_building_data.cpp index 88f942bf0..2d13a9314 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_building_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_building_data.cpp @@ -10,7 +10,7 @@ #include #include "settings.h" #include "handler_participant.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_convert_from_tab.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_convert_from_tab.cpp index 06ffe7c23..4463d6ab8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_convert_from_tab.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_convert_from_tab.cpp @@ -8,7 +8,7 @@ */ #include "esc_convert_from_tab.h" -#include +#include namespace EffectShowClient diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_convert_to_tab.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_convert_to_tab.cpp index ca71695d0..813a9bbb8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_convert_to_tab.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_convert_to_tab.cpp @@ -8,7 +8,7 @@ */ #include "esc_convert_to_tab.h" -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_from_tab.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_from_tab.cpp index 6a0d51b6c..a52973838 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_from_tab.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_from_tab.cpp @@ -8,7 +8,7 @@ */ #include "esm_convert_from_tab.h" -#include +#include namespace EffectShowManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_to_tab.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_to_tab.cpp index 3da49d2b1..61699a8f1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_to_tab.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_to_tab.cpp @@ -8,7 +8,7 @@ */ #include "esm_convert_to_tab.h" -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.cpp index 2e8c6b2f8..1c029c907 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/handler_exercise.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/settings.cpp index d95250ddf..312ce902c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/settings.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/settings.cpp @@ -11,7 +11,7 @@ #include #include -#include "LtsUtilsCore/lts_portrange.h" +#include "LtsUtils/lts_portrange.h" namespace ExerciseManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/ModuleTests/flm_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/ModuleTests/flm_tests.cpp index 7fb7c1fb6..8a55b63f6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/ModuleTests/flm_tests.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/ModuleTests/flm_tests.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/settings.cpp index 502257d5a..66aba0ef2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/settings.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/settings.cpp @@ -13,7 +13,7 @@ #include #include -#include "LtsUtilsCore/lts_portrange.h" +#include "LtsUtils/lts_portrange.h" namespace FileManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ModuleTests/ism_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ModuleTests/ism_tests.cpp index ad18a979e..20e36c8a1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ModuleTests/ism_tests.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ModuleTests/ism_tests.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/central_aes_byte_reader.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/central_aes_byte_reader.cpp index be831238b..7de2bb58d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/central_aes_byte_reader.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/central_aes_byte_reader.cpp @@ -8,7 +8,7 @@ #include "central_aes_byte_reader.h" -#include +#include #include "main_handler.h" #include "settings.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_aes_data.cpp index 2e04b7b5d..1e882951a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_aes_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_aes_data.cpp @@ -9,7 +9,7 @@ #include "handler_oc_aes_data.h" #include -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_central_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_central_aes_data.cpp index f28d2e181..8d1b843ac 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_central_aes_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_central_aes_data.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include "central_aes_byte_reader.h" #include "main_handler.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_data.cpp index 281a7394f..fed7e6d83 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_data.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include "main_handler.h" #include "handler_oc_aes_data.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_situation_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_situation_data.cpp index aa58b75f5..f0608c388 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_situation_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_situation_data.cpp @@ -9,7 +9,7 @@ #include "handler_oc_situation_data.h" #include -#include +#include #include #include "main_handler.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_aes_data.cpp index 8a13395b7..738961f11 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_aes_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_aes_data.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include #include "settings.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_central_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_central_aes_data.cpp index 96ee41e65..8ddcf5107 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_central_aes_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_central_aes_data.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_data.cpp index 1e2162472..420dd8796 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_data.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include "main_handler.h" #include "oc_situation.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_situation_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_situation_data.cpp index 72d87865c..acc3c2176 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_situation_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_situation_data.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/settings.cpp index ae0b72eee..7a24d3791 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/settings.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/settings.cpp @@ -11,7 +11,7 @@ #include #include -#include "LtsUtilsCore/lts_portrange.h" +#include "LtsUtils/lts_portrange.h" namespace OperatorManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/settings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/settings.cpp index 7e8f14be3..aef75517e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/settings.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/settings.cpp @@ -11,7 +11,7 @@ #include #include -#include "LtsUtilsCore/lts_portrange.h" +#include "LtsUtils/lts_portrange.h" namespace ParticipantManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_config.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_config.cpp index 5831201d5..84130361a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_config.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_config.cpp @@ -8,7 +8,7 @@ #include "settings.h" #include "handler_target_config.h" -#include +#include using namespace TargetManagement; diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvCentralThread.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvCentralThread.cpp index 4e2b3c736..89d5394ab 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvCentralThread.cpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvCentralThread.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_dtc.h b/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_dtc.h index 48fc0cc57..0c8ecf05f 100644 --- a/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_dtc.h +++ b/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_dtc.h @@ -3,11 +3,92 @@ // STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert // Für die Migration erstellen wir minimale Forward-Declarations +#include +#include +#include +#include + +#include + +#include "LtsUtils/data_modification_enum.h" +#include "ProjectDataManagement/pdm_types.h" + namespace AlarmManagement { + +// Position-Struct (wird normalerweise von DDS generiert) +struct Position +{ + double longitude = 0.0; + double latitude = 0.0; + + double lon() const { return longitude; } + double lat() const { return latitude; } +}; + +// Notification-Struct (wird normalerweise von DDS generiert) +struct Notification +{ + int32_t id = 0; + int64_t time() const { return timestamp; } + int64_t timestamp = 0; + int32_t type = 0; + int32_t priority = 0; + int32_t status = 0; + std::string description; + + // Zusätzliche Member für AlarmHistoryModel + int32_t operatorId() const { return m_operatorId; } + int32_t equipmentNumber() const { return m_equipmentNumber; } + std::optional participantId() const { return m_participantId; } + std::optional aesId() const { return m_aesId; } + ProjectDataManagement::EventType eventType() const { return m_eventType; } + Position position() const { return m_position; } + const std::string& properties() const { return m_properties; } + + int32_t m_operatorId = 0; + int32_t m_equipmentNumber = 0; + std::optional m_participantId; + std::optional m_aesId; + ProjectDataManagement::EventType m_eventType = ProjectDataManagement::EventType::Unknown; + Position m_position; + std::string m_properties; +}; + namespace Interface { -class Dtc; + +// Dtc interface class with signals for Qt6 migration STUB +class Dtc : public QObject +{ + Q_OBJECT +public: + explicit Dtc(QObject* parent = nullptr) : QObject(parent) {} + ~Dtc() override = default; + + // Callback registration instead of enableNotification() + void notifications(std::function callback) + { + m_notificationCallback = callback; + } + + // Trigger notification changed (for STUB testing) + void triggerNotificationChanged(const Notification& notification, DataModification modType) + { + emit notificationChanged(notification, modType); + if (m_notificationCallback) + { + m_notificationCallback(notification); + } + } + +signals: + void notificationChanged(const Notification& notification, DataModification modType); + +private: + std::function m_notificationCallback; +}; + class Ftc; } // namespace Interface } // namespace AlarmManagement diff --git a/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_types.h b/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_types.h index ff356cd7f..03ce4cfbc 100644 --- a/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_types.h +++ b/qt6-after/qt6-migrated-legatus/include/AlarmManagement/alm_types.h @@ -32,6 +32,9 @@ public: bool global() const { return m_global; } void setGlobal(bool value) { m_global = value; } + + int vulnerabilityState() const { return m_vulnerabilityState; } + void setVulnerabilityState(int value) { m_vulnerabilityState = value; } private: int m_eventTypeId = 0; @@ -40,6 +43,7 @@ private: int m_participantId = 0; int m_id = 0; bool m_global = false; + int m_vulnerabilityState = -1; }; } // namespace AlarmManagement \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/AreaEffectSimulation/aes_dtc.h b/qt6-after/qt6-migrated-legatus/include/AreaEffectSimulation/aes_dtc.h index 53d8cdb02..377bdbc2f 100644 --- a/qt6-after/qt6-migrated-legatus/include/AreaEffectSimulation/aes_dtc.h +++ b/qt6-after/qt6-migrated-legatus/include/AreaEffectSimulation/aes_dtc.h @@ -3,11 +3,120 @@ // STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert // Für die Migration erstellen wir minimale Forward-Declarations +#include +#include +#include +#include + +#include + +#include "LtsUtils/data_modification_enum.h" + namespace AreaEffectSimulation { + +// AesItem-Struct (wird normalerweise von DDS generiert) +struct AesItem +{ + int32_t id() const { return m_id; } + const std::string& name() const { return m_name; } + + int32_t m_id = 0; + std::string m_name; +}; + +inline std::ostream& operator<<(std::ostream& os, const AesItem& item) +{ + os << "AesItem{id=" << item.id() << ", name=" << item.name() << "}"; + return os; +} + +// BCContamination-Struct (wird normalerweise von DDS generiert) +struct BCContamination : public AesItem +{ +}; + +// BoobyTrap-Struct (wird normalerweise von DDS generiert) +struct BoobyTrap : public AesItem +{ +}; + +// OffRouteMine-Struct (wird normalerweise von DDS generiert) +struct OffRouteMine : public AesItem +{ +}; + namespace Interface { -class Dtc; + +// Dtc - Data Transfer Component für Area Effect Simulation +// DDS-generierte Klasse mit Signals für AES-Item-Änderungen +class Dtc : public QObject { + Q_OBJECT + +public: + Dtc() = default; + ~Dtc() override = default; + + // Callback registration for AES item changes + void bcContaminations(std::function callback) { + m_bcCallback = callback; + } + + void boobyTraps(std::function callback) { + m_boobyTrapCallback = callback; + } + + void offRouteMines(std::function callback) { + m_offRouteMineCallback = callback; + } + + void aesItems(std::function callback) { + m_aesCallback = callback; + } + + // Trigger methods for STUB testing + void triggerBCContaminationChanged(const BCContamination& item, DataModification modType) { + emit bcContaminationChanged(item, modType); + if (m_bcCallback) { + m_bcCallback(item); + } + } + + void triggerBoobyTrapChanged(const BoobyTrap& item, DataModification modType) { + emit boobyTrapChanged(item, modType); + if (m_boobyTrapCallback) { + m_boobyTrapCallback(item); + } + } + + void triggerOffRouteMineChanged(const OffRouteMine& item, DataModification modType) { + emit offRouteMineChanged(item, modType); + if (m_offRouteMineCallback) { + m_offRouteMineCallback(item); + } + } + + void triggerAesItemChanged(const AesItem& item, DataModification modType) { + emit aesItemChanged(item, modType); + if (m_aesCallback) { + m_aesCallback(item); + } + } + +signals: + void bcContaminationChanged(const BCContamination& item, DataModification modType); + void boobyTrapChanged(const BoobyTrap& item, DataModification modType); + void offRouteMineChanged(const OffRouteMine& item, DataModification modType); + void aesItemChanged(const AesItem& item, DataModification modType); + +private: + std::function m_bcCallback; + std::function m_boobyTrapCallback; + std::function m_offRouteMineCallback; + std::function m_aesCallback; +}; + class Ftc; } // namespace Interface } // namespace AreaEffectSimulation diff --git a/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm.hpp b/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm.hpp index b37061d06..749ab94e9 100644 --- a/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm.hpp +++ b/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm.hpp @@ -12,6 +12,8 @@ #include #include +#include "LtsUtils/data_modification_enum.h" + namespace ParticipantManagement { @@ -27,7 +29,7 @@ struct Type { // Participant - Basisdaten eines Teilnehmers struct Participant { - int id = 0; + int m_id = 0; QString internalName; QString externalName; int typeId = 0; @@ -41,8 +43,17 @@ struct Participant { double z = 0.0; double heading = 0.0; + // Optional fields (für DDS-Kompatibilität) + std::optional equipmentNumber; + QString m_designator; + QString m_tacticalIdentifier; + // Helper methods QString name() const { return internalName; } + QString designator() const { return m_designator; } + QString tacticalIdentifier() const { return m_tacticalIdentifier; } + std::optional equipmentNumber() const { return equipmentNumber; } + int id() const { return m_id; } }; // Party - Gruppe/Organisation von Teilnehmern @@ -115,7 +126,7 @@ public: void updateParticipant(const Participant& p) { for (auto& existing : m_participants) { - if (existing.id == p.id) { + if (existing.m_id == p.m_id) { existing = p; emit participantChanged(p, DataModification::eModified); return; @@ -126,7 +137,7 @@ public: void removeParticipant(int id) { for (auto it = m_participants.begin(); it != m_participants.end(); ++it) { - if (it->id == id) { + if (it->m_id == id) { Participant removed = *it; m_participants.erase(it); emit participantChanged(removed, DataModification::eRemoved); @@ -166,7 +177,7 @@ inline std::ostream& operator<<(std::ostream& os, const Type& t) { } inline std::ostream& operator<<(std::ostream& os, const Participant& p) { - os << "Participant(id=" << p.id << ", name=" << p.name().toStdString() << ")"; + os << "Participant(id=" << p.m_id << ", name=" << p.name().toStdString() << ")"; return os; } diff --git a/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm_enums.hpp b/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm_enums.hpp index 4700f2651..a76ab091e 100644 --- a/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm_enums.hpp +++ b/qt6-after/qt6-migrated-legatus/include/ParticipantManagement/ppm_enums.hpp @@ -13,7 +13,28 @@ enum class SymbolAppearance : int { Solid = 0, Dashed = 1, Dotted = 2 }; enum class SymbolVisibility : int { Visible = 0, Hidden = 1 }; -enum class TypeClass : int { eUninitialized = 0, Unknown = 1, Aircraft = 2, Ground = 3, Naval = 4 }; +enum class TypeClass : int { + eUninitialized = 0, + Unknown = 1, + Aircraft = 2, + Ground = 3, + Naval = 4, + Human = 5, + Unit = 6, + SupportUnit = 7, + SupportEntity = 8, + Vehicle = 9, + GroundVehicle = 10, + Airborne = 11, + Vessel = 12, + Building = 13, + WeaponSystem = 14, + TargetHuman = 15, + TargetVehicle = 16, + VehicleWithGear = 17, + VehicleMarker = 18, + None = 19 +}; enum class DataModification : int { eAdded = 0, eModified = 1, eRemoved = 2 }; @@ -35,6 +56,51 @@ inline std::ostream& operator<<(std::ostream& os, TypeClass tc) case TypeClass::Naval: os << "Naval"; break; + case TypeClass::Human: + os << "Human"; + break; + case TypeClass::Unit: + os << "Unit"; + break; + case TypeClass::SupportUnit: + os << "SupportUnit"; + break; + case TypeClass::SupportEntity: + os << "SupportEntity"; + break; + case TypeClass::Vehicle: + os << "Vehicle"; + break; + case TypeClass::GroundVehicle: + os << "GroundVehicle"; + break; + case TypeClass::Airborne: + os << "Airborne"; + break; + case TypeClass::Vessel: + os << "Vessel"; + break; + case TypeClass::Building: + os << "Building"; + break; + case TypeClass::WeaponSystem: + os << "WeaponSystem"; + break; + case TypeClass::TargetHuman: + os << "TargetHuman"; + break; + case TypeClass::TargetVehicle: + os << "TargetVehicle"; + break; + case TypeClass::VehicleWithGear: + os << "VehicleWithGear"; + break; + case TypeClass::VehicleMarker: + os << "VehicleMarker"; + break; + case TypeClass::None: + os << "None"; + break; default: os << std::string("Unknown"); } diff --git a/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_enums.hpp b/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_enums.hpp index d4c4da5d0..c3d0f4c31 100644 --- a/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_enums.hpp +++ b/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_enums.hpp @@ -7,18 +7,13 @@ #include #include +#include "pdm_types.h" namespace ProjectDataManagement { -// Original enums -enum class ChargeType : int { Unknown = 0 }; - -enum class UnitType : int { Unknown = 0 }; - -enum class SimulationType : int { Unknown = 0 }; - // Additional enums required by AdlerJson/telegrams.h +// (ChargeType, UnitType, SimulationType are already defined in pdm_types.h) enum class L4_TargetGeometry : int { Unknown = 0, Point, // P - Punktziel diff --git a/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_translation.h b/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_translation.h index 85930fec1..311e8f46b 100644 --- a/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_translation.h +++ b/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_translation.h @@ -18,18 +18,129 @@ class QString; namespace ProjectDataManagement { // Translatable enumerations: -PDM_COMMON_EXPORT QString toString(ChargeType state); -PDM_COMMON_EXPORT QString toString(UnitType state); -PDM_COMMON_EXPORT QString toString(SimulationType state); -PDM_COMMON_EXPORT QString toString(L4_TargetGeometry state); -PDM_COMMON_EXPORT QString toString(L7_Request state); -PDM_COMMON_EXPORT QString toString(L19_Oi state); -PDM_COMMON_EXPORT QString toString(L22_FireHaltCategory state); -PDM_COMMON_EXPORT QString toString(L25_KindGuidingLine state); -PDM_COMMON_EXPORT QString toString(L26_EffectingSystemType state); -PDM_COMMON_EXPORT QString toString(L27_EffectorId state); -PDM_COMMON_EXPORT QString toString(L28_Status state); -PDM_COMMON_EXPORT QString toString(L46_GpsFrequency state); -PDM_COMMON_EXPORT QString toString(L48_TrajectoryRocket state); +inline PDM_COMMON_EXPORT QString toString(ChargeType ct) +{ + switch (ct) { + case ChargeType::Unknown: return QStringLiteral("Unknown"); + default: return QStringLiteral("Unknown"); + } +} + +inline PDM_COMMON_EXPORT QString toString(UnitType ut) +{ + switch (ut) { + case UnitType::Unknown: return QStringLiteral("Unknown"); + default: return QStringLiteral("Unknown"); + } +} + +inline PDM_COMMON_EXPORT QString toString(SimulationType st) +{ + switch (st) { + case SimulationType::Unknown: return QStringLiteral("Unknown"); + default: return QStringLiteral("Unknown"); + } +} + +inline PDM_COMMON_EXPORT QString toString(L4_TargetGeometry state) +{ + switch (state) { + case L4_TargetGeometry::Unknown: return QStringLiteral("Unknown"); + case L4_TargetGeometry::Point: return QStringLiteral("Point"); + case L4_TargetGeometry::Area: return QStringLiteral("Area"); + case L4_TargetGeometry::Radial: return QStringLiteral("Radial"); + case L4_TargetGeometry::Linear: return QStringLiteral("Linear"); + default: return QStringLiteral("Unknown"); + } +} + +inline PDM_COMMON_EXPORT QString toString(L7_Request state) +{ + switch (state) { + case L7_Request::Unknown: return QStringLiteral("Unknown"); + default: return QStringLiteral("Unknown"); + } +} + +inline PDM_COMMON_EXPORT QString toString(L19_Oi state) +{ + switch (state) { + case L19_Oi::Unknown: return QStringLiteral("Unknown"); + case L19_Oi::Empty: return QStringLiteral("Empty"); + default: return QStringLiteral("Unknown"); + } +} + +inline PDM_COMMON_EXPORT QString toString(L22_FireHaltCategory state) +{ + switch (state) { + case L22_FireHaltCategory::A: return QStringLiteral("A"); + case L22_FireHaltCategory::R: return QStringLiteral("R"); + case L22_FireHaltCategory::E: return QStringLiteral("E"); + case L22_FireHaltCategory::C: return QStringLiteral("C"); + case L22_FireHaltCategory::F: return QStringLiteral("F"); + default: return QStringLiteral("Unknown"); + } +} + +inline PDM_COMMON_EXPORT QString toString(L25_KindGuidingLine state) +{ + switch (state) { + case L25_KindGuidingLine::FFA: return QStringLiteral("FFA"); + case L25_KindGuidingLine::NFA: return QStringLiteral("NFA"); + case L25_KindGuidingLine::RFA: return QStringLiteral("RFA"); + case L25_KindGuidingLine::FSCL: return QStringLiteral("FSCL"); + case L25_KindGuidingLine::RFL: return QStringLiteral("RFL"); + case L25_KindGuidingLine::FSSL: return QStringLiteral("FSSL"); + case L25_KindGuidingLine::NFL: return QStringLiteral("NFL"); + default: return QStringLiteral("Unknown"); + } +} + +inline PDM_COMMON_EXPORT QString toString(L26_EffectingSystemType state) +{ + switch (state) { + case L26_EffectingSystemType::Unknown: return QStringLiteral("Unknown"); + case L26_EffectingSystemType::Pzh2000: return QStringLiteral("Pzh2000"); + case L26_EffectingSystemType::RRohr: return QStringLiteral("RRohr"); + case L26_EffectingSystemType::Mars: return QStringLiteral("Mars"); + default: return QStringLiteral("Unknown"); + } +} + +inline PDM_COMMON_EXPORT QString toString(L27_EffectorId state) +{ + switch (state) { + case L27_EffectorId::Unknown: return QStringLiteral("Unknown"); + default: return QStringLiteral("Unknown"); + } +} + +inline PDM_COMMON_EXPORT QString toString(L28_Status state) +{ + switch (state) { + case L28_Status::NichtEinsatzbereit: return QStringLiteral("NichtEinsatzbereit"); + case L28_Status::Einsatzbereit: return QStringLiteral("Einsatzbereit"); + default: return QStringLiteral("Unknown"); + } +} + +inline PDM_COMMON_EXPORT QString toString(L46_GpsFrequency state) +{ + switch (state) { + case L46_GpsFrequency::L1: return QStringLiteral("L1"); + case L46_GpsFrequency::L2: return QStringLiteral("L2"); + default: return QStringLiteral("Unknown"); + } +} + +inline PDM_COMMON_EXPORT QString toString(L48_TrajectoryRocket state) +{ + switch (state) { + case L48_TrajectoryRocket::Nominal: return QStringLiteral("Nominal"); + case L48_TrajectoryRocket::Vertical: return QStringLiteral("Vertical"); + default: return QStringLiteral("Unknown"); + } +} } // namespace ProjectDataManagement \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_types.h b/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_types.h index 9ca6ea83e..faea22c0b 100644 --- a/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_types.h +++ b/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_types.h @@ -27,8 +27,65 @@ enum class VulnerabilityClass : int eClassC = 3 }; -// STUB: toString-Funktionen für VulnerabilityState + VulnerabilityClass -PDM_COMMON_EXPORT QString toString(VulnerabilityState vs); -PDM_COMMON_EXPORT QString toString(VulnerabilityState vs, VulnerabilityClass vc); +// STUB: VulnerabilityState_def - DDS-generierte Wrapper-Struktur +struct VulnerabilityState_def +{ + using type = VulnerabilityState; + static constexpr VulnerabilityState eUnknown = VulnerabilityState::eUnknown; + static constexpr VulnerabilityState eNormal = VulnerabilityState::eNormal; + static constexpr VulnerabilityState eWarning = VulnerabilityState::eWarning; + static constexpr VulnerabilityState eCritical = VulnerabilityState::eCritical; +}; + +// STUB: VulnerabilityClass_def - DDS-generierte Wrapper-Struktur +struct VulnerabilityClass_def +{ + using type = VulnerabilityClass; + static constexpr VulnerabilityClass eUnknown = VulnerabilityClass::eUnknown; + static constexpr VulnerabilityClass eClassA = VulnerabilityClass::eClassA; + static constexpr VulnerabilityClass eClassB = VulnerabilityClass::eClassB; + static constexpr VulnerabilityClass eClassC = VulnerabilityClass::eClassC; + + // Statische Member für SoldierInjuries und VehicleDamages + static constexpr VulnerabilityClass SoldierInjuries = VulnerabilityClass::eClassA; + static constexpr VulnerabilityClass VehicleDamages = VulnerabilityClass::eClassB; +}; + +// STUB: ChargeType Enum +enum class ChargeType : int +{ + Unknown = 0, + Live = 1, + Inert = 2, + Practice = 3 +}; + +// STUB: UnitType Enum +enum class UnitType : int +{ + Unknown = 0, + Air = 1, + Ground = 2, + Naval = 3 +}; + +// STUB: SimulationType Enum +enum class SimulationType : int +{ + Unknown = 0, + Live = 1, + Constructive = 2, + Virtual = 3 +}; + +// STUB: EventType Enum +enum class EventType : int +{ + Unknown = 0, + Alarm = 1, + Warning = 2, + Info = 3, + Status = 4 +}; } // namespace ProjectDataManagement \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/project_data_management.hpp b/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/project_data_management.hpp new file mode 100644 index 000000000..2add0825c --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/project_data_management.hpp @@ -0,0 +1,43 @@ +#pragma once + +// STUB-HEADER: Diese Datei wird normalerweise von DDS/Codegenerator generiert +// Für die Migration erstellen wir minimale Typ-Definitionen + +#include "pdm_types.h" + +namespace ProjectDataManagement +{ + +// STUB: EventType Enum +enum class EventType : int +{ + Unknown = 0, + Alarm = 1, + Warning = 2, + Info = 3 +}; + +// STUB: EventType_def - Platzhalter für DDS-generierten Typ +// Wird in AlarmManagement für Event-Typisierung verwendet +struct EventType_def +{ + int value{0}; + + EventType_def() = default; + explicit EventType_def(int v) : value(v) {} + explicit EventType_def(EventType t) : value(static_cast(t)) {} + + bool operator==(const EventType_def& other) const { return value == other.value; } + bool operator!=(const EventType_def& other) const { return value != other.value; } + bool operator<(const EventType_def& other) const { return value < other.value; } +}; + +// STUB: EventData - Basisstruktur für Event-Daten +struct EventData +{ + EventType_def eventType; + QString description; + qint64 timestamp{0}; +}; + +} // namespace ProjectDataManagement \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/include/Viewer/SituationMap/ElevationMap/elevation_map_manager.h b/qt6-after/qt6-migrated-legatus/include/Viewer/SituationMap/ElevationMap/elevation_map_manager.h index be140ed97..2b82ea715 100644 --- a/qt6-after/qt6-migrated-legatus/include/Viewer/SituationMap/ElevationMap/elevation_map_manager.h +++ b/qt6-after/qt6-migrated-legatus/include/Viewer/SituationMap/ElevationMap/elevation_map_manager.h @@ -12,7 +12,7 @@ #include // QPoint3D ist bereits in LtsUtilsCore/qpoint3d.h definiert -// #include "LtsUtilsCore/qpoint3d.h" // Wird von lts_elevation_manager.h included +// #include "LtsUtils/qpoint3d.h" // Wird von lts_elevation_manager.h included namespace LtsUtils {