lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds immediate migration results in progress

Browse Source
This commit is contained in:
torsten committed 2026-08-19 11:18:24 +02:00
1 parent 8453e104c5
commit 3bb6e89496
2102 files changed
+17482 -15071
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/dds_handler.cpp
+11 -11
View File
@@ -17,14 +17,14 @@ namespace TargetManagement
DdsHandler::DdsHandler(int domainId, int exerciseId)
: m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise, exerciseId))
{
DEBUG_LOG() << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
DEBUG_LOG(m_logger) << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
}
bool DdsHandler::init(const QStringList &qosFileList)
{
if (!m_ddsConnector->init(qosFileList))
{
ERROR_LOG() << "Error initializing dds connections - aborting";
ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
return false;
}
@@ -43,18 +43,18 @@ bool DdsHandler::init(const QStringList &qosFileList)
// DTS Target
m_dtsTgt = TargetManagement::Interface::Dts::create(m_ddsConnector);
bool bRet = m_dtsTgt->enableAll();
INFO_LOG() << "Dts initialised";
INFO_LOG(m_logger) << "Dts initialised";
// FTS Target
m_ftsTgt = TargetManagement::Interface::Fts::create(m_ddsConnector);
bRet &= m_ftsTgt->enableAll();
INFO_LOG() << "Fts initialised";
INFO_LOG(m_logger) << "Fts initialised";
// DTC TrainingAreaBase
m_dtcTab = TrainingAreaBase::Interface::Dtc::create(m_ddsConnector);
if (!m_dtcTab->enableTargetData())
{
ERROR_LOG() << "Could not enable receive TAB";
ERROR_LOG(m_logger) << "Could not enable receive TAB";
return false;
}
@@ -62,7 +62,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
m_ftcTab = TrainingAreaBase::Interface::Ftc::create(m_ddsConnector);
if (!m_ftcTab->enableSendTargetData())
{
ERROR_LOG() << "Could not enable Send TAB";
ERROR_LOG(m_logger) << "Could not enable Send TAB";
return false;
}
@@ -75,7 +75,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
m_dtcPpm->enableEquipmentType()
))
{
ERROR_LOG() << "Could not initialize ParticipantManagement enableXXX data topic client";
ERROR_LOG(m_logger) << "Could not initialize ParticipantManagement enableXXX data topic client";
return false;
}
// Get 'static' data for all participants (playerdata)
@@ -103,7 +103,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
int DdsHandler::participantId2EquipNo(const int participantId) const
{
int ret = m_partId2EquipNoMap.value(participantId, 0);
INFO_LOG() << "participantId2EquipNo participantId=" << participantId
INFO_LOG(m_logger) << "participantId2EquipNo participantId=" << participantId
<< " EquipmentNumber=" << ret;
return ret;
} // end of participantId2EquipNo()
@@ -111,7 +111,7 @@ int DdsHandler::participantId2EquipNo(const int participantId) const
int DdsHandler::equipNo2participantId(const int equipmentNumber) const
{
int ret = m_equipNo2partIdMap.value(equipmentNumber, 0);
INFO_LOG() << "EquipNo2participantId equipmentNumber=" << equipmentNumber
INFO_LOG(m_logger) << "EquipNo2participantId equipmentNumber=" << equipmentNumber
<< " ParticipantId=" << ret;
return ret;
} // end of EquipNo2participantId()
@@ -121,7 +121,7 @@ int DdsHandler::equipNo2participantId(const int equipmentNumber) const
// ///////////////////////////////////
void DdsHandler::onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType)
{
DEBUG_LOG() << "onParticipantChanged";
DEBUG_LOG(m_logger) << "onParticipantChanged";
if (modType == DataModification::eRemoved)
m_partId2EquipNoMap.remove(data.id());
else
@@ -135,7 +135,7 @@ void DdsHandler::onParticipantChanged(const ParticipantManagement::Participant &
{
for (auto i = m_partId2EquipNoMap.begin(); i != m_partId2EquipNoMap.end(); ++i)
{
TRACE_LOG() << " partId2EquipNoMap.size(): " << m_partId2EquipNoMap.size()
TRACE_LOG(m_logger) << " partId2EquipNoMap.size(): " << m_partId2EquipNoMap.size()
<< " partId: " << i.key()
<< " eqNo: " << i.value();
}