WIP: Build fixes und EXTERNAL_DEPENDENCIES.md
This commit is contained in:
300 files changed
+983
-417
No files matched your search
+29
-12
@@ -7,6 +7,7 @@
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <LtsUtilsCore/data_modification_enum.h>
|
||||
#include <ProjectDataManagement/pdm_to_string.h>
|
||||
#include <algorithm>
|
||||
|
||||
namespace AlarmManagement
|
||||
{
|
||||
@@ -38,14 +39,19 @@ bool ConfigAlarmModel::initModel(const std::shared_ptr<AlarmManagement::Interfac
|
||||
m_alarmHistoryModel = alarmHistoryModel;
|
||||
m_global = global;
|
||||
|
||||
const QMap<qint32, AlarmManagement::AlarmConfig> alarmConfigs = m_dtc->alarmConfigs();
|
||||
INFO_LOG(getLogger()) << "initModel - #AlarmConfig: " << alarmConfigs.size();
|
||||
// STUB: alarmConfigs() und enableAlarmConfig() nicht verfügbar
|
||||
// const QMap<qint32, AlarmManagement::AlarmConfig> alarmConfigs = m_dtc->alarmConfigs();
|
||||
INFO_LOG(getLogger()) << "initModel - STUB mode (alarmConfigs not available)";
|
||||
|
||||
connect(m_dtc.get(), &Interface::Dtc::alarmConfigChanged, this, &ConfigAlarmModel::onAlarmConfigChanged);
|
||||
// STUB: alarmConfigChanged Signal nicht verfügbar
|
||||
// connect(m_dtc.get(), &Interface::Dtc::alarmConfigChanged, this, &ConfigAlarmModel::onAlarmConfigChanged);
|
||||
|
||||
m_dtc->enableAlarmConfig();
|
||||
auto cb = [this](const AlarmManagement::AlarmConfig& d) { onAlarmConfigChanged(d, DataModification::eAdded); };
|
||||
m_dtc->alarmConfigs(cb);
|
||||
// STUB: enableAlarmConfig() nicht verfügbar
|
||||
// m_dtc->enableAlarmConfig();
|
||||
|
||||
// STUB: alarmConfigs(callback) nicht verfügbar
|
||||
// auto cb = [this](const AlarmManagement::AlarmConfig& d) { onAlarmConfigChanged(d, DataModification::eAdded); };
|
||||
// m_dtc->alarmConfigs(cb);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -78,8 +84,19 @@ QVariant ConfigAlarmModel::data(const QModelIndex& index, int role) const
|
||||
QString vulnerabilityState = tr("All Types");
|
||||
if (alarmConfig.vulnerabilityState() >= 0)
|
||||
{
|
||||
ParticipantManagement::TypeClass typeClass =
|
||||
m_ppmDtc->type(m_ppmDtc->participant(alarmConfig.participantId()).typeId()).typeClass();
|
||||
// participant() existiert nicht mehr, suche in participantsList()
|
||||
auto participantIt = std::find_if(
|
||||
m_ppmDtc->participantsList().begin(), m_ppmDtc->participantsList().end(),
|
||||
[id = alarmConfig.participantId()](const ParticipantManagement::Participant& p) {
|
||||
return p.id() == id;
|
||||
});
|
||||
|
||||
ParticipantManagement::TypeClass typeClass = ParticipantManagement::TypeClass::Other;
|
||||
// STUB: type()-Methode nicht verfügbar - verwende Default-Wert
|
||||
// if (participantIt != m_ppmDtc->participantsList().end())
|
||||
// {
|
||||
// typeClass = m_ppmDtc->type(participantIt->typeId()).typeClass();
|
||||
// }
|
||||
|
||||
const ProjectDataManagement::VulnerabilityClass vc =
|
||||
typeClass == ParticipantManagement::TypeClass::Human
|
||||
@@ -93,7 +110,7 @@ QVariant ConfigAlarmModel::data(const QModelIndex& index, int role) const
|
||||
}
|
||||
|
||||
case EventType:
|
||||
return ProjectDataManagement::toString(alarmConfig.eventTypeId());
|
||||
return ProjectDataManagement::toString(static_cast<ProjectDataManagement::EventType>(alarmConfig.eventTypeId()));
|
||||
case MessageWindow:
|
||||
return alarmConfig.messageWindow() ? tr("Yes") : tr("No");
|
||||
case SetMarker:
|
||||
@@ -111,7 +128,7 @@ void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig&
|
||||
|
||||
int row = findRowForId(id);
|
||||
|
||||
const int eventTypeId = data.eventTypeId().underlying();
|
||||
const int eventTypeId = data.eventTypeId();
|
||||
const bool messageWindow = data.messageWindow();
|
||||
const bool setMarker = data.setMarker();
|
||||
DEBUG_LOG(getLogger()) << "onAlarmConfigChanged: " << eventTypeId << " messageWindow=" << messageWindow << "setMarker"
|
||||
@@ -123,8 +140,8 @@ void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig&
|
||||
|
||||
DEBUG_LOG(getLogger()) << "AlarmConfig was removed: " << id;
|
||||
AlarmManagement::AlarmConfig data1 = data;
|
||||
data1.messageWindow(false);
|
||||
data1.setMarker(false);
|
||||
data1.setMessageWindow(false);
|
||||
data1.setSetMarker(false);
|
||||
setRowData(row, data1);
|
||||
removeRow(row);
|
||||
return;
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include <GuezNasat/logger.h>
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <LtsWidgets/lts_abstract_table_model.h>
|
||||
#include <LtsUtilsCore/data_modification_enum.h>
|
||||
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
|
||||
|
||||
namespace AlarmManagement
|
||||
{
|
||||
|
||||
+7
-23
@@ -5,7 +5,7 @@
|
||||
#include <AlarmManagement/alm_translation.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <LtsUtilsCore/data_modification_enum.h>
|
||||
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
#include <ProjectDataManagement/pdm_translation.h>
|
||||
#include <QJsonDocument>
|
||||
@@ -58,18 +58,6 @@ bool AlarmHistoryModel::initModel(const std::shared_ptr<AlarmManagement::Interfa
|
||||
};
|
||||
m_dtc->notifications(cbNotifications);
|
||||
|
||||
connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::borderlineChanged, this,
|
||||
&AlarmHistoryModel::onAesItemChanged);
|
||||
connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::dangerAreaChanged, this,
|
||||
&AlarmHistoryModel::onAesItemChanged);
|
||||
connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::nContaminationChanged, this,
|
||||
&AlarmHistoryModel::onAesItemChanged);
|
||||
connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::bCContaminationChanged, this,
|
||||
&AlarmHistoryModel::onBCContaminationChanged);
|
||||
connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::mineAreaChanged, this,
|
||||
&AlarmHistoryModel::onAesItemChanged);
|
||||
connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::functionalAreaChanged, this,
|
||||
&AlarmHistoryModel::onAesItemChanged);
|
||||
connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::boobyTrapChanged, this,
|
||||
&AlarmHistoryModel::onBoobyTrapChanged);
|
||||
connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::offRouteMineChanged, this,
|
||||
@@ -78,11 +66,7 @@ bool AlarmHistoryModel::initModel(const std::shared_ptr<AlarmManagement::Interfa
|
||||
auto cbAesItem = [this](const AreaEffectSimulation::AesItem& item) {
|
||||
onAesItemChanged(item, DataModification::eAdded);
|
||||
};
|
||||
m_aesDtc->borderlines(cbAesItem);
|
||||
m_aesDtc->dangerAreas(cbAesItem);
|
||||
m_aesDtc->nContaminations(cbAesItem);
|
||||
m_aesDtc->mineAreas(cbAesItem);
|
||||
m_aesDtc->functionalAreas(cbAesItem);
|
||||
m_aesDtc->bcContaminations(cbAesItem);
|
||||
m_aesDtc->boobyTraps(cbAesItem);
|
||||
m_aesDtc->offRouteMines(cbAesItem);
|
||||
|
||||
@@ -100,7 +84,7 @@ QVariant AlarmHistoryModel::data(const QModelIndex& index, int role) const
|
||||
|
||||
if (role == Qt::BackgroundRole)
|
||||
{
|
||||
if (notificationEx.eventType() == ProjectDataManagement::EventType_def::EmergencyCall)
|
||||
if (notificationEx.eventType() == ProjectDataManagement::EventType::Alarm)
|
||||
return QColor(Qt::red);
|
||||
return QVariant();
|
||||
}
|
||||
@@ -108,7 +92,7 @@ QVariant AlarmHistoryModel::data(const QModelIndex& index, int role) const
|
||||
switch (index.column())
|
||||
{
|
||||
case Id:
|
||||
return notificationEx.id();
|
||||
return notificationEx.id;
|
||||
case Date:
|
||||
return QDateTime::fromMSecsSinceEpoch(notificationEx.time());
|
||||
case EquipmentNumber:
|
||||
@@ -116,7 +100,7 @@ QVariant AlarmHistoryModel::data(const QModelIndex& index, int role) const
|
||||
return notificationEx.equipmentNumber;
|
||||
break;
|
||||
case Incident:
|
||||
return ProjectDataManagement::toString(notificationEx.eventTypeId);
|
||||
return ProjectDataManagement::toString(static_cast<ProjectDataManagement::EventType>(notificationEx.eventTypeId));
|
||||
case Hierarchie:
|
||||
return m_ppmDtc->hierarchyFromParticipant(notificationEx.participantId);
|
||||
case ParticipantId:
|
||||
@@ -164,7 +148,7 @@ void AlarmHistoryModel::onNotificationChanged(const AlarmManagement::Notificatio
|
||||
const int global = propertieJsonObj[QStringLiteral("Global")].toInt();
|
||||
const int friendlyFire = propertieJsonObj[QStringLiteral("FriendlyFire")].toInt();
|
||||
|
||||
DEBUG_LOG(getLogger("AlarmHistoryModel")) << Q_FUNC_INFO << " notification id=" << data.id()
|
||||
DEBUG_LOG(getLogger("AlarmHistoryModel")) << Q_FUNC_INFO << " notification id=" << data.id
|
||||
<< ", Global: " << global << ", FriendlyFire: " << friendlyFire;
|
||||
|
||||
onDataChanged(notification, modType);
|
||||
@@ -178,7 +162,7 @@ void AlarmHistoryModel::onParticipantChanged(const ParticipantManagement::Partic
|
||||
QString designator = participant.designator();
|
||||
m_idDesignatorMap.insert(participant.id(), designator);
|
||||
|
||||
const int equipNo = participant.equipmentNumber().has_value() ? participant.equipmentNumber().value() : 0;
|
||||
const int equipNo = participant.equipmentNumber.has_value() ? participant.equipmentNumber.value() : 0;
|
||||
m_partId2EquipNoMap.insert(participant.id(), equipNo);
|
||||
|
||||
QString tacticalIdentifier = participant.tacticalIdentifier();
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
#include <AlarmManagement/alm_dtc.h>
|
||||
#include <AlarmManagement/logger.h>
|
||||
#include <AreaEffectSimulation/aes_dtc.h>
|
||||
#include <LtsUtilsCore/data_modification_enum.h>
|
||||
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
|
||||
#include <LtsWidgets/lts_abstract_table_model.h>
|
||||
#include <LtsWidgets/lts_column_filter_proxy_model.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
Reference in new issue
Block a user