Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set

new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
berrux-dev committed 2026-10-20 09:36:57 +02:00
1 parent 2b957d1edb
commit 598fc2560e
1718 files changed
+126739 -18495

No files matched your search

@@ -63,58 +63,47 @@ QVariant ConfigAlarmModel::data(const QModelIndex& index, int role) const
return QVariant();
const AlarmManagement::AlarmConfig& alarmConfig = m_vecData.at(index.row());
if (alarmConfig.global() != m_global)
if (alarmConfig.global != m_global)
return QVariant();
switch (index.column())
{
case Id:
return alarmConfig.id();
return alarmConfig.id;
case EquipmentNumber: {
const int equipmentNumber = m_alarmHistoryModel->participantId2EquipNo(alarmConfig.participantId());
const int equipmentNumber = m_alarmHistoryModel->participantId2EquipNo(alarmConfig.participantId);
if (equipmentNumber == 0)
return tr("All");
return equipmentNumber;
}
case Designator:
return m_alarmHistoryModel->getDesignator(alarmConfig.participantId());
return m_alarmHistoryModel->getDesignator(alarmConfig.participantId);
case TactIdentifier:
return m_alarmHistoryModel->getTactIdentifier(alarmConfig.participantId());
return m_alarmHistoryModel->getTactIdentifier(alarmConfig.participantId);
case VulnerabilityState: {
QString vulnerabilityState = tr("All Types");
if (alarmConfig.vulnerabilityState() >= 0)
if (alarmConfig.vulnerabilityState >= 0)
{
// 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();
// }
ParticipantManagement::TypeClass typeClass =
m_ppmDtc->type(m_ppmDtc->participant(alarmConfig.participantId).typeId).typeClass;
const ProjectDataManagement::VulnerabilityClass vc =
typeClass == ParticipantManagement::TypeClass::Human
? ProjectDataManagement::VulnerabilityClass::SoldierInjuries
: ProjectDataManagement::VulnerabilityClass::VehicleDamages;
? ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_SoldierInjuries
: ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_VehicleDamages;
ProjectDataManagement::VulnerabilityState vs =
static_cast<ProjectDataManagement::VulnerabilityState>(alarmConfig.vulnerabilityState());
static_cast<ProjectDataManagement::VulnerabilityState>(alarmConfig.vulnerabilityState);
vulnerabilityState = ProjectDataManagement::toString(vs, vc);
}
return vulnerabilityState;
}
case EventType:
return ProjectDataManagement::toString(static_cast<ProjectDataManagement::PdmEventType>(alarmConfig.eventTypeId()));
return ProjectDataManagement::toString(static_cast<ProjectDataManagement::PdmEventType>(alarmConfig.eventTypeId));
case MessageWindow:
return alarmConfig.messageWindow() ? tr("Yes") : tr("No");
return alarmConfig.messageWindow ? tr("Yes") : tr("No");
case SetMarker:
return alarmConfig.setMarker() ? tr("Yes") : tr("No");
return alarmConfig.setMarker ? tr("Yes") : tr("No");
}
return QVariant();
@@ -122,15 +111,15 @@ QVariant ConfigAlarmModel::data(const QModelIndex& index, int role) const
void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig& data, const DataModification modType)
{
const int id = data.id();
if (data.global() != m_global)
const int id = data.id;
if (data.global != m_global)
return;
int row = findRowForId(id);
const int eventTypeId = data.eventTypeId();
const bool messageWindow = data.messageWindow();
const bool setMarker = data.setMarker();
const int eventTypeId = static_cast<int>(data.eventTypeId);
const bool messageWindow = data.messageWindow;
const bool setMarker = data.setMarker;
DEBUG_LOG(getLogger()) << "onAlarmConfigChanged: " << eventTypeId << " messageWindow=" << messageWindow << "setMarker"
<< setMarker;
@@ -140,8 +129,8 @@ void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig&
DEBUG_LOG(getLogger()) << "AlarmConfig was removed: " << id;
AlarmManagement::AlarmConfig data1 = data;
data1.setMessageWindow(false);
data1.setSetMarker(false);
data1.messageWindow = false;
data1.setMarker = false;
setRowData(row, data1);
removeRow(row);
return;
@@ -153,7 +142,7 @@ void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig&
return;
}
if (m_alarmHistoryModel->participantId2EquipNo(data.participantId()) > 0)
if (m_alarmHistoryModel->participantId2EquipNo(data.participantId) > 0)
setRowData(row, data);
break;
}
@@ -6,7 +6,6 @@
#include "almcommon_export.h"
#include <AlarmManagement/alm_dtc.h>
#include <AlarmManagement/alm_types.h>
#include <GuezNasat/logger.h>
#include <LtsSession/lts_session.h>
#include <LtsWidgets/lts_abstract_table_model.h>
@@ -49,7 +49,7 @@ bool AlarmHistoryModel::initModel(const std::shared_ptr<AlarmManagement::Interfa
// Register callbacks instead of enableParticipant()
const auto cbParticipants = [this](const ParticipantManagement::Participant& participant) {
onParticipantChanged(participant, ParticipantManagement::DataModification::eAdded);
onParticipantChanged(participant, DataModification::eAdded);
};
m_ppmDtc->participants(cbParticipants);
@@ -66,7 +66,7 @@ bool AlarmHistoryModel::initModel(const std::shared_ptr<AlarmManagement::Interfa
auto cbAesItem = [this](const AreaEffectSimulation::AesItem& item) {
onAesItemChanged(item, DataModification::eAdded);
};
m_aesDtc->bcContaminations(cbAesItem);
m_aesDtc->bCContaminations(cbAesItem);
m_aesDtc->boobyTraps(cbAesItem);
m_aesDtc->offRouteMines(cbAesItem);
@@ -84,7 +84,7 @@ QVariant AlarmHistoryModel::data(const QModelIndex& index, int role) const
if (role == Qt::BackgroundRole)
{
if (notificationEx.eventType() == ProjectDataManagement::PdmEventType::Alarm)
if (notificationEx.eventType == ProjectDataManagement::PdmEventType::EventType_EmergencyCall)
return QColor(Qt::red);
return QVariant();
}
@@ -94,7 +94,7 @@ QVariant AlarmHistoryModel::data(const QModelIndex& index, int role) const
case Id:
return notificationEx.id;
case Date:
return QDateTime::fromMSecsSinceEpoch(notificationEx.time());
return QDateTime::fromMSecsSinceEpoch(notificationEx.time);
case EquipmentNumber:
if (notificationEx.equipmentNumber)
return notificationEx.equipmentNumber;
@@ -107,10 +107,10 @@ QVariant AlarmHistoryModel::data(const QModelIndex& index, int role) const
return notificationEx.participantId;
case Position:
if (role == Qt::DisplayRole)
return LtsCoordTrans::mgrsFromGeographic(notificationEx.position().lon(),
notificationEx.position().lat());
return LtsCoordTrans::mgrsFromGeographic(notificationEx.position.lon,
notificationEx.position.lat);
else if (role == Qt::UserRole)
return QPointF(notificationEx.position().lon(), notificationEx.position().lat());
return QPointF(notificationEx.position.lon, notificationEx.position.lat);
break;
case AesId:
return notificationEx.aesId;
@@ -124,9 +124,9 @@ QVariant AlarmHistoryModel::data(const QModelIndex& index, int role) const
bool AlarmHistoryModel::isFiltered(const NotificationEx& data, DataModification modType) const
{
Q_UNUSED(modType);
if (data.operatorId() == 0)
if (data.operatorId == 0)
return false;
return data.operatorId() != LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
return data.operatorId != LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
}
void AlarmHistoryModel::onNotificationChanged(const AlarmManagement::Notification& data, const DataModification modType)
@@ -135,16 +135,16 @@ void AlarmHistoryModel::onNotificationChanged(const AlarmManagement::Notificatio
return;
NotificationEx notification(data);
const QByteArray properties = QByteArray::fromRawData(data.properties().c_str(), data.properties().size());
const QByteArray properties = QByteArray::fromRawData(data.properties.c_str(), data.properties.size());
const QJsonDocument propertieJsonDoc = QJsonDocument::fromJson(properties);
const QJsonObject propertieJsonObj = propertieJsonDoc.object();
notification.equipmentNumber = data.equipmentNumber();
if (data.participantId().has_value())
notification.participantId = data.participantId().value();
notification.eventTypeId = static_cast<ProjectDataManagement::PdmEventType>(data.eventType());
if (data.aesId().has_value())
notification.aesId = data.aesId().value();
notification.equipmentNumber = data.equipmentNumber;
if (data.participantId.has_value())
notification.participantId = data.participantId.value();
notification.eventTypeId = static_cast<ProjectDataManagement::PdmEventType>(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();
@@ -155,19 +155,19 @@ void AlarmHistoryModel::onNotificationChanged(const AlarmManagement::Notificatio
}
void AlarmHistoryModel::onParticipantChanged(const ParticipantManagement::Participant& participant,
const ParticipantManagement::DataModification modType)
const DataModification modType)
{
if (modType == ParticipantManagement::DataModification::eRemoved)
if (modType == DataModification::eRemoved)
return;
QString designator = participant.designator();
m_idDesignatorMap.insert(participant.id(), designator);
QString designator = QString::fromStdString(participant.designator);
m_idDesignatorMap.insert(participant.id, designator);
const int equipNo = participant.equipmentNumber.has_value() ? participant.equipmentNumber.value() : 0;
m_partId2EquipNoMap.insert(participant.id(), equipNo);
m_partId2EquipNoMap.insert(participant.id, equipNo);
QString tacticalIdentifier = participant.tacticalIdentifier();
m_idTactIdentifierMap.insert(participant.id(), tacticalIdentifier);
DEBUG_LOG(getLogger("AlarmHistoryModel")) << Q_FUNC_INFO << " id=" << participant.id() << " designator=" << designator
QString tacticalIdentifier = QString::fromStdString(participant.tacticalIdentifier);
m_idTactIdentifierMap.insert(participant.id, tacticalIdentifier);
DEBUG_LOG(getLogger("AlarmHistoryModel")) << Q_FUNC_INFO << " id=" << participant.id << " designator=" << designator
<< " tacticalIdentifier=" << tacticalIdentifier;
}
@@ -199,8 +199,8 @@ void AlarmHistoryModel::onBCContaminationChanged(const AreaEffectSimulation::BCC
{
if (modType == DataModification::eRemoved)
return;
int id = data.id();
QString name = QString::fromStdString(data.name());
int id = data.id;
QString name = QString::fromStdString(data.name);
m_aesNameMap[id] = name;
DEBUG_LOG(getLogger("AlarmHistoryModel")) << "onBCContaminationChanged: id=" << id << " Name=" << name;
}
@@ -209,8 +209,8 @@ void AlarmHistoryModel::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap
{
if (modType == DataModification::eRemoved)
return;
int id = data.id();
QString name = QString::fromStdString(data.name());
int id = data.id;
QString name = QString::fromStdString(data.name);
m_aesNameMap[id] = name;
DEBUG_LOG(getLogger("AlarmHistoryModel")) << "BoobyTrap: id=" << id << " Name=" << name;
}
@@ -220,8 +220,8 @@ void AlarmHistoryModel::onOffRouteMineChanged(const AreaEffectSimulation::OffRou
{
if (modType == DataModification::eRemoved)
return;
int id = data.id();
QString name = QString::fromStdString(data.name());
int id = data.id;
QString name = QString::fromStdString(data.name);
m_aesNameMap[id] = name;
DEBUG_LOG(getLogger("AlarmHistoryModel")) << "OffRouteMine: id=" << id << " Name=" << name;
}
@@ -230,8 +230,8 @@ void AlarmHistoryModel::onAesItemChanged(const AreaEffectSimulation::AesItem& it
{
if (modType == DataModification::eRemoved)
return;
QString name = QString::fromStdString(item.name());
int id = item.id();
QString name = QString::fromStdString(item.name);
int id = item.id;
m_aesNameMap[id] = name;
DEBUG_LOG(getLogger("AlarmHistoryModel")) << "AreaEffectSimulation::AesItem onAesItemChanged: id=" << id
<< " Name=" << name;
@@ -253,7 +253,7 @@ bool AlarmHistoryProxyModel::lessThan(const QModelIndex& source_left, const QMod
switch (source_left.column())
{
case AlarmHistoryModel::Date:
return dataLeft.time() < dataRight.time();
return dataLeft.time < dataRight.time;
case AlarmHistoryModel::Id:
case AlarmHistoryModel::Incident:
@@ -11,7 +11,8 @@
#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>
#include <ParticipantManagement/ppm_dtc.h>
#include <ProjectDataManagement/pdm_enums.hpp>
namespace AlarmManagement
{
@@ -50,7 +51,7 @@ class ALMCOMMON_EXPORT AlarmHistoryModel final : public LtsWidgets::LtsAbstractT
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 onParticipantChanged(const ParticipantManagement::Participant& participant, const DataModification modType);
void onAesItemChanged(const AreaEffectSimulation::AesItem& item, const DataModification modType);
void onBCContaminationChanged(const AreaEffectSimulation::BCContamination& data, const DataModification modType);
void onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap& data, const DataModification modType);