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/ParticipantManagement/dds_handler.cpp
+9 -10
View File
@@ -17,10 +17,9 @@
namespace ParticipantManagement
{
DdsHandler::DdsHandler(int domainId, int exerciseId)
: m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, exerciseId <= 0 ? IDL::PartitionType::Global : IDL::PartitionType::Exercise, exerciseId))
{
DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
DdsHandler::DdsHandler(int domainId, int exerciseId) : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, exerciseId <= 0 ? IDL::PartitionType::Global : IDL::PartitionType::Exercise, exerciseId)),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
}
DdsHandler::~DdsHandler()
@@ -40,7 +39,7 @@ 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;
}
@@ -56,7 +55,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
std::shared_ptr<DTS::PartitionTime> dtsPartitionTime;
dtsPartitionTime.reset(m_ddsConnector->createDTS<DTS::PartitionTimeImpl>());
m_exerciseTime = std::make_shared<ExerciseTime>(dtsPartitionTime);
ERROR_LOG() << "OKKKKK THIS THE NEW MAIN HANDLER DDS " << this->thread();
ERROR_LOG(m_logger) << "OKKKKK THIS THE NEW MAIN HANDLER DDS " << this->thread();
m_ddsDts = ParticipantManagement::Interface::Dts::create(m_ddsConnector);
m_ddsFts = ParticipantManagement::Interface::Fts::create(m_ddsConnector);
m_ddsDtc = ParticipantManagement::Interface::Dtc::create(m_ddsConnector);
@@ -68,7 +67,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
m_exAnyConnector = std::make_shared<DDSConnector::DdsConnector>(m_ddsConnector->getDomainParticipant(), IDL::PartitionType::Any);
if (!m_exAnyConnector->init(qosFileList))
{
ERROR_LOG() << "Could not init Dds Connector with IDL::PartitionType::Any";
ERROR_LOG(m_logger) << "Could not init Dds Connector with IDL::PartitionType::Any";
return false;
}
m_exAnyConnector->initPublisherSubscriber();
@@ -77,7 +76,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
m_ddsAnyExDts->enableUASRadioLinkConnectionStatus(true);
if (exerciseId <= 0)
{
DEBUG_LOG() << "Creating * FTS: " << m_exAnyConnector->getDefaultPartition();
DEBUG_LOG(m_logger) << "Creating * FTS: " << m_exAnyConnector->getDefaultPartition();
m_ddsAnyExFts = ParticipantManagement::Interface::Fts::create(m_exAnyConnector);
// do not enable anything here - enable where it is used (inside type handling) to make sure
// no other service get a subscription matched information without actually having data
@@ -107,7 +106,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
!m_ddsDts->enableMissionPlan(bExe)
)
{
ERROR_LOG() << "Error initializing DTS";
ERROR_LOG(m_logger) << "Error initializing DTS";
return false;
}
@@ -144,7 +143,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
)
{
ERROR_LOG() << "Error initializing FTS";
ERROR_LOG(m_logger) << "Error initializing FTS";
return false;
}