Qt6 Migration: Complete migration with DDS/RTI support and build validation
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>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,82 @@
|
||||
/**
|
||||
* DdsHandler for CombatNetRadio
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Hannes Fritsche, SLSE, 2017-09-05
|
||||
*/
|
||||
|
||||
#include "dds_handler.h"
|
||||
#include <AssetManagement/asm_dtc.h>
|
||||
#include <AudioVideoManagement/avm_dtc.h>
|
||||
#include <AudioVideoManagement/avm_ftc.h>
|
||||
#include <ExerciseManagement/exm_dtc.h>
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
#include <DDS/Core/pacemaker.h>
|
||||
|
||||
namespace CombatNetRadio
|
||||
{
|
||||
|
||||
DdsHandler::DdsHandler(int domainId)
|
||||
: m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Global))
|
||||
, m_logger(getLogger("DdsHandler"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
}
|
||||
|
||||
bool DdsHandler::init(const QStringList &qosFileList)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION;
|
||||
|
||||
if (!m_ddsConnector->init(qosFileList))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
|
||||
return false;
|
||||
}
|
||||
|
||||
// default initialize Publisher and Subscriber
|
||||
m_ddsConnector->initPublisherSubscriber();
|
||||
|
||||
// Pacemaker
|
||||
m_pacemaker.reset(new Core::Pacemaker(m_ddsConnector));
|
||||
|
||||
m_asmDtc = AssetManagement::Interface::Dtc::create(m_ddsConnector);
|
||||
m_avmDtc = AudioVideoManagement::Interface::Dtc::create(m_ddsConnector);
|
||||
m_avmFtc = AudioVideoManagement::Interface::Ftc::create(m_ddsConnector);
|
||||
m_exmDtc = ExerciseManagement::Interface::Dtc::create(m_ddsConnector);
|
||||
m_ismDtc = InfrastructureManagement::Interface::Dtc::create(m_ddsConnector);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void DdsHandler::enableDtcs()
|
||||
{
|
||||
Q_ASSERT(m_avmDtc);
|
||||
Q_ASSERT(m_exmDtc);
|
||||
bool status = m_asmDtc->enableTrainingArea() &&
|
||||
m_avmDtc->enableFrequencySet() &&
|
||||
m_avmDtc->enableFrequencyPlanning() &&
|
||||
m_avmDtc->enableActiveFrequencyPlanning() &&
|
||||
m_avmDtc->enableCnrChannel() &&
|
||||
m_avmDtc->enableCnrConfig() &&
|
||||
m_exmDtc->enableExercise() &&
|
||||
m_avmFtc->enableClearFrequencyPlanningStatus() &&
|
||||
m_avmFtc->enableModifyFrequencyPlanningStatus() &&
|
||||
m_avmFtc->enableRemoveFrequencyPlanningStatusByClient() &&
|
||||
m_ismDtc->enableMainStructureElement();
|
||||
|
||||
m_asmDtc->waitForHistoricalDataTrainingArea();
|
||||
m_avmDtc->waitForHistoricalDataCnrChannel();
|
||||
m_avmDtc->waitForHistoricalDataFrequencySet();
|
||||
m_ismDtc->waitForHistoricalDataMainStructureElement();
|
||||
|
||||
Q_ASSERT(status);
|
||||
}
|
||||
|
||||
dds::domain::DomainParticipant DdsHandler::domainParticipant() const
|
||||
{
|
||||
return m_ddsConnector->getDomainParticipant();
|
||||
}
|
||||
|
||||
|
||||
} // Namespace CombatNetRadio
|
||||
Reference in new issue
Block a user