LtsUtilsCore: Alle Include-Pfade korrigiert (LtsUtils/ → LtsUtilsCore/)
- 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
This commit is contained in:
95 files changed
+667
-177
No files matched your search
+20
-10
@@ -3,6 +3,7 @@
|
||||
#include "alm_config_alarm_model.h"
|
||||
|
||||
#include <AlarmManagement/alm_translation.h>
|
||||
#include <GuezNasat/logger.h>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <LtsUtilsCore/data_modification_enum.h>
|
||||
#include <ProjectDataManagement/pdm_to_string.h>
|
||||
@@ -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<AlarmManagement::AlarmConfig>(
|
||||
{tr("Id"), tr("Equip. No."), tr("Designator"), tr("Tact. Identifier"), tr("Vulnerability State"),
|
||||
@@ -29,19 +39,19 @@ bool ConfigAlarmModel::initModel(const std::shared_ptr<AlarmManagement::Interfac
|
||||
m_global = global;
|
||||
|
||||
const QMap<qint32, AlarmManagement::AlarmConfig> 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;
|
||||
|
||||
+3
-4
@@ -7,10 +7,10 @@
|
||||
|
||||
#include <AlarmManagement/alm_dtc.h>
|
||||
#include <AlarmManagement/alm_types.h>
|
||||
#include <AlarmManagement/logger.h>
|
||||
#include <GuezNasat/logger.h>
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <LtsWidgets/lts_abstract_table_model.h>
|
||||
#include <LtsUtils/data_modification_enum.h>
|
||||
#include <LtsUtilsCore/data_modification_enum.h>
|
||||
|
||||
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<AlarmManagement::Interface::Dtc> m_dtc;
|
||||
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
|
||||
AlarmHistoryModel* m_alarmHistoryModel;
|
||||
|
||||
+41
-38
@@ -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_ptr<AlarmManagement::Interfa
|
||||
connect(m_ppmDtc.get(), &ParticipantManagement::Interface::Dtc::participantChanged, this,
|
||||
&AlarmHistoryModel::onParticipantChanged);
|
||||
|
||||
m_ppmDtc->enableParticipant();
|
||||
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_ptr<AlarmManagement::Interfa
|
||||
&AlarmHistoryModel::onOffRouteMineChanged);
|
||||
|
||||
auto cbAesItem = [this](const AreaEffectSimulation::AesItem& item) {
|
||||
onAesItemChanged(item, Lts::DataModification::eAdded);
|
||||
onAesItemChanged(item, DataModification::eAdded);
|
||||
};
|
||||
m_aesDtc->borderlines(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<ProjectDataManagement::EventType>(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)
|
||||
|
||||
+9
-9
@@ -11,6 +11,7 @@
|
||||
#include <LtsWidgets/lts_abstract_table_model.h>
|
||||
#include <LtsWidgets/lts_column_filter_proxy_model.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ProjectDataManagement/project_data_management.hpp>
|
||||
|
||||
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<AlarmManagement::Interface::Dtc> m_dtc;
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsUtilsCore/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtils/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include "exm_dialog_model.h"
|
||||
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
#include <LtsUtilsCore/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtils/dds_vector_to_pixmap.h>
|
||||
|
||||
#include <QFile>
|
||||
#include <QDebug>
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
#include <ExerciseManagement/exm_operator_rights.h>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsUtilsCore/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtils/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
#include "ui_topic_editor.h"
|
||||
|
||||
#include <LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsUtilsCore/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtils/dds_vector_to_pixmap.h>
|
||||
#include <LtsWidgets/lts_text_edit_dialog.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#include "flm_dialog_model_folder.h"
|
||||
#include "ParticipantManagement/ppm.hpp"
|
||||
|
||||
#include <LtsUtilsCore/pgarray.h>
|
||||
#include <LtsUtils/pgarray.h>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
#include <nglwidgets/ngltreeitem.h>
|
||||
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
#include <LtsWidgets/lts_events.h>
|
||||
#include <LtsWidgets/lts_base_layout_widget.h>
|
||||
#include <LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsUtilsCore/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtils/dds_vector_to_pixmap.h>
|
||||
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#include "flm_preview_file_dialog.h"
|
||||
#include "ui_flm_preview_file_dialog.h"
|
||||
|
||||
#include <LtsUtilsCore/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtils/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsPrinting/printing.h>
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#include "flm_preview_playback.h"
|
||||
#include "ui_flm_preview_playback.h"
|
||||
|
||||
#include <LtsUtilsCore/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtils/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include <nglwidgets/nglpdfwidget.h>
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
#include "ui_mrk_marker.h"
|
||||
#include "mrk_dialog_model.h"
|
||||
|
||||
#include <LtsUtilsCore/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtils/dds_vector_to_pixmap.h>
|
||||
|
||||
namespace MarkerManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
#include <LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsUtilsCore/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtils/dds_vector_to_pixmap.h>
|
||||
|
||||
#include <QDateTime>
|
||||
#include <QImage>
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsUtilsCore/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtils/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtilsCore/await.h>
|
||||
#include <LtsWidgets/lts_global_wait_dialog.h>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
#include "mrk_create_snapshot.h"
|
||||
|
||||
#include <LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsUtilsCore/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtils/dds_vector_to_pixmap.h>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <LtsAppManager/lts_app_manager.h>
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
#include "snapshot_dialog_model.h"
|
||||
#include <utility>
|
||||
#include <FileManagement/flm_explorer_gui_plugin_interface.h>
|
||||
#include <LtsUtilsCore/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtils/dds_vector_to_pixmap.h>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
#include <QSet>
|
||||
#include <QJsonDocument>
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include <ParticipantManagement/ppm_data_plugin_interface.h>
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
#include <ExerciseManagement/exm_data_plugin_interface.h>
|
||||
#include <LtsUtilsCore/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtils/dds_vector_to_pixmap.h>
|
||||
|
||||
#include <QIcon>
|
||||
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
#include <LtsWidgets/lts_splash.h>
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include <LtsWidgets/lts_wait_dialog.h>
|
||||
#include <LtsUtilsCore/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtils/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
#include <ConnectDialog/connect_dialog_nt.h>
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
|
||||
#include <LtsWidgets/lts_frameless_dialog.h>
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include <LtsUtilsCore/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtils/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsSession/lts_session.h>
|
||||
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
#include <OperatorManagement/Gui/Common/operator_change_password.h>
|
||||
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include <LtsUtilsCore/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtils/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
#include <LtsWidgets/lts_base_layout_widget.h>
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
#include "TopicEditor/topic_editor.h"
|
||||
#include "flm_reply_handler.h"
|
||||
|
||||
#include <LtsUtilsCore/pgarray.h>
|
||||
#include <LtsUtils/pgarray.h>
|
||||
#include <LtsUtilsCore/dds_vector.h>
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
#include <AreaEffectSimulation/Utils/polygons.h>
|
||||
#include <AreaEffectSimulation/Utils/ddsdbconvert.h>
|
||||
|
||||
#include <LtsUtilsCore/dds_bitarray.h>
|
||||
#include <LtsUtils/dds_bitarray.h>
|
||||
|
||||
#include <SituationMap/Symbology/sidc_codec.h>
|
||||
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#include "effect_cluster_to_map.h"
|
||||
#include <utility>
|
||||
#include "pdm_handler.h"
|
||||
#include <LtsUtilsCore/dds_bitarray.h>
|
||||
#include <LtsUtils/dds_bitarray.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <AreaEffectSimulation/Utils/polygons.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
|
||||
#include "explosion_area_to_map.h"
|
||||
#include <LtsUtilsCore/dds_bitarray.h>
|
||||
#include <LtsUtils/dds_bitarray.h>
|
||||
|
||||
|
||||
namespace SituationMap
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#include "explosion_cluster_to_map.h"
|
||||
#include <utility>
|
||||
#include "pdm_handler.h"
|
||||
#include <LtsUtilsCore/dds_bitarray.h>
|
||||
#include <LtsUtils/dds_bitarray.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <AreaEffectSimulation/Utils/polygons.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
|
||||
#include "gas_pipe_to_map.h"
|
||||
#include <LtsUtilsCore/dds_bitarray.h>
|
||||
#include <LtsUtils/dds_bitarray.h>
|
||||
|
||||
|
||||
namespace SituationMap
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include <AreaEffectSimulation/Utils/ddsdbconvert.h>
|
||||
#include <ProjectDataManagement/pdm_dtc.h>
|
||||
|
||||
#include <LtsUtilsCore/dds_bitarray.h>
|
||||
#include <LtsUtils/dds_bitarray.h>
|
||||
|
||||
#include <SituationMap/Symbology/sidc_codec.h>
|
||||
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
#include <AreaEffectSimulation/Utils/ddsdbconvert.h>
|
||||
#include <ProjectDataManagement/pdm_dtc.h>
|
||||
|
||||
#include <LtsUtilsCore/dds_bitarray.h>
|
||||
#include <LtsUtils/dds_bitarray.h>
|
||||
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
#include <AreaEffectSimulation/Utils/polygons.h>
|
||||
#include <AreaEffectSimulation/Utils/ddsdbconvert.h>
|
||||
|
||||
#include <LtsUtilsCore/dds_bitarray.h>
|
||||
#include <LtsUtils/dds_bitarray.h>
|
||||
|
||||
|
||||
namespace SituationMap
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
|
||||
#include "shootback_area_to_map.h"
|
||||
#include <LtsUtilsCore/dds_bitarray.h>
|
||||
#include <LtsUtils/dds_bitarray.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#include "special_areas_to_map.h"
|
||||
#include <utility>
|
||||
#include <LtsUtilsCore/dds_bitarray.h>
|
||||
#include <LtsUtils/dds_bitarray.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <Plugins/ExerciseManagement/exm_data_plugin_interface.h>
|
||||
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
|
||||
#include "technical_area_to_map.h"
|
||||
#include <LtsUtilsCore/dds_bitarray.h>
|
||||
#include <LtsUtils/dds_bitarray.h>
|
||||
|
||||
|
||||
namespace SituationMap
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
|
||||
#include "training_area_to_map.h"
|
||||
#include <LtsUtilsCore/dds_bitarray.h>
|
||||
#include <LtsUtils/dds_bitarray.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <Plugins/ExerciseManagement/exm_data_plugin_interface.h>
|
||||
|
||||
|
||||
Reference in new issue
Block a user