WIP: Build fixes und EXTERNAL_DEPENDENCIES.md
This commit is contained in:
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
|
||||
)
|
||||
|
||||
#
|
||||
|
||||
+8
-4
@@ -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
|
||||
+73
@@ -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
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include <QGraphicsScene>
|
||||
#include <QPen>
|
||||
|
||||
#include <Viewer/SituationMap/SymbologyXML/primitive.h>
|
||||
#include <SymbologyXML/primitive.h>
|
||||
|
||||
class QGraphicsItem;
|
||||
class QGraphicsRectItem;
|
||||
|
||||
+6
-6
@@ -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
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
+1
-1
@@ -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>
|
||||
|
||||
|
||||
+1
-1
@@ -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>
|
||||
|
||||
+1
-1
@@ -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>
|
||||
|
||||
+1
-1
@@ -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>
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user