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
3.1 KiB
C++
78 lines
3.1 KiB
C++
/**
|
|
* Plugin CES Functional Area
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Gerlinde Rudolphus, SLTE, 2016-04-14
|
|
*/
|
|
#pragma once
|
|
|
|
#include <CentralEffectSimulation/logger.h>
|
|
|
|
#include "handler_functional_area.h"
|
|
|
|
#include <DDS/DDSConnector/dds_connector.h>
|
|
#include <CentralEffectSimulation/ces_plugin_interface.h>
|
|
#include <CentralEffectSimulation/main_handler.h>
|
|
#include <CentralEffectSimulation/dds_handler.h>
|
|
|
|
#include <QObject>
|
|
|
|
|
|
namespace CES_FUNCTIONAL_AREA
|
|
{
|
|
|
|
class CesFunctionalAreaPlugin : public QObject, public CentralEffectSimulation::Plugin::Plugin
|
|
{
|
|
Q_OBJECT
|
|
Q_PLUGIN_METADATA(IID "special:3:ces.CesFunctionalAreaPlugin")
|
|
Q_INTERFACES(CentralEffectSimulation::Plugin::Plugin)
|
|
|
|
public:
|
|
CesFunctionalAreaPlugin() = default;
|
|
~CesFunctionalAreaPlugin() = 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 CES_FUNCTIONAL_AREAInterfaceImpl final : public CentralEffectSimulation::Plugin::Interface
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
CES_FUNCTIONAL_AREAInterfaceImpl(CentralEffectSimulation::Plugin::DataProvider *pdp,
|
|
const std::shared_ptr<DDSConnector::DdsConnector> &dDSConnector,
|
|
NGL::Settings *settings,
|
|
CentralEffectSimulation::MainHandler *mainHandler);
|
|
~CES_FUNCTIONAL_AREAInterfaceImpl();
|
|
//bool init();
|
|
const char *name() const override { return "CesFunctionalAreaPlugin"; }
|
|
QString echo(const QString &message) override;
|
|
|
|
private Q_SLOTS:
|
|
bool init(int domainId, int exerciseId) override;
|
|
private:
|
|
|
|
private:
|
|
CentralEffectSimulation::Plugin::DataProvider *m_pdp{nullptr};
|
|
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
|
|
CentralEffectSimulation::MainHandler *m_mainHandler{nullptr};
|
|
|
|
std::shared_ptr<CentralEffectSimulation::DdsHandler> m_ddsHandler;
|
|
std::shared_ptr<CentralEffectSimulation::DatabaseInterface> m_db;
|
|
std::shared_ptr<CentralEffectSimulation::HandlerBuildingData> m_handlerBuildingData;
|
|
std::shared_ptr<CentralEffectSimulation::HandlerParticipant> m_handlerParticipant; ///< Pointer to handler for all participants
|
|
|
|
std::shared_ptr<HandlerFunctionalAreas> m_handlerFunctionalAreas; ///< Pointer to handler for participant outside from Buildings
|
|
|
|
|
|
CentralEffectSimulation::LOGGER_T &m_logger; ///< Interface to the Logging-Facility
|
|
int m_domainId = 0;
|
|
int m_exerciseId = 0;
|
|
};
|
|
|
|
} // namespace CES_FUNCTIONAL_AREA
|