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>
112 lines
4.8 KiB
C++
112 lines
4.8 KiB
C++
/**
|
|
* Plugin Ces2D
|
|
* $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 Ces2D
|
|
{
|
|
|
|
|
|
std::shared_ptr<CentralEffectSimulation::Plugin::Interface> CentralEffectSimulation2DPlugin::createInterface(CentralEffectSimulation::Plugin::DataProvider *pdp,
|
|
const std::shared_ptr<DDSConnector::DdsConnector> &dDSConnector,
|
|
NGL::Settings *settings,
|
|
const std::shared_ptr<CentralEffectSimulation::DdsHandler> &ddsHandler,
|
|
const std::shared_ptr<CentralEffectSimulation::DatabaseInterface> &db,
|
|
const std::shared_ptr<CentralEffectSimulation::HandlerParticipant> &handlerParticipant,
|
|
const std::shared_ptr<CentralEffectSimulation::HandlerBuildingData> &handlerBuildingData)
|
|
{
|
|
return std::make_shared<Ces2DInterfaceImpl>(pdp, dDSConnector, settings, ddsHandler, db, handlerParticipant, handlerBuildingData);
|
|
}
|
|
|
|
|
|
Ces2DInterfaceImpl::Ces2DInterfaceImpl(CentralEffectSimulation::Plugin::DataProvider *pdp,
|
|
const std::shared_ptr<DDSConnector::DdsConnector> &dDSConnector,
|
|
NGL::Settings *settings,
|
|
const std::shared_ptr<CentralEffectSimulation::DdsHandler> &ddsHandler,
|
|
const std::shared_ptr<CentralEffectSimulation::DatabaseInterface> &db,
|
|
const std::shared_ptr<CentralEffectSimulation::HandlerParticipant> &handlerParticipant,
|
|
const std::shared_ptr<CentralEffectSimulation::HandlerBuildingData> &handlerBuildingData)
|
|
: m_pdp(pdp)
|
|
, m_ddsConnector(dDSConnector)
|
|
, m_ddsHandler(ddsHandler)
|
|
, m_db(db)
|
|
, m_handlerBuildingData(handlerBuildingData)
|
|
, m_handlerParticipant(handlerParticipant)
|
|
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("CES.Plugin.CentralEffectSimulation2DInterfaceImpl"))
|
|
{
|
|
Q_UNUSED(settings)
|
|
}
|
|
|
|
Ces2DInterfaceImpl::~Ces2DInterfaceImpl()
|
|
{
|
|
m_handlerAesData.reset();
|
|
m_handlerBuildingModel.reset();
|
|
m_handlerParticipantArea.reset();
|
|
}
|
|
|
|
|
|
bool Ces2DInterfaceImpl::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 handlerAesData
|
|
m_handlerAesData = std::make_shared<HandlerAesData>(m_ddsHandler,
|
|
m_handlerBuildingData,
|
|
this);
|
|
|
|
if (!m_handlerAesData->init())
|
|
{
|
|
ERROR_LOG(m_logger) << "Initialisation HandlerAesData failed.";
|
|
return false;
|
|
}
|
|
|
|
INFO_LOG(m_logger) << "initialize HandlerBuildingModel ----------------------------";
|
|
m_handlerBuildingModel = std::make_shared<HandlerBuildingModel>(m_ddsHandler, m_handlerAesData, this);
|
|
if (!m_handlerBuildingModel->init())
|
|
{
|
|
ERROR_LOG(m_logger) << "Initialisation HandlerBuildingModel failed.";
|
|
return false;
|
|
} // if
|
|
|
|
|
|
// initialize handlerParticipantArea
|
|
m_handlerParticipantArea = std::make_shared<HandlerParticipantArea>(m_ddsHandler,
|
|
m_handlerParticipant,
|
|
m_handlerAesData,
|
|
m_handlerBuildingModel,
|
|
this);
|
|
|
|
if (!m_handlerParticipantArea->init())
|
|
{
|
|
ERROR_LOG(m_logger) << "Initialisation HandlerParticipantArea failed.";
|
|
return false;
|
|
}
|
|
|
|
INFO_LOG(m_logger) << "CentralEffectSimulation2DInterfaceImpl::init() return true";
|
|
return true;
|
|
}
|
|
|
|
QString Ces2DInterfaceImpl::echo(const QString &message)
|
|
{
|
|
|
|
QString ret(QStringLiteral("<<<< %1 >>>> CentralEffectSimulation2DInterfaceImpl::echo").arg(message));
|
|
INFO_LOG(m_logger) << "CentralEffectSimulation2DInterfaceImpl::echo return:" << ret;
|
|
DEBUG_LOG(m_logger) << "DEBUG: CentralEffectSimulation2DInterfaceImpl::echo return:" << ret;
|
|
return ret;
|
|
}
|
|
|
|
} //namespace Ces2D
|