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>
78 lines
2.4 KiB
C++
78 lines
2.4 KiB
C++
/**
|
|
* Plugin CES TargetAreas
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Gerlinde Rudolphus, SLTE, 2016-04-14
|
|
*/
|
|
|
|
#include "plugin.h"
|
|
#include <NGLLogger/NGLLoggerBootstrap.h>
|
|
|
|
namespace TargetAreas
|
|
{
|
|
|
|
|
|
std::shared_ptr<CentralEffectSimulation::Plugin::Interface> TargetAreasPlugin::createInterface(CentralEffectSimulation::Plugin::DataProvider *pdp,
|
|
const std::shared_ptr<DDSConnector::DdsConnector> dDSConnector,
|
|
NGL::Settings *settings)
|
|
{
|
|
return std::make_shared<TargetAreasInterfaceImpl>(pdp, dDSConnector, settings);
|
|
}
|
|
|
|
|
|
TargetAreasInterfaceImpl::TargetAreasInterfaceImpl(CentralEffectSimulation::Plugin::DataProvider *pdp,
|
|
const std::shared_ptr<DDSConnector::DdsConnector> dDSConnector,
|
|
NGL::Settings *settings)
|
|
: m_pdp(pdp)
|
|
, m_ddsConnector(dDSConnector)
|
|
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("CES.Plugin.TargetAreasInterfaceImpl"))
|
|
{
|
|
Q_UNUSED(settings)
|
|
}
|
|
|
|
TargetAreasInterfaceImpl::~TargetAreasInterfaceImpl()
|
|
{
|
|
//cleanupProcess();
|
|
}
|
|
|
|
|
|
bool TargetAreasInterfaceImpl::init(int domain_id, int exerciseId)
|
|
{
|
|
m_domainId = domain_id;
|
|
m_exerciseId = exerciseId;
|
|
INFO_LOG(m_logger) << "TargetAreasInterfaceImpl::init()"
|
|
<< " m_domainId=" << m_domainId
|
|
<< " m_exerciseId=" << m_exerciseId;
|
|
|
|
// // initialize DDS
|
|
m_ddsHandlerTargetAreas = std::make_shared<DdsHandlerTargetAreas>(m_domainId, m_exerciseId);
|
|
if (!m_ddsHandlerTargetAreas->init())
|
|
{
|
|
ERROR_LOG(m_logger) << "Initialisation DdsHandler failed.";
|
|
return false;
|
|
}
|
|
|
|
m_handlerTargetAreas.reset(new HandlerTargetAreas(m_ddsHandlerTargetAreas, this));
|
|
|
|
if (!m_handlerTargetAreas->init())
|
|
{
|
|
ERROR_LOG(m_logger) << "Initialisation HandlerTargetAreas failed.";
|
|
return false;
|
|
}
|
|
|
|
INFO_LOG(m_logger) << "TargetAreasInterfaceImpl::init() return true";
|
|
return true;
|
|
}
|
|
|
|
QString TargetAreasInterfaceImpl::echo(const QString &message)
|
|
{
|
|
|
|
QString ret(QStringLiteral("<<<< %1 >>>> TargetAreasInterfaceImpl::echo").arg(message));
|
|
INFO_LOG(m_logger) << "TargetAreasInterfaceImpl::echo return:" << ret;
|
|
DEBUG_LOG(m_logger) << "DEBUG: TargetAreasInterfaceImpl::echo return:" << ret;
|
|
return ret;
|
|
}
|
|
|
|
} //namespace TargetAreas
|