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>
86 lines
3.8 KiB
C++
86 lines
3.8 KiB
C++
/**
|
|
* Handle Artillery Sound
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Gerlinde Rudolphus, SLTE, 2016-04-14
|
|
*/
|
|
|
|
#include "plugin.h"
|
|
#include "settings.h"
|
|
#include <NGLLogger/NGLLoggerBootstrap.h>
|
|
#include <ngldb/db_service_handler.h>
|
|
|
|
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
|
|
|
|
std::shared_ptr<CentralEffectSimulation::Plugin::Interface> CentralEffectSimulationArtillerySoundPlugin::createInterface(CentralEffectSimulation::Plugin::DataProvider *pdp,
|
|
const std::shared_ptr<DDSConnector::DdsConnector> &dDSConnector,
|
|
NGL::Settings *settings,
|
|
CentralEffectSimulation::MainHandler *mainHandler)
|
|
{
|
|
return std::make_shared<CesArtillerySoundInterfaceImpl>(pdp, dDSConnector, settings, mainHandler);
|
|
}
|
|
|
|
//std::shared_ptr<CentralEffectSimulation::Plugin::Interface> CentralEffectSimulation2DPlugin::createInterface(CentralEffectSimulation::Plugin::DataProvider *pdp,
|
|
// const std::shared_ptr<DDSConnector::DdsConnector> &dDSConnector,
|
|
// NGL::Settings *settings,
|
|
// CentralEffectSimulation::MainHandler *mainHandler)
|
|
//{
|
|
// return std::make_shared<CesArtillerySoundInterfaceImpl>(pdp, dDSConnector, settings, mainHandler);
|
|
//}
|
|
|
|
|
|
CesArtillerySoundInterfaceImpl::CesArtillerySoundInterfaceImpl(CentralEffectSimulation::Plugin::DataProvider *pdp,
|
|
const std::shared_ptr<DDSConnector::DdsConnector> &dDSConnector,
|
|
NGL::Settings *settings,
|
|
CentralEffectSimulation::MainHandler *mainHandler)
|
|
: m_pdp(pdp)
|
|
, m_ddsConnector(dDSConnector)
|
|
, m_ddsHandler(mainHandler->dds())
|
|
, m_db(mainHandler->db())
|
|
, m_handlerBuildingData(mainHandler->handlerBuildingData())
|
|
, m_handlerParticipant(mainHandler->handlerParticipant())
|
|
, m_logger(CentralEffectSimulation::getLogger("Plugin.ArtillerySound.CesArtillerySoundInterfaceImpl"))
|
|
{
|
|
Q_UNUSED(settings)
|
|
}
|
|
|
|
CesArtillerySoundInterfaceImpl::~CesArtillerySoundInterfaceImpl()
|
|
{
|
|
m_handlerArtillerieSound.reset();
|
|
}
|
|
|
|
|
|
bool CesArtillerySoundInterfaceImpl::init(int domainId, int exerciseId)
|
|
{
|
|
m_domainId = domainId;
|
|
m_exerciseId = exerciseId;
|
|
INFO_LOG(m_logger) << "CentralEffectSimulation2DInterfaceImpl::init()"
|
|
<< " m_domainId=" << m_domainId
|
|
<< " m_exerciseId=" << m_exerciseId;
|
|
|
|
|
|
|
|
// initialize handlerArtillerieSound
|
|
m_handlerArtillerieSound = std::make_shared<HandlerArtillerieSound>(m_ddsHandler,
|
|
m_handlerBuildingData,
|
|
this);
|
|
|
|
if (!m_handlerArtillerieSound->init())
|
|
{
|
|
ERROR_LOG(m_logger) << "Initialisation m_handlerArtillerieSound failed.";
|
|
return false;
|
|
}
|
|
|
|
INFO_LOG(m_logger) << "CentralEffectSimulation2DInterfaceImpl::init() return true";
|
|
return true;
|
|
}
|
|
|
|
} //namespace CesArtillerySound
|