torstenandCopilot
7173785915
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
99 lines
4.1 KiB
C++
99 lines
4.1 KiB
C++
/**
|
|
* Plugin Artillery Sound
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Gerlinde Rudolphus, SLTE, 2016-04-14
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "handler_artillerie_sound.h"
|
|
|
|
|
|
#include <DDS/DDSConnector/dds_connector.h>
|
|
#include <CentralEffectSimulation/ces_plugin_interface.h>
|
|
#include <CentralEffectSimulation/ces_plugin_interface.h>
|
|
#include <CentralEffectSimulation/dds_handler.h>
|
|
#include <CentralEffectSimulation/handler_building_data.h>
|
|
#include <CentralEffectSimulation/main_handler.h>
|
|
|
|
#include <QObject>
|
|
|
|
|
|
namespace CesArtillerySound
|
|
{
|
|
|
|
// 29.11.2024, Norbert Thoden:
|
|
// a) das PluginHandling wurde vereinfacht, sprich 'nur' mainHandler übergeben statt explizit ddsHandler, dbhandler etc
|
|
// b) Loggder überarbeiten (logger{h,cpp} und ces_export.h entsorgen
|
|
// c) Bereinigung des Namensschema: CentralEffectSimulation2DPlugin -> CentralEffectSimulationArtillerySoundPlugin
|
|
|
|
class CentralEffectSimulationArtillerySoundPlugin : public QObject, public CentralEffectSimulation::Plugin::Plugin
|
|
{
|
|
Q_OBJECT
|
|
Q_PLUGIN_METADATA(IID "special:3:ces.CentralEffectSimulationArtillerySoundPlugin")
|
|
Q_INTERFACES(CentralEffectSimulation::Plugin::Plugin)
|
|
|
|
public:
|
|
CentralEffectSimulationArtillerySoundPlugin() = default;
|
|
~CentralEffectSimulationArtillerySoundPlugin() = default;
|
|
std::shared_ptr<CentralEffectSimulation::Plugin::Interface> createInterface(CentralEffectSimulation::Plugin::DataProvider *pdp,
|
|
const std::shared_ptr<DDSConnector::DdsConnector> &dDSConnector,
|
|
NGL::Settings *settings,
|
|
CentralEffectSimulation::MainHandler *mainHandler) override;
|
|
|
|
};
|
|
|
|
//class CentralEffectSimulation2DPlugin : public QObject, public CentralEffectSimulation::Plugin::Plugin
|
|
//{
|
|
// Q_OBJECT
|
|
// Q_PLUGIN_METADATA(IID "special:3:ces.CentralEffectSimulation2DPlugin")
|
|
// Q_INTERFACES(CentralEffectSimulation::Plugin::Plugin)
|
|
|
|
//public:
|
|
// CentralEffectSimulation2DPlugin() = default;
|
|
// ~CentralEffectSimulation2DPlugin() = default;
|
|
// std::shared_ptr<CentralEffectSimulation::Plugin::Interface> createInterface(CentralEffectSimulation::Plugin::DataProvider *pdp,
|
|
// const std::shared_ptr<DDSConnector::DdsConnector> &dDSConnector,
|
|
// NGL::Settings *settings,
|
|
// CentralEffectSimulation::MainHandler *mainHandler) override;
|
|
//};
|
|
|
|
|
|
class CesArtillerySoundInterfaceImpl final : public CentralEffectSimulation::Plugin::Interface
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
CesArtillerySoundInterfaceImpl(CentralEffectSimulation::Plugin::DataProvider *pdp,
|
|
const std::shared_ptr<DDSConnector::DdsConnector> &dDSConnector,
|
|
NGL::Settings *settings,
|
|
CentralEffectSimulation::MainHandler *mainHandler);
|
|
~CesArtillerySoundInterfaceImpl();
|
|
//bool init();
|
|
const char *name() const override { return "CentralEffectSimulation2D"; }
|
|
QString echo(const QString &/*message*/) override { return QString();}
|
|
|
|
private Q_SLOTS:
|
|
bool init(int domainId, int exerciseId) override;
|
|
private:
|
|
|
|
private:
|
|
CentralEffectSimulation::Plugin::DataProvider *m_pdp;
|
|
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
|
|
|
|
std::shared_ptr<CentralEffectSimulation::DdsHandler> m_ddsHandler;
|
|
std::shared_ptr<CentralEffectSimulation::DatabaseInterface> m_db;
|
|
std::shared_ptr<CentralEffectSimulation::HandlerBuildingData> m_handlerBuildingData; ///< Pointer to AES Building handler
|
|
std::shared_ptr<CentralEffectSimulation::HandlerParticipant> m_handlerParticipant; ///< Pointer to handler for all participants
|
|
std::shared_ptr<HandlerArtillerieSound> m_handlerArtillerieSound; /// < Pointer to handler for Artillerie Sound
|
|
|
|
|
|
|
|
NGL::INGLLogger &m_logger;
|
|
int m_domainId = 0;
|
|
int m_exerciseId = 0;
|
|
};
|
|
|
|
} // namespace CesArtillerySound
|