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>
151 lines
4.0 KiB
C++
151 lines
4.0 KiB
C++
/**
|
|
* DdsHandler for DDS
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Hanna E. Rathje, SLSE, 2015-09-02
|
|
*/
|
|
|
|
#include "dds_handler.h"
|
|
|
|
#include "esm_dts.h"
|
|
#include "esm_fts.h"
|
|
|
|
namespace EffectShowManagement
|
|
{
|
|
|
|
DdsHandler::DdsHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
|
|
: m_ddsConnector(ddsConnector)
|
|
, m_logger(getLogger("DdsHandler"))
|
|
{
|
|
DEBUG_LOG(m_logger) << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
|
}
|
|
|
|
bool DdsHandler::init(const QStringList &qosFileList)
|
|
{
|
|
INFO_LOG(m_logger) << "--- StartEffectShowManagement DDSHandler.";
|
|
|
|
if (!m_ddsConnector->init(qosFileList))
|
|
{
|
|
ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
|
|
return false;
|
|
}
|
|
|
|
// default initialize Publisher and Subscriber
|
|
m_ddsConnector->initPublisherSubscriber();
|
|
|
|
m_topicLockMaster = std::make_shared<Core::TopicLockMaster>(m_ddsConnector);
|
|
|
|
m_dtcCore = Core::Interface::Dtc::create(m_ddsConnector);
|
|
m_dtcCore->enablePartitionTime();
|
|
|
|
m_ddsDts = EffectShowManagement::Interface::Dts::create(m_ddsConnector);
|
|
m_ddsFts = EffectShowManagement::Interface::Fts::create(m_ddsConnector);
|
|
|
|
|
|
if (!m_ddsDts->enableAll())
|
|
{
|
|
ERROR_LOG(m_logger) << "Could not Dts enableAll";
|
|
return false;
|
|
}
|
|
|
|
if (!m_ddsFts->enableAll())
|
|
{
|
|
ERROR_LOG(m_logger) << "Could not Fts enableAll";
|
|
return false;
|
|
}
|
|
|
|
// Subsribe for AreaEffectSimulation
|
|
m_dtcAes = AreaEffectSimulation::Interface::Dtc::create(m_ddsConnector);
|
|
if (!m_dtcAes->enableExplosionArea())
|
|
{
|
|
ERROR_LOG(m_logger) << "Could not initialize enableExplosionArea data topic client";
|
|
return false;
|
|
}
|
|
if (!m_dtcAes->enableExplosionSingle())
|
|
{
|
|
ERROR_LOG(m_logger) << "Could not initialize enableExplosionArea data topic client";
|
|
return false;
|
|
}
|
|
|
|
if (!m_dtcAes->enableMineArea())
|
|
{
|
|
ERROR_LOG(m_logger) << "Could not initialize enableMineArea data topic client";
|
|
return false;
|
|
}
|
|
|
|
|
|
// add FTC for AreaEffectSimulation
|
|
m_ftcAes = AreaEffectSimulation::Interface::Ftc::create(m_ddsConnector);
|
|
if (!m_ftcAes->enableSetAesItemEffectorState(true))
|
|
{
|
|
ERROR_LOG(m_logger) << "Could not initialize enableSetAesItemEffectorState data topic client";
|
|
return false;
|
|
}
|
|
|
|
// Subsribe for Participant Management
|
|
m_dtcPpm = ParticipantManagement::Interface::Dtc::create(m_ddsConnector);
|
|
|
|
if (!m_dtcPpm->enableParticipant())
|
|
{
|
|
ERROR_LOG(m_logger) << "Could not initialize Participant data topic client";
|
|
return false;
|
|
}
|
|
|
|
if (!m_dtcPpm->enableType())
|
|
{
|
|
ERROR_LOG(m_logger) << "Could not initialize Participant type data topic client";
|
|
return false;
|
|
}
|
|
m_dtcPpm->waitForHistoricalDataType();
|
|
|
|
// Subscripe for Project Data Management
|
|
m_dtcPdm = ProjectDataManagement::Interface::Dtc::create(m_ddsConnector);
|
|
|
|
if (!m_dtcPdm->enableChargeType())
|
|
{
|
|
ERROR_LOG(m_logger) << "Error initializing ProjectDataManagement DTC";
|
|
return false;
|
|
}
|
|
|
|
// Subscripe for Meteo Data Management
|
|
m_dtcMdm = MeteoDataManagement::Interface::Dtc::create(m_ddsConnector);
|
|
|
|
if (!m_dtcMdm->enableMeteoData())
|
|
{
|
|
ERROR_LOG(m_logger) << "Error initializing MeteoDataManagement DTC";
|
|
return false;
|
|
}
|
|
|
|
// Subscripe for Training Area Base
|
|
m_dtcTab = TrainingAreaBase::Interface::Dtc::create(m_ddsConnector);
|
|
|
|
if (!m_dtcTab->enableFireSmokeMarkerData())
|
|
{
|
|
ERROR_LOG(m_logger) << "Error initializing TrainingAreaBase DTC";
|
|
return false;
|
|
}
|
|
|
|
m_ftcTab = TrainingAreaBase::Interface::Ftc::create(m_ddsConnector);
|
|
if (!m_ftcTab->enableSendFireSmokeMarkerData())
|
|
{
|
|
ERROR_LOG(m_logger) << "Error initializing TrainingAreaBase FTC";
|
|
return false;
|
|
}
|
|
if (!m_ftcTab->enableAdlerFqFb())
|
|
{
|
|
ERROR_LOG(m_logger) << "Error initializing TrainingAreaBase FTC";
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
//-----------------------------------------------------------------------------
|
|
|
|
qint64 DdsHandler::currentPartitionTime() const
|
|
{
|
|
return m_dtcCore->partitionTime().timeStamp();
|
|
}
|
|
|
|
} // namespace EffectShowManagement
|