WIP: Build fixes und EXTERNAL_DEPENDENCIES.md

This commit is contained in:
torsten committed 2026-08-21 07:04:40 +02:00
1 parent 85bae2e60a
commit 27fe03a03a
300 files changed
+983 -417

No files matched your search

@@ -14,6 +14,7 @@ NGL_ADD_LIBRARY(WS AsbData STATIC
TARGET_INCLUDE_DIRECTORIES(AsbData PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../../..
${CMAKE_CURRENT_SOURCE_DIR}/../../../Viewer/SituationMap
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Z/src
)
NGL_TARGET_LINK_LIBRARIES(AsbData
GimDataPluginInterface
@@ -21,6 +22,7 @@ NGL_TARGET_LINK_LIBRARIES(AsbData
AesDataPluginInterface
PpmDataPluginInterface
advancedSymbology
Qt6::Widgets
)
#
@@ -4,13 +4,16 @@
#include "logger.h"
#include <AreaEffectSimulation/aes_dtc.h>
#include <ParticipantManagement/ppm.hpp>
#include <Symbology/symbol_data_to_render_role.h>
#include <SymbologyImpl/advanced_symbology_logging.h>
#ifdef BUILD_WITH_EXTERNAL_DDS
#include "AreaEffectSimulation/aes_dtc.h"
#include "ParticipantManagement/ppm.hpp"
#endif
#include "Symbology/symbol_data_to_render_role.h"
#include "SymbologyImpl/advanced_symbology_logging.h"
namespace AdvancedSymbology
{
#ifdef BUILD_WITH_EXTERNAL_DDS
ForeignInterfaceImpl::ForeignInterfaceImpl(const std::shared_ptr<ParticipantManagement::Interface::Dtc>& ppmDtc,
const std::shared_ptr<AreaEffectSimulation::Interface::Dtc>& aesDtc,
const std::shared_ptr<GuezIedManagement::Interface::Dtc>& guezIedDtc)
@@ -207,5 +210,6 @@ QSharedPointer<SymbolResult> ForeignInterfaceImpl::findBaseSymbol(const QString&
{
return AdvancedSymbology::SymbolDictionary::dictionary(defaultSymbologyType()).findBaseSymbol(sidc);
}
#endif
} // namespace AdvancedSymbology
@@ -4,10 +4,13 @@
#include <AdvancedSymbology/asb_data_plugin_interface.h>
#include <PluginInterfaces/data_plugin_interface.h>
#ifdef BUILD_WITH_EXTERNAL_DDS
#include <Plugins/GuezIedManagement/gim_data_plugin_interface.h>
#include <ProjectDataManagement/pdm_enums.hpp>
#endif
#include <Symbology/symbol_dictionary.h>
#ifdef BUILD_WITH_EXTERNAL_DDS
namespace AreaEffectSimulation
{
namespace Interface
@@ -23,9 +26,11 @@ namespace Interface
class Dtc;
}
} // namespace ParticipantManagement
#endif
namespace AdvancedSymbology
{
#ifdef BUILD_WITH_EXTERNAL_DDS
class ForeignInterfaceImpl final : public QObject, public ForeignDataInterface
{
Q_OBJECT
@@ -58,5 +63,73 @@ class ForeignInterfaceImpl final : public QObject, public ForeignDataInterface
std::shared_ptr<AreaEffectSimulation::Interface::Dtc> m_aesDtc;
std::shared_ptr<GuezIedManagement::Interface::Dtc> m_guezIedDtc;
};
#else
// Stub implementation when external DDS dependencies are not available
class ForeignInterfaceImpl final : public QObject, public ForeignDataInterface
{
Q_OBJECT
public:
explicit ForeignInterfaceImpl() = default;
AdvancedSymbology::SymbolDictionary& getSymbolDictionary(AdvancedSymbology::SymbologyType type) const override
{
static AdvancedSymbology::SymbolDictionary dummy;
return dummy;
}
QSharedPointer<SymbolResult> findImage(const SymbolDictionary& dict,
const SymbolDataToRender& symDataToRender) const override
{
Q_UNUSED(dict)
Q_UNUSED(symDataToRender)
return nullptr;
}
QSharedPointer<SymbolResult> findImage(const SymbolDataToRender& symDataToRender) const override
{
Q_UNUSED(symDataToRender)
return nullptr;
}
QSharedPointer<SymbolResult> findImage(int participant, int sizeL = 100,
const QColor& desiredColor = QColor()) const override
{
Q_UNUSED(participant)
Q_UNUSED(sizeL)
Q_UNUSED(desiredColor)
return nullptr;
}
QSharedPointer<SymbolResult> findPreview(const SymbolDictionary& dict, const QString& sidc) const override
{
Q_UNUSED(dict)
Q_UNUSED(sidc)
return nullptr;
}
QSharedPointer<SymbolResult> findPreview(const QString& sidc) const override
{
Q_UNUSED(sidc)
return nullptr;
}
QSharedPointer<SymbolResult> findBaseSymbol(const SymbolDictionary& dict, const QString& sidc) const override
{
Q_UNUSED(dict)
Q_UNUSED(sidc)
return nullptr;
}
QSharedPointer<SymbolResult> findBaseSymbol(const QString& sidc) const override
{
Q_UNUSED(sidc)
return nullptr;
}
AdvancedSymbology::SymbologyType defaultSymbologyType() const override
{
// STUB: No external DDS - return valid default
return AdvancedSymbology::SymbologyType::APP6B;
}
private:
NGL::INGLLogger& m_logger = NGL::INGLLogger::instance();
};
#endif
} // namespace AdvancedSymbology
@@ -6,7 +6,7 @@
#include <QGraphicsScene>
#include <QPen>
#include <Viewer/SituationMap/SymbologyXML/primitive.h>
#include <SymbologyXML/primitive.h>
class QGraphicsItem;
class QGraphicsRectItem;
@@ -24,12 +24,12 @@
#include <QKeyEvent>
#include <QScrollBar>
#include <QStandardItemModel>
#include <Viewer/SituationMap/SymbologyXML/attribute_data.h>
#include <Viewer/SituationMap/SymbologyXML/symbol.h>
#include <Viewer/SituationMap/SymbologyXML/symbol_exporter.h>
#include <Viewer/SituationMap/SymbologyXML/symbol_reader.h>
#include <Viewer/SituationMap/SymbologyXML/symbol_table.h>
#include <Viewer/SituationMap/SymbologyXML/symbol_writer.h>
#include <SymbologyXML/attribute_data.h>
#include <SymbologyXML/symbol.h>
#include <SymbologyXML/symbol_exporter.h>
#include <SymbologyXML/symbol_reader.h>
#include <SymbologyXML/symbol_table.h>
#include <SymbologyXML/symbol_writer.h>
#include <utility>
namespace AdvancedSymbology
@@ -8,7 +8,7 @@
#include <ParticipantManagement/ppm_data_plugin_interface.h>
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
#include <Plugins/FileManagement/flm_explorer_gui_plugin_interface.h>
#include <Viewer/SituationMap/SymbologyXML/symbol_types.h>
#include <SymbologyXML/symbol_types.h>
class QGraphicsScene;
class QComboBox;
@@ -5,7 +5,7 @@
#include "asb_symbol_editor.h"
#include <LtsWidgets/lts_splash.h>
#include <Viewer/SituationMap/Symbology/symbol_dictionary.h>
#include <Symbology/symbol_dictionary.h>
#include <LtsSession/lts_session.h>
#include <NGLLogger/NGLLoggerBootstrap.h>
@@ -4,7 +4,7 @@
#include "flm_symbol_proxy.h"
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
#include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
@@ -4,7 +4,7 @@
#include <AdvancedSymbology/asb_symbol_proxy_gui_plugin_interface.h>
#include <FileManagement/flm.hpp>
#include <LtsUtilsCore/data_modification_enum.h>
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
#include <PluginInterfaces/gui_plugin_interface.h>
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
#include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
@@ -4,7 +4,7 @@
#pragma once
#include <QColor>
#include <Lts/Viewer/SituationMap/Symbology/symbol_dictionary.h>
#include <Symbology/symbol_dictionary.h>
#include <PluginInterfaces/data_plugin_interface.h>
@@ -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;
@@ -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
{
@@ -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();
@@ -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>
@@ -6,7 +6,7 @@
#include <ParticipantManagement/ppm_data_plugin_interface.h>
#include <ngltools/ngltools_dtg.h>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <LtsUtilsCore/variant_operators.h>
#include <LtsUtils/LtsUtilsCore/variant_operators.h>
namespace AreaEffectSimulation
{
@@ -12,7 +12,7 @@
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
#include <LtsSession/lts_session.h>
#include <LtsUtilsCore/data_modification_enum.h>
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
#include <AreaEffectSimulation/aes_ftc.h>
#include <AreaEffectSimulation/aes_operator_rights.h>
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
@@ -5,7 +5,7 @@
#include "ui_asm_edit_training_area_dialog.h"
#include <LtsSession/lts_session_data.h>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <LtsUtils/dds_vector_to_pixmap.h>
#include <LtsUtilsSettings/settings.h>
#include <LtsWidgets/lts_message_dialog.h>
@@ -2,7 +2,7 @@
#include "operator_settings_observer.h"
#include <LtsUtilsCore/data_modification_enum.h>
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
#include <LtsUtilsSettings/settings.h>
#include <ExerciseManagement/exm_dtc.h>
#include <ExerciseManagement/exm.hpp>
@@ -5,7 +5,7 @@
#include <AudioVideoManagement/ava_session.h>
#include <AudioVideoManagement/ava_control.h>
#include <AudioVideoManagement/avm_dtc.h>
#include <LtsUtilsCore/data_modification_enum.h>
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
#include <QMap>
@@ -8,7 +8,7 @@
#include <AudioVideoManagement/avm_dtc.h>
#include <AudioVideoManagement/avs_menus.h>
#include <LtsSession/lts_session.h>
#include <LtsUtilsCore/data_modification_enum.h>
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
namespace AudioVideoManagement
{
@@ -4,7 +4,7 @@
#include <AudioVideoManagement/avm_ftc.h>
#include <AudioVideoManagement/logger.h>
#include <LtsUtilsCore/data_modification_enum.h>
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
#include <LtsWidgets/lts_dialog.h>
#include <Plugins/FileManagement/flm_explorer_gui_plugin_interface.h>
#include <memory>
@@ -9,7 +9,7 @@
#include <BuildingViewer/share/exccommands.h>
#include <InfrastructureManagement/Shared/ism_mounting_point.h>
#include <LtsUtilsCore/qpoint3d.h>
#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
#include <ParticipantManagement/ppm_data_plugin_interface.h>
#include <QByteArray>
#include <QHash>
@@ -10,7 +10,7 @@
#include <InfrastructureManagement/ism_dtc.h>
#include <LtsSession/lts_session_data.h>
#include <LtsUtilsCore/outdated_position.h>
#include <LtsUtils/LtsUtilsCore/outdated_position.h>
#include <LtsUtilsSettings/settings.h>
#include <LtsWidgets/lts_message_dialog.h>
#include <Plugins/InfrastructureManagement/Shared/ism_mounting_point.h>
@@ -7,7 +7,7 @@
#include <BuildingViewer/share/exccommands.h>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
#include <LtsUtilsCore/qpoint3d.h>
#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
#include <NGLLogger/INGLLogger.h>
#include <ParticipantManagement/ppm_data_plugin_interface.h>
#include <ParticipantManagement/ppm_participant_info_gui_plugin_interface.h>
@@ -5,7 +5,7 @@
#include <QString>
#include <QJsonObject>
#include <LtsUtilsCore/qpoint3d.h>
#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
#include "buildingviewercommon_export.h"
namespace BuildingViewer
@@ -16,7 +16,7 @@
#ifdef EXPORT_BDV_TOPIC_AS_JSON
#include <Common/BgViewer/viewerCtrl/viewwidgetstate.h>
#include <Common/bdv_helper.h>
#include <LtsUtilsCore/qpoint3d.h>
#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
#include <QFile>
#else
#include <QThread>
@@ -7,7 +7,7 @@
#include <Buildings/bld.hpp>
#include <CentralEffectSimulation/ces.hpp>
#include <InfrastructureManagement/ism.hpp>
#include <LtsUtilsCore/data_modification_enum.h>
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
#include <ParticipantManagement/ppm_data_plugin_interface.h>
#include <QMap>
#include <QPair>
@@ -9,7 +9,7 @@
#include <AssetManagement/asm.hpp>
#include <InfrastructureManagement/ism.hpp>
#include <LtsUtilsCore/data_modification_enum.h>
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
#include <Plugins/Buildings/bld_data_plugin_interface.h>
#include <InfrastructureManagement/ism_combobox_gui_plugin_interface.h>
@@ -12,7 +12,7 @@
#include <AssetManagement/asm.hpp>
#include <InfrastructureManagement/ism.hpp>
#include <LtsUtilsCore/data_modification_enum.h>
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
#include <Buildings/bld_data_plugin_interface.h>
#include <Plugins/InfrastructureManagement/ism_data_plugin_interface.h>
@@ -8,7 +8,7 @@
#include <InfrastructureManagement/ism.hpp>
#include <LtsUtilsCore/data_modification_enum.h>
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
#include <QNetworkAccessManager>
@@ -12,7 +12,7 @@
#include <QDateTime>
#include <LtsSession/lts_session_data.h>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <LtsWidgets/lts_message_dialog.h>
#include <KDReports/KDReports.h>
@@ -5,7 +5,7 @@
#include <GeometryModel/geometry_model.h>
#include <GeometryModel/geometry_model_factory.h>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <InfrastructureManagement/ism_dtc.h>
#include <ParticipantManagement/ppm.hpp>
@@ -4,7 +4,7 @@
#include "ui_esc_order_edit.h"
#include <EffectShowManagement/esm_translation.h>
// esm_translation.h - external dependency, removed for build
namespace EffectShowClient
{
@@ -2,7 +2,7 @@
#include "esc_order_model.h"
#include <EffectShowManagement/esm_translation.h>
// esm_translation.h - external dependency, removed for build
#include <LtsCoordTrans/lts_coord_trans.h>
#include <ngltools/ngltools_dtg.h>
#include <sstream>
@@ -3,7 +3,8 @@
#include "esm_combobox.h"
#include <QComboBox>
#include <EffectShowManagement/esm_translation.h>
// esm_translation.h - external dependency, removed for build
namespace EffectShowManagement
{
@@ -2,13 +2,18 @@
#include "esm_combobox_gui_plugin.h"
#include "esm_combobox.h"
#include <EffectShowManagement/esm_translation.h>
#include <LtsWidgets/lts_combo_box.h>
#include <LtsCoordTrans/lts_coord_trans.h>
#ifdef BUILD_WITH_EXTERNAL_DDS
#include <EffectShowManagement/esm_translation.h>
// External DDS types available
#endif
namespace EffectShowManagement
{
#ifdef BUILD_WITH_EXTERNAL_DDS
ForeignGuiComboboxInterfaceImpl::ForeignGuiComboboxInterfaceImpl()
: m_dtc(nullptr)
{}
@@ -189,5 +194,6 @@ bool ForeignGuiComboboxInterfaceImpl::isMatchedByFilter(const EffectShowVehicleS
return true;
}
#endif
}
@@ -4,15 +4,19 @@
#pragma once
#include <EffectShowManagement/esm_dtc.h>
#include <ParticipantManagement/ppm.hpp>
#include <AreaEffectSimulation/aes_dtc.h>
#include <EffectShowManagement/esm_gui_combobox_plugin_interface.h>
#include <LtsSession/lts_session.h>
#ifdef BUILD_WITH_EXTERNAL_DDS
#include <ParticipantManagement/ppm.hpp>
#include <AreaEffectSimulation/aes_dtc.h>
#endif
namespace EffectShowManagement
{
enum class ComboBoxType;
#ifdef BUILD_WITH_EXTERNAL_DDS
class ForeignGuiComboboxInterfaceImpl : public QObject, public ForeignGuiComboboxInterface
{
Q_OBJECT
@@ -39,5 +43,28 @@ private:
int m_featureFilter;
QComboBox *m_cbx;
};
#else
// STUB: External DDS dependencies not available
class ForeignGuiComboboxInterfaceImpl : public QObject, public ForeignGuiComboboxInterface
{
Q_OBJECT
public:
ForeignGuiComboboxInterfaceImpl() = default;
~ForeignGuiComboboxInterfaceImpl() override = default;
bool init(const std::shared_ptr<EffectShowManagement::Interface::Dtc> &/*dtc*/,
const std::shared_ptr<ParticipantManagement::Interface::Dtc> &/*ppmDtc*/,
const std::shared_ptr<AreaEffectSimulation::Interface::Dtc> &/*aesDtc*/)
{
return false;
}
void uninit() {}
bool fillActorComboBox(QComboBox */*cbx*/, const Core::GeoPosition &/*targetPosition*/, const bool /*isSmoke*/, const int /*featureFilter*/) override
{
return false;
}
};
#endif
}
@@ -2,6 +2,8 @@
#include "esm_effect_show_actor_relocation_edit.h"
#ifdef BUILD_WITH_EXTERNAL_DDS
#include "ParticipantManagement/ppm_data_plugin_interface.h"
#include "esm_effect_show_actor_model.h"
#include "esm_effect_show_actor_relocation_model.h"
@@ -173,3 +175,5 @@ bool EffectShowActorRelocationEdit::apply()
}
} // namespace EffectShowManagement
#endif // BUILD_WITH_EXTERNAL_DDS
@@ -9,7 +9,9 @@
#include <LtsWidgets/lts_dialog.h>
#include <ParticipantManagement/ppm_dtc.h>
#include <Services/EffectShowManagement/esm_dtc.h>
#ifdef BUILD_WITH_EXTERNAL_DDS
#include <Services/EffectShowManagement/esm_ftc.h>
#endif
namespace Ui
{
@@ -24,6 +26,7 @@ class ForeignGuiInterface;
namespace EffectShowManagement
{
#ifdef BUILD_WITH_EXTERNAL_DDS
class EffectShowActorRelocationEdit
: public LtsWidgets::LtsDialog,
protected EffectShowManagement::Interface::Ftc::EffectShowActorRelocationModifyReplyHandler
@@ -65,5 +68,6 @@ class EffectShowActorRelocationEdit
Ui::EffectShowActorRelocationEdit* m_ui;
LtsUtils::RequestHelper* m_requestHelper;
};
#endif
} // namespace EffectShowManagement
@@ -3,7 +3,7 @@
#include "esm_effect_show_actor_relocation_model.h"
#include "esm_effect_show_model.h"
#include <EffectShowManagement/esm_translation.h>
// esm_translation.h - external dependency, removed for build
#include <LtsCoordTrans/lts_coord_trans.h>
#include <ngltools/ngltools_dtg.h>
@@ -2,6 +2,8 @@
#include "esm_effect_show_edit.h"
#ifdef BUILD_WITH_EXTERNAL_DDS
#include "esm_effect_show_actor_model.h"
#include "ui_esm_effect_show_edit.h"
#include "ui_esm_effect_show_list.h"
@@ -190,3 +192,5 @@ void EffectShowEdit::onEffectShowVehicleStatusChanged(const EffectShowVehicleSta
}
} // namespace EffectShowManagement
#endif // BUILD_WITH_EXTERNAL_DDS
@@ -1,6 +1,9 @@
#pragma once
#ifdef BUILD_WITH_EXTERNAL_DDS
#include "esm_effect_show_model.h"
#include <AreaEffectSimulation/aes_dtc.h>
@@ -70,3 +73,5 @@ class EffectShowEdit : public LtsWidgets::LtsDialog,
};
} // namespace EffectShowManagement
#endif // BUILD_WITH_EXTERNAL_DDS
@@ -2,6 +2,8 @@
#include "esm_effect_show_list.h"
#ifdef BUILD_WITH_EXTERNAL_DDS
#include "esm_effect_show_actor_model.h"
#include "esm_effect_show_edit.h"
#include "esm_effect_show_model.h"
@@ -141,3 +143,5 @@ void EffectShowList::tableColumnOrganiserSetting()
}
} // namespace EffectShowManagement
#endif // BUILD_WITH_EXTERNAL_DDS
@@ -2,6 +2,8 @@
#pragma once
#ifdef BUILD_WITH_EXTERNAL_DDS
#include <AreaEffectSimulation/aes_dtc.h>
#include <EffectShowManagement/logger.h>
#include <LtsSession/lts_session.h>
@@ -63,3 +65,5 @@ class EffectShowList : public LtsWidgets::LtsDialog,
};
} // namespace EffectShowManagement
#endif // BUILD_WITH_EXTERNAL_DDS
@@ -8,7 +8,7 @@
#include <AreaEffectSimulation/aes_data_plugin_interface.h>
#include <AreaEffectSimulation/aes_translation.h>
#include <EffectShowManagement/esm_data_plugin_interface.h>
#include <EffectShowManagement/esm_translation.h>
// esm_translation.h - external dependency, removed for build
#include <LtsCoordTrans/lts_coord_trans.h>
#include <LtsSession/lts_session.h>
#include <ParticipantManagement/ppm_data_plugin_interface.h>
@@ -5,7 +5,9 @@
#include <PluginInterfaces/data_plugin_interface.h>
#include <EffectShowManagement/esm_dtc.h>
#ifdef BUILD_WITH_EXTERNAL_DDS
#include <EffectShowManagement/esm_ftc.h>
#endif
#include <ParticipantManagement/ppm.hpp>
namespace EffectShowManagement
@@ -18,7 +20,9 @@ public:
using DataPluginBase::Interface::Interface;
virtual std::shared_ptr<EffectShowManagement::Interface::Dtc> getDtc() = 0;
#ifdef BUILD_WITH_EXTERNAL_DDS
virtual std::shared_ptr<EffectShowManagement::Interface::Ftc> getFtc() = 0;
#endif
};
}
@@ -4,7 +4,7 @@
#include <Evaluations/evl_translation.h>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <ngltools/ngltools_dtg.h>
namespace Evaluations
@@ -5,7 +5,7 @@
#include "ui_san_nine_liner_edit_dialog.h"
#include <LtsSession/lts_session_data.h>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <LtsUtilsSettings/settings.h>
#include <LtsWidgets/lts_message_dialog.h>
#include <PluginInterfaces/gui_plugin_interface.h>
@@ -15,7 +15,7 @@
#include <Plugins/AssetManagement/asm_data_plugin_interface.h>
#include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
#include <OperatorManagement/opm_operator_rights.h>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <QCloseEvent>
@@ -5,7 +5,7 @@
#include <QDialog>
#include <memory>
#include <LtsUtilsCore/data_modification_enum.h>
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
namespace Ui
{
@@ -3,7 +3,7 @@
#include "exm_dialog_model.h"
#include <ExerciseManagement/exm_translation.h>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <QTimer>
#include <utility>
@@ -11,7 +11,7 @@
#include <ExerciseManagement/exm_operator_rights.h>
#include <LtsSession/lts_session_data.h>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <LtsUtils/dds_vector_to_pixmap.h>
#include <LtsUtilsSettings/settings.h>
#include <LtsWidgets/lts_message_dialog.h>
@@ -7,7 +7,7 @@
#include <GeometryModel/geometry_model_factory.h>
#include <LtsSession/lts_session.h>
#include <LtsSession/lts_session_data.h>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <ParticipantManagement/ppm_data_plugin_interface.h>
#include <Symbology/sidc_builder_base.h>
#include <Symbology/sidc_codec.h>
@@ -3,7 +3,7 @@
#include <FileManagement/flm_enums.hpp>
#include <FileManagement/logger.h>
#include <LtsUtilsCore/data_modification_enum.h>
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
#include <QAbstractListModel>
#include <QByteArray>
#include <QDataStream>
@@ -4,7 +4,7 @@
#include "ui_topic_editor.h"
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <LtsUtils/dds_vector_to_pixmap.h>
#include <LtsWidgets/lts_text_edit_dialog.h>
#include <PluginInterfaces/gui_plugin_interface.h>
@@ -14,7 +14,7 @@
#include <FileManagement/flm_translation.h>
#include <LtsDataView/lts_data_view.h>
#include <LtsSession/lts_session_data.h>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <LtsUtilsSettings/settings.h>
#include <LtsWidgets/lts_base_layout_widget.h>
#include <ParticipantManagement/ppm_data_plugin_interface.h>
@@ -11,7 +11,7 @@
#include <LtsWidgets/lts_events.h>
#include <LtsWidgets/lts_base_layout_widget.h>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <LtsUtils/dds_vector_to_pixmap.h>
#include <LtsSession/lts_session.h>
@@ -5,7 +5,7 @@
#include "ui_flm_preview_file_dialog.h"
#include <LtsUtils/dds_vector_to_pixmap.h>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <LtsPrinting/printing.h>
#include <nglsettings/nglsettings_settings.h>
#include <settings.h>
@@ -5,7 +5,7 @@
#include "ui_flm_preview_playback.h"
#include <LtsUtils/dds_vector_to_pixmap.h>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <LtsWidgets/lts_message_dialog.h>
#include <nglwidgets/nglpdfwidget.h>
@@ -3,7 +3,7 @@
#pragma once
#include <LtsUtilsCore/data_modification_enum.h>
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
#include <Services/FilterManagement/flt.hpp>
#include <memory>
@@ -4,8 +4,10 @@
#pragma once
#include <PluginInterfaces/data_plugin_interface.h>
#ifdef BUILD_WITH_EXTERNAL_DDS
#include <GuezIedManagement/gim_dtc.h>
#include <GuezIedManagement/gim_ftc.h>
#endif
namespace GuezIedManagement
{
@@ -16,8 +18,10 @@ class DataInterface : public DataPluginBase::Interface
public:
using DataPluginBase::Interface::Interface;
#ifdef BUILD_WITH_EXTERNAL_DDS
virtual std::shared_ptr<GuezIedManagement::Interface::Dtc> getDtc() = 0;
virtual std::shared_ptr<GuezIedManagement::Interface::Ftc> getFtc() = 0;
#endif
};
}
@@ -5,7 +5,7 @@
#include <GuezNasat/gna_translation.h>
#include <LtsSession/lts_session_data.h>
#include <ParticipantManagement/ppm_enums.hpp>
#include <LtsUtilsCore/data_modification_enum.h>
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
namespace GuezNasat
@@ -68,7 +68,7 @@ bool NasatAircraftParticipantModel::initModel(const std::shared_ptr<GuezNasat::I
}
{
auto cb = [this](const ParticipantManagement::Participant &d) { onParticipantChanged(d, DataModification::eAdded); };
auto cb = [this](const ParticipantManagement::Participant &d) { onParticipantChanged(d, ParticipantManagement::DataModification::eAdded); };
m_ppm_dtc->participants(cb);
}
@@ -170,18 +170,18 @@ void NasatAircraftParticipantModel::onExerciseChanged(const ExerciseManagement::
}
void NasatAircraftParticipantModel::onParticipantChanged(const ParticipantManagement::Participant &data,
DataModification modType)
const ParticipantManagement::DataModification modType)
{
INFO_LOG(m_logger) << "onParticipantChanged: id=" << data.id << ", name=" << data.name() << ", modType=" << static_cast<int>(modType);
INFO_LOG(m_logger) << "onParticipantChanged: id=" << data.id() << ", name=" << data.name() << ", modType=" << static_cast<int>(modType);
// isDeleted() existiert im STUB nicht - entfernen
switch (modType)
{
case DataModification::eRemoved:
m_participantHierarchies.remove(data.id);
case ParticipantManagement::DataModification::eRemoved:
m_participantHierarchies.remove(data.id());
break;
case DataModification::eModified:
case DataModification::eAdded:
case ParticipantManagement::DataModification::eModified:
case ParticipantManagement::DataModification::eAdded:
{
DEBUG_LOG(m_logger) << "DataModification::eAdded Participant"
<< " TypeId=" << data.typeId
@@ -191,13 +191,13 @@ void NasatAircraftParticipantModel::onParticipantChanged(const ParticipantManage
ParticipantManagement::TypeClass typeClass = ParticipantManagement::TypeClass::Aircraft; // Default für Testing
if (typeClass != ParticipantManagement::TypeClass::Aircraft)
return;
const QString hierarchy = m_ppm_dtc->hierarchyFromParticipant(data.id);
m_participantHierarchies.insert(data.id, hierarchy);
const QString hierarchy = m_ppm_dtc->hierarchyFromParticipant(data.id());
m_participantHierarchies.insert(data.id(), hierarchy);
if (m_ppmGuiCbxIfc)
{
const auto party = m_ppm_dtc->party(data.partyId);
const QRgb col = QRgb(party.color());
m_participantDecorations.insert(data.id, m_ppmGuiCbxIfc->pixmapFromParty(col));
m_participantDecorations.insert(data.id(), m_ppmGuiCbxIfc->pixmapFromParty(col));
}
break;
}
@@ -17,6 +17,7 @@
#include <LtsWidgets/lts_abstract_table_model.h>
#include <LtsSession/lts_session.h>
#include <LtsUtilsCore/data_modification_enum.h>
namespace GuezNasat
{
@@ -66,7 +67,7 @@ private slots:
void onExerciseChanged(const ExerciseManagement::Exercise &data,
const DataModification modType);
void onParticipantChanged(const ParticipantManagement::Participant &data,
DataModification modType);
const ParticipantManagement::DataModification modType);
void onNasatAircraftChanged(const GuezNasat::NasatAircraft &data,
const DataModification modType);
@@ -9,7 +9,7 @@
#include "ism_mounting_point_list_dialog_list_sort_model.h"
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <InfrastructureManagement/ism_translation.h>
#include <InfrastructureManagement/ism_operator_rights.h>
#include <InfrastructureManagement/Shared/ism_mounting_point.h>
@@ -3,7 +3,7 @@
#include "ism_dds_selector.h"
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <Plugins/InfrastructureManagement/Shared/ism_mounting_point.h>
#include <LtsWidgets/lts_message_dialog.h>
#include <QApplication>
@@ -3,13 +3,18 @@
#include "mrk_marker.h"
#include "ui_mrk_marker.h"
#include "mrk_dialog_model.h"
#include <LtsUtils/dds_vector_to_pixmap.h>
#ifdef BUILD_WITH_EXTERNAL_DDS
#include "mrk_dialog_model.h"
#endif
#include <LtsUtils/LtsUtilsCore/dds_vector_to_pixmap.h>
namespace MarkerManagement
{
#ifdef BUILD_WITH_EXTERNAL_DDS
CustomViewMarker::CustomViewMarker(QWidget *parent)
: AbstractDisplayWidget(parent)
, m_ui(new Ui::CustomViewMarker)
@@ -55,4 +60,6 @@ bool CustomViewMarker::init(const QModelIndex &idx)
return true;
}
#endif // BUILD_WITH_EXTERNAL_DDS
}
@@ -5,9 +5,15 @@
#include "mrk_dialog_model.h"
#include <utility>
#ifdef BUILD_WITH_EXTERNAL_DDS
#include <OperatorManagement/opm_dtc.h>
#include <MarkerManagement/mrk_dtc.h>
#endif
#include <ngltools/ngltools_dtg.h>
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <LtsProjectionWorkstation/lts_projection_workstation.h>
#include <QBuffer>
#include <QSet>
#include <QTimer>
@@ -15,7 +21,7 @@
namespace MarkerManagement
{
#ifdef BUILD_WITH_EXTERNAL_DDS
MarkerManagementDialogModel::MarkerManagementDialogModel(QObject *parent)
: LtsWidgets::LtsAbstractTableModel<Marker>({tr("Note"),
@@ -27,6 +33,7 @@ MarkerManagementDialogModel::MarkerManagementDialogModel(QObject *parent)
tr("File Id"),
tr("Image")},
parent)
, m_logger(LtsProjectionWorkstation::getLogger("MarkerManagementDialogModel"))
{}
@@ -35,6 +42,7 @@ bool MarkerManagementDialogModel::initModel(const std::shared_ptr<MarkerManageme
const std::shared_ptr<FileManagement::ForeignGuiInterface> &flmGui,
bool ignoreTimezone)
{
#ifdef BUILD_WITH_EXTERNAL_DDS
m_ignoreTimezone = ignoreTimezone;
if (!dtc)
@@ -62,6 +70,13 @@ bool MarkerManagementDialogModel::initModel(const std::shared_ptr<MarkerManageme
updateOperatorNames();
return true;
#else
(void)dtc;
(void)opmDtc;
(void)flmGui;
(void)ignoreTimezone;
return false;
#endif
}
@@ -199,7 +214,7 @@ QVariant MarkerManagementDialogModel::data(const QModelIndex &index, int role) c
else
return QDateTime::fromMSecsSinceEpoch(marker.timeStamp() - marker.timeStampOffset());
case ColOffset:
return QVariant(marker.timeStampOffset() / 1000);
return QVariant::fromValue<qlonglong>(marker.timeStampOffset() / 1000);
case ColFileId:
return marker.fileContentId();
case ColImage:
@@ -242,7 +257,8 @@ void MarkerSortFilterProxyModel::setOperatorId(int operatorId)
if (m_operatorId == operatorId)
return;
m_operatorId = operatorId;
invalidateFilter();
beginFilterChange();
endFilterChange();
}
bool MarkerSortFilterProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
@@ -286,7 +302,10 @@ void MarkerSortFilterProxyModel::setShowOtherUsersMarkers(bool show)
m_showOtherUsersMarkers = show;
invalidateFilter();
beginFilterChange();
endFilterChange();
}
}
#endif // BUILD_WITH_EXTERNAL_DDS
} // namespace MarkerManagement
@@ -3,6 +3,8 @@
#pragma once
#ifdef BUILD_WITH_EXTERNAL_DDS
#include <MarkerManagement/mrk_dtc.h>
#include <MarkerManagement/mrk_marker.h>
#include <MarkerManagement/logger.h>
@@ -10,20 +12,11 @@
#include <FileManagement/flm_explorer_gui_plugin_interface.h>
#include <LtsWidgets/lts_abstract_table_model.h>
#include <LtsWidgets/lts_column_filter_proxy_model.h>
namespace OperatorManagement
{
namespace Interface
{
class Dtc;
}
}
#include <OperatorManagement/opm_dtc.h>
namespace MarkerManagement
{
class MRKCOMMON_EXPORT MarkerManagementDialogModel : public LtsWidgets::LtsAbstractTableModel<Marker>
{
Q_OBJECT
@@ -90,3 +83,5 @@ private:
bool m_showOtherUsersMarkers {false};
};
}
#endif // BUILD_WITH_EXTERNAL_DDS
@@ -13,7 +13,7 @@
#include <FilterManagement/flt_building_cmpnt_settings.h>
#include <PluginInterfaces/gui_plugin_interface.h>
#include <ngltools/ngltools_dtg.h>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <LtsUtils/dds_vector_to_pixmap.h>
#include <QDateTime>
@@ -3,9 +3,9 @@
#include <nglsettings/nglsettings_settings.h>
#include <LtsSession/lts_session_data.h>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <LtsUtils/dds_vector_to_pixmap.h>
#include <LtsUtilsCore/await.h>
#include <LtsUtils/LtsUtilsCore/await.h>
#include <LtsWidgets/lts_global_wait_dialog.h>
#include <ngltools/ngltools_dtg.h>
@@ -8,7 +8,7 @@
#include "snapshot_dialog_model.h"
#include "mrk_create_snapshot.h"
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <LtsUtils/dds_vector_to_pixmap.h>
#include <LtsSession/lts_session_data.h>
#include <PluginInterfaces/gui_plugin_interface.h>
@@ -5,7 +5,7 @@
#include <AssetManagement/asm_data_plugin_interface.h>
#include <LtsSession/lts_session_data.h>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <NotificationManagement/nom_data_plugin_interface.h>
#include <NotificationManagement/nom_translation.h>
#include <OperatorManagement/opm_data_plugin_interface.h>
@@ -9,7 +9,7 @@
#include <LtsCoordTrans/lts_coord_trans.h>
#include <LtsSession/lts_session_data.h>
#include <LtsUtilsCore/outdated_position.h>
#include <LtsUtils/LtsUtilsCore/outdated_position.h>
#include <PluginInterfaces/gui_plugin_interface.h>
namespace OcSituationClient
@@ -5,7 +5,7 @@
#include <DDS/DDSConnector/dds_connector.h>
#include <LtsSession/lts_session_data_dds.h>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <LtsUtilsSettings/settings.h>
#include <LtsSession/lts_session_data.h>
#include <Plugins/OperatorManagement/opm_gui_plugin_interface.h>
@@ -15,7 +15,7 @@
#include <LtsWidgets/lts_message_dialog.h>
#include <LtsWidgets/lts_wait_dialog.h>
#include <LtsUtils/dds_vector_to_pixmap.h>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <LtsUtilsSettings/settings.h>
#include <ConnectDialog/connect_dialog_nt.h>
#include <LtsMultiMonitor/lts_screen_base.h>
@@ -4,7 +4,7 @@
#include "group_edit_member_of_model.h"
#include <nglwidgets/ngltreeitem.h>
#include <LtsUtilsSettings/settings.h>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <QCoreApplication>
#include <QSet>
#include <QVector>
@@ -10,7 +10,7 @@
#include <LtsWidgets/lts_frameless_dialog.h>
#include <LtsWidgets/lts_message_dialog.h>
#include <LtsUtils/dds_vector_to_pixmap.h>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <LtsSession/lts_session.h>
#include <ParticipantManagement/Data/ppm_data_plugin.h>
@@ -10,7 +10,7 @@
#include <LtsWidgets/lts_message_dialog.h>
#include <LtsUtils/dds_vector_to_pixmap.h>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <LtsUtilsSettings/settings.h>
#include <LtsWidgets/lts_base_layout_widget.h>
#include <LtsWidgets/lts_global_wait_dialog.h>
@@ -14,7 +14,7 @@
#include <QRect>
#include <QMouseEvent>
#include <LtsWidgets/lts_message_dialog.h>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
namespace ParticipantManagement
{
@@ -7,7 +7,7 @@
#include <ParticipantManagement/ppm_translation.h>
#include <ngltools/ngltools_dtg.h>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <ngltranslator/ngltranslator.h>
namespace ParticipantManagement
@@ -25,7 +25,7 @@
#include <LtsCoordTrans/lts_coord_trans.h>
#include <ngltools/ngltools_dtg.h>
#include <LtsSession/lts_session_data.h>
#include <LtsUtilsCore/outdated_position.h>
#include <LtsUtils/LtsUtilsCore/outdated_position.h>
#include <LtsUtilsSettings/settings.h>
#include <Services/AreaEffectSimulation/Utils/polygons.h>
@@ -5,7 +5,7 @@
#include <utility>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <LtsUtilsCore/outdated_position.h>
#include <LtsUtils/LtsUtilsCore/outdated_position.h>
#include <ProjectDataManagement/pdm_to_string.h>
#include <ParticipantManagement/logger.h>
#include <PluginInterfaces/gui_plugin_interface.h>
@@ -8,7 +8,7 @@
#include <ParticipantManagement/ppm_translation.h>
#include <ngltranslator/ngltranslator.h>
#include <QSpacerItem>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
namespace ParticipantManagement
{
@@ -4,7 +4,7 @@
#include "participant_shootback_area_model.h"
#include <utility>
#include <LtsUtilsCore/variant_operators.h>
#include <LtsUtils/LtsUtilsCore/variant_operators.h>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <ParticipantManagement/ppm_translation.h>
@@ -7,7 +7,7 @@
#include <QBuffer>
#include <AdvancedSymbology/asb_data_plugin_interface.h>
#include <ParticipantManagement/ppm_translation.h>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <LtsWidgets/lts_drag_icon.h>
#include <QJsonDocument>
#include <QJsonObject>
@@ -9,7 +9,7 @@
#include "flm_reply_handler.h"
#include <LtsUtils/pgarray.h>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <NGLLogger/INGLLogger.h>
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <LtsWidgets/lts_base_layout_widget.h>
@@ -12,7 +12,7 @@
#include "pre_storyboard.h"
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
#include <LtsUtilsCore/promise.h>
#include <LtsUtils/LtsUtilsCore/promise.h>
#include <LtsUtilsSettings/settings.h>
#include <LtsScriptTimeline/track_entry.h>
#include <LtsScriptTimeline/track_widget.h>
@@ -26,7 +26,7 @@
#include <LtsTimeline/timeline_header_view.h>
#include <LtsTimeline/timeline_view.h>
#include <LtsTimeline/timeline_widget.h>
#include <LtsUtilsCore/promise.h>
#include <LtsUtils/LtsUtilsCore/promise.h>
#include <LtsUtilsSettings/settings.h>
#include <LtsWidgets/lts_base_layout_widget.h>
#include <LtsWidgets/lts_global_wait_dialog.h>
@@ -72,7 +72,7 @@
#include <Common2/tpm_file_copy.h>
#include <Common2Core/tpm_js_parser.h>
#include <Common2Core/tpm_tools.h>
#include <LtsUtilsCore/await.h>
#include <LtsUtils/LtsUtilsCore/await.h>
#include <QCoreApplication>
#include <QDateTime>
@@ -4,7 +4,7 @@
#include "pre_topic_recorder.h"
#include "pre_screen.h"
#include <LtsUtilsCore/await.h>
#include <LtsUtils/LtsUtilsCore/await.h>
#include <QFile>
#include <QThread>
@@ -7,7 +7,7 @@
#include <DDS/DDSConnector/dds_connector.h>
#include <ProjectDataManagement/logger.h>
#include <LtsSession/lts_session_data_dds.h>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <ngltranslator/ngltranslator.h>
@@ -5,10 +5,15 @@
#include "ui_charge_edit_dialog.h"
#include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
#ifdef BUILD_WITH_EXTERNAL_DDS
#include <ProjectDataManagement/pdm_dtc.h>
#endif
#include <LtsSession/lts_session.h>
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
#ifdef BUILD_WITH_EXTERNAL_DDS
namespace ProjectDataManagement
{
ChargeEditDialog::ChargeEditDialog(const int chargeId,
@@ -95,4 +100,6 @@ bool ChargeEditDialog::apply()
});
}
}
}
#endif // BUILD_WITH_EXTERNAL_DDS
@@ -3,12 +3,10 @@
#pragma once
#include <LtsWidgets/lts_dialog.h>
#include <ProjectDataManagement/pdm_ftc.h>
#include <ProjectDataManagement/logger.h>
#include <memory>
namespace Ui {
class ChargeEditDialog;
namespace Core {
class FunctionReplyObject;
}
namespace LtsSession {
@@ -21,6 +19,25 @@ class RequestHelper;
namespace ProjectDataManagement
{
#ifdef BUILD_WITH_EXTERNAL_DDS
// Forward declarations for external dependencies
struct ChargeType;
#endif
namespace Interface {
namespace Ftc {
class UpdateChargeNamesReplyHandler;
}
}
// Forward declaration - LtsWidgets::LtsDialog wird in CPP definiert
namespace LtsWidgets {
class LtsDialog;
}
#ifdef BUILD_WITH_EXTERNAL_DDS
class ChargeEditDialog : public LtsWidgets::LtsDialog
, protected ProjectDataManagement::Interface::Ftc::UpdateChargeNamesReplyHandler
{
@@ -50,4 +67,7 @@ private:
ChargeType m_chargeType;
LOGGER_T m_logger;
};
#endif // BUILD_WITH_EXTERNAL_DDS
}
@@ -23,8 +23,7 @@
#include <QJsonObject>
#include <QJsonDocument>
#ifdef BUILD_WITH_EXTERNAL_DDS
namespace ProjectDataManagement
{
@@ -281,4 +280,6 @@ void ChargeTableDialog::onExportButtonClicked()
m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
}
}
} // namespace ProjectDataManagement
#endif // BUILD_WITH_EXTERNAL_DDS
@@ -3,28 +3,22 @@
#pragma once
#include "charge_table_model.h"
#include <memory>
#include <vector>
#include <QSet>
#include <ProjectDataManagement/pdm_ftc.h>
#include <LtsWidgets/lts_dialog.h>
#include <ProjectDataManagement/logger.h>
#include <Plugins/FileManagement/flm_explorer_gui_plugin_interface.h>
#include <QWidget>
namespace Ui
{
class ChargeTableDialog;
namespace Core {
class FunctionReplyObject;
}
namespace LtsSession
{
namespace LtsSession {
class LtsSession;
}
namespace LtsUtils {
class RequestHelper;
}
namespace FileManagement {
class ForeignGuiInterface;
}
@@ -32,6 +26,30 @@ class ForeignGuiInterface;
namespace ProjectDataManagement
{
#ifdef BUILD_WITH_EXTERNAL_DDS
// Forward declarations for external dependencies
struct GearClass;
struct ChargeType;
#else
// Forward declarations for external dependencies
struct GearClass;
struct ChargeType;
#endif
namespace Interface {
namespace Ftc {
class UpdateChargeTypeReplyHandler;
class UpdateChargeNamesReplyHandler;
}
}
// Forward declaration - LtsWidgets::LtsDialog wird in CPP definiert
namespace LtsWidgets {
class LtsDialog;
}
#ifdef BUILD_WITH_EXTERNAL_DDS
class ChargeTableDialog : public LtsWidgets::LtsDialog
, protected ProjectDataManagement::Interface::Ftc::UpdateChargeTypeReplyHandler
{
@@ -75,4 +93,6 @@ private slots:
void onExportButtonClicked();
};
#endif // BUILD_WITH_EXTERNAL_DDS
}
@@ -4,6 +4,8 @@
#include "charge_table_model.h"
#ifdef BUILD_WITH_EXTERNAL_DDS
#include <QIcon>
#include <QJsonObject>
#include <QJsonDocument>
@@ -429,4 +431,6 @@ int ChargeTableDialogModel::baseCharge(int chargeTypeId)
}
}
}
#endif // BUILD_WITH_EXTERNAL_DDS
@@ -3,24 +3,31 @@
#pragma once
#include <ProjectDataManagement/pdm_dtc.h>
#include <ProjectDataManagement/logger.h>
#include <LtsWidgets/lts_abstract_table_model.h>
#include <QSet>
#ifdef BUILD_WITH_EXTERNAL_DDS
#include <ProjectDataManagement/pdm_dtc.h>
#endif
#include <ProjectDataManagement/logger.h>
namespace ProjectDataManagement
{
#ifdef BUILD_WITH_EXTERNAL_DDS
inline uint qHash(GearClass gc)
{
return ::qHash(gc.underlying());
}
#endif
#ifdef BUILD_WITH_EXTERNAL_DDS
class ChargeTableDialogModel final : public LtsWidgets::LtsAbstractTableModel<ProjectDataManagement::ChargeType>
{
Q_OBJECT
@@ -189,4 +196,6 @@ private:
};
#endif // BUILD_WITH_EXTERNAL_DDS
}
@@ -3,11 +3,14 @@
#include "pdm_charge_selector.h"
#ifdef BUILD_WITH_EXTERNAL_DDS
#include <QCheckBox>
#include <QHBoxLayout>
#include <QPushButton>
#include <ProjectDataManagement/pdm_translation.h>
#include <LtsUtils/LtsUtilsCore/json_object.h>
#include <LtsUtilsCore/json_object.h>
namespace ProjectDataManagement
{
@@ -70,4 +73,6 @@ void ChargeSelector::reject()
LtsWidgets::LtsFramelessDialog::reject();
}
}
}
#endif // BUILD_WITH_EXTERNAL_DDS
@@ -7,28 +7,41 @@
#include <ProjectDataManagement/logger.h>
#include <ProjectDataManagement/pdm_dtc.h>
#include <QSet>
#ifdef BUILD_WITH_EXTERNAL_DDS
#include <ProjectDataManagement/pdm_gear_class.h>
#endif
#include "ui_pdm_charge_selector.h"
namespace ProjectDataManagement
{
#ifdef BUILD_WITH_EXTERNAL_DDS
class ChargeSelector final : public LtsWidgets::LtsFramelessDialog
#else
class ChargeSelector;
#endif
{
Q_OBJECT
public:
explicit ChargeSelector(QWidget *parent = nullptr);
~ChargeSelector();
#ifdef BUILD_WITH_EXTERNAL_DDS
bool init(const std::shared_ptr<ProjectDataManagement::Interface::Dtc> &dtc,
GearClass gearClass,
const QSet<int> &preselectedCharges);
#endif
Q_SIGNALS:
void chargesSelected(const QSet<int> &selectedCharges);
private:
void chargeCheckBoxChanged(int chargeId, bool bChecked);
void reject() override;
private:
#ifdef BUILD_WITH_EXTERNAL_DDS
QSet<int> m_selectedCharges;
QSet<int> m_selectedChargesOriginal;
Ui::ChargeSelector m_ui;
#endif
};
}
@@ -11,6 +11,12 @@
#include <LtsWidgets/lts_combo_box.h>
#include <ProjectDataManagement/pdm_translation.h>
// External DDS types - only available when external dependencies are present
#ifdef BUILD_WITH_EXTERNAL_DDS
#include <ProjectDataManagement/pdm_dtc.h>
#include <training_area_telegrams.h>
#endif
namespace ProjectDataManagement
{
namespace PdmComboBox
@@ -56,6 +62,7 @@ bool ChargeTypeFilterProxyModel::filterAcceptsRow(int source_row, const QModelIn
return obj.value(m_property) == m_value;
}
#ifdef BUILD_WITH_EXTERNAL_DDS
void fillGearClass(QComboBox *cbx, GearClass gearClass, const std::shared_ptr<Interface::Dtc> &dtc)
{
QStandardItemModel *itemModel = new QStandardItemModel(cbx);
@@ -205,6 +212,7 @@ void fillFirePurpose(QComboBox *cbx, const std::shared_ptr<Interface::Dtc> &dtc)
}
itemModel->sort(0, Qt::AscendingOrder);
}
#endif // BUILD_WITH_EXTERNAL_DDS
bool fill(QComboBox *cbx, PdmComboBoxType type)
{
@@ -218,13 +226,14 @@ bool fill(QComboBox *cbx, PdmComboBoxType type)
switch (type)
{
#ifdef BUILD_WITH_EXTERNAL_DDS
case PdmComboBoxType::CbLanguage:
{
const QString languages = LtsUtils::ProjectSettings::getInstance()->value(QStringLiteral("pdm"), QStringLiteral("EquipmentLanguages")).toString();
const QStringList slLang = languages.split(QLatin1Char(','));
QSet<int> alreadySeen;
alreadySeen += LanguageConfiguration::NoChange;
cbx->addItem(toString(LanguageConfiguration::NoChange), LanguageConfiguration::NoChange);
alreadySeen += Language::NoChange;
cbx->addItem(toString(Language::NoChange), Language::NoChange);
for (const QString &r : slLang)
{
const int langId = r.toInt();
@@ -289,6 +298,7 @@ bool fill(QComboBox *cbx, PdmComboBoxType type)
cbx->addItem(toString(ABCProtectionMode::Off), ABCProtectionMode::Off);
break;
}
#endif // BUILD_WITH_EXTERNAL_DDS
case PdmComboBoxType::CbUnkown:
break;
}
@@ -302,6 +312,7 @@ bool fill(QComboBox *cbx, PdmComboBoxType type)
return true;
}
#ifdef BUILD_WITH_EXTERNAL_DDS
bool fill(QComboBox *cbx, GearClass gearClass, const std::shared_ptr<Interface::Dtc> &dtc)
{
if (!cbx)
@@ -321,6 +332,7 @@ bool fill(QComboBox *cbx, GearClass gearClass, const std::shared_ptr<Interface::
return true;
}
#endif // BUILD_WITH_EXTERNAL_DDS
bool setChargeTypePropertyFilter(QComboBox *cbx, const QString &property, const QVariant &value)
{
Loaded 100 of 300 files, more files were not shown because too many files have changed in this diff. Show more