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
2.9 KiB
C++
86 lines
2.9 KiB
C++
/**
|
|
* DdsHandler for DDS
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Hanna E. Rathje, SLSE, 2015-09-02
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <DDS/DDSConnector/dds_connector.h>
|
|
#include <DDS/Core/topic_lock_master.h>
|
|
#include <DDS/Core/core_dtc.h>
|
|
#include <DDS/Core/core_dts_types.h>
|
|
|
|
#include <EffectShowManagement/esm_dts.h>
|
|
#include <EffectShowManagement/esm_fts.h>
|
|
#include <AreaEffectSimulation/aes_dtc.h>
|
|
#include <AreaEffectSimulation/aes_ftc.h>
|
|
|
|
#include <ParticipantManagement/ppm_dtc.h>
|
|
#include <ProjectDataManagement/pdm_dtc.h>
|
|
#include <MeteoDataManagement/mdm_dtc.h>
|
|
#include <TrainingAreaBase/tab_dtc.h>
|
|
#include <TrainingAreaBase/tab_ftc.h>
|
|
|
|
#include "logger.h"
|
|
|
|
namespace EffectShowManagement
|
|
{
|
|
class DdsHandler final
|
|
{
|
|
public:
|
|
explicit DdsHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector);
|
|
|
|
bool init(const QStringList &qosFileList = QStringList());
|
|
|
|
std::shared_ptr<DDSConnector::DdsConnector> ddsConnector() const
|
|
{
|
|
return m_ddsConnector;
|
|
}
|
|
|
|
std::shared_ptr<Core::TopicLockMaster> topicLockMaster() const { return m_topicLockMaster; }
|
|
|
|
std::shared_ptr<EffectShowManagement::Interface::Dts> dts() const
|
|
{
|
|
return m_ddsDts;
|
|
}
|
|
std::shared_ptr<EffectShowManagement::Interface::Fts> fts() const
|
|
{
|
|
return m_ddsFts;
|
|
}
|
|
|
|
std::shared_ptr<AreaEffectSimulation::Interface::Dtc> dtcAes() const { return m_dtcAes; }
|
|
std::shared_ptr<AreaEffectSimulation::Interface::Ftc> ftcAes() const { return m_ftcAes; }
|
|
|
|
std::shared_ptr<ParticipantManagement::Interface::Dtc> dtcPpm() const { return m_dtcPpm; }
|
|
std::shared_ptr<ProjectDataManagement::Interface::Dtc> dtcPdm() const { return m_dtcPdm; }
|
|
std::shared_ptr<MeteoDataManagement::Interface::Dtc> dtcMdm() const { return m_dtcMdm; }
|
|
std::shared_ptr<TrainingAreaBase::Interface::Dtc> dtcTab() const { return m_dtcTab; }
|
|
std::shared_ptr<TrainingAreaBase::Interface::Ftc> ftcTab() const { return m_ftcTab; }
|
|
|
|
int exerciseId() const { return m_ddsConnector->getPartitionId(); }
|
|
|
|
qint64 currentPartitionTime() const;
|
|
|
|
private:
|
|
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
|
|
std::shared_ptr<Core::TopicLockMaster> m_topicLockMaster;
|
|
std::shared_ptr<Core::Interface::Dtc> m_dtcCore;
|
|
std::shared_ptr<EffectShowManagement::Interface::Dts> m_ddsDts;
|
|
std::shared_ptr<EffectShowManagement::Interface::Fts> m_ddsFts;
|
|
|
|
std::shared_ptr<AreaEffectSimulation::Interface::Dtc> m_dtcAes;
|
|
std::shared_ptr<AreaEffectSimulation::Interface::Ftc> m_ftcAes;
|
|
|
|
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_dtcPpm;
|
|
std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_dtcPdm;
|
|
std::shared_ptr<MeteoDataManagement::Interface::Dtc> m_dtcMdm;
|
|
std::shared_ptr<TrainingAreaBase::Interface::Dtc> m_dtcTab;
|
|
std::shared_ptr<TrainingAreaBase::Interface::Ftc> m_ftcTab;
|
|
NGL::INGLLogger &m_logger;
|
|
};
|
|
|
|
} // namespace EffectShowManagement
|