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>
127 lines
4.1 KiB
C++
Executable File
127 lines
4.1 KiB
C++
Executable File
/**
|
|
* DdsHandlerTargetAreas for DDS
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by gr, SLSE, 2015-09-02
|
|
*/
|
|
|
|
#include "dds_handler.h"
|
|
|
|
#include <DDS/Core/core_dtc.h>
|
|
|
|
namespace TargetAreas
|
|
{
|
|
|
|
DdsHandlerTargetAreas::DdsHandlerTargetAreas(int domainId, int exerciseId)
|
|
: m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise, exerciseId))
|
|
, m_participantEventId(0)
|
|
, m_exerciseId(exerciseId)
|
|
, m_logger(getLogger("DdsHandlerTargetAreas"))
|
|
{
|
|
DEBUG_LOG(m_logger) << "DdsHandlerTargetAreas(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
|
}
|
|
|
|
bool DdsHandlerTargetAreas::init(const QStringList &qosFileList)
|
|
{
|
|
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_ddsConnector->enableBatchedWriter(false);
|
|
|
|
m_topicLockMaster = std::make_shared<Core::TopicLockMaster>(m_ddsConnector);
|
|
|
|
m_dtcCore = Core::Interface::Dtc::create(m_ddsConnector);
|
|
m_dtcCore->enablePartitionTime();
|
|
|
|
m_ftcTab = TrainingAreaBase::Interface::Ftc::create(m_ddsConnector);
|
|
if (!m_ftcTab->enableSendCesHit() ||
|
|
!m_ftcTab->enableSendCesHitInformation() ||
|
|
!m_ftcTab->enableSendGeopairingData() ||
|
|
!m_ftcTab->enableSendParticipantBlockedArea() ||
|
|
!m_ftcTab->enableSendParticipantBeStillWarning() ||
|
|
!m_ftcTab->enableSendControlData())
|
|
{
|
|
ERROR_LOG(m_logger) << "Could not enable SendCesHit";
|
|
return false;
|
|
}
|
|
m_dtcPpm = ParticipantManagement::Interface::Dtc::create(m_ddsConnector);
|
|
if (!m_dtcPpm->enableDynamicParticipantData())
|
|
{
|
|
ERROR_LOG(m_logger) << "Could not initialize ParticipantManagement enableDynamicParticipantData data topic client";
|
|
return false;
|
|
}
|
|
if (!m_dtcPpm->enableParticipantPosition())
|
|
{
|
|
ERROR_LOG(m_logger) << "Could not initialize ParticipantManagement enableParticipantPosition data topic client";
|
|
return false;
|
|
}
|
|
if (!m_dtcPpm->enableParticipant())
|
|
{
|
|
ERROR_LOG(m_logger) << "Could not initialize ParticipantManagement enableParticipant data topic client";
|
|
return false;
|
|
}
|
|
if (!m_dtcPpm->enableType())
|
|
{
|
|
ERROR_LOG(m_logger) << "Could not initialize ParticipantManagement enableType data topic client";
|
|
return false;
|
|
}
|
|
|
|
connect(m_dtcPpm.get(), &ParticipantManagement::Interface::Dtc::participantChanged,
|
|
this, &DdsHandlerTargetAreas::onParticipantChanged);
|
|
// Get 'static' data for all participants (playerdata)
|
|
// Player in Referenzmap eintragen
|
|
{
|
|
auto cb = [this](const ParticipantManagement::Participant & participant)
|
|
{
|
|
onParticipantChanged(participant, DataModification::eAdded);
|
|
};
|
|
m_dtcPpm->participants(cb);
|
|
}
|
|
|
|
return true;
|
|
} // end of init
|
|
|
|
// ///////////////////////////////////
|
|
// P P M (ParticipantManagement)
|
|
// ///////////////////////////////////
|
|
void DdsHandlerTargetAreas::onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType)
|
|
{
|
|
if (modType == DataModification::eRemoved)
|
|
m_partId2EquipNoMap.remove(data.id());
|
|
else
|
|
m_partId2EquipNoMap[data.id()] = data.equipmentNumber().is_set() ? data.equipmentNumber().get() : 0;
|
|
|
|
if (m_logger.isTraceEnabled())
|
|
{
|
|
for (auto i = m_partId2EquipNoMap.begin(); i != m_partId2EquipNoMap.end(); ++i)
|
|
{
|
|
TRACE_LOG(m_logger) << " partId2EquipNoMap.size(): " << m_partId2EquipNoMap.size()
|
|
<< " partId: " << i.key()
|
|
<< " eqNo: " << i.value();
|
|
}
|
|
}
|
|
} // end of onParticipantChanged()
|
|
|
|
//-----------------------------------------------------------------------------
|
|
qint64 DdsHandlerTargetAreas::currentPartitionTime() const
|
|
{
|
|
return m_dtcCore->partitionTime().timeStamp();
|
|
}
|
|
|
|
int DdsHandlerTargetAreas::participantId2EquipNo(const int participantId) const
|
|
{
|
|
int ret = m_partId2EquipNoMap.value(participantId, 0);
|
|
if (ret > 0)
|
|
INFO_LOG(m_logger) << "participantId2EquipNo participantId=" << participantId
|
|
<< " EquipmentNumber=" << ret;
|
|
return ret;
|
|
} // end of participantId2EquipNo()
|
|
|
|
} // Namespace CentralEffectSimulation
|