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
+10
-3
@@ -183,11 +183,17 @@ void ObjectEffector::onEffectorFired()
|
||||
if (m_firingStrategy == nullptr)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Not possible to fire. No firing strategy specified.";
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
m_firingStrategy->doFiring();
|
||||
const bool bDoFiringSuccess = m_firingStrategy->doFiring();
|
||||
if (!bDoFiringSuccess)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "doFiring failed"
|
||||
<< ", participantId=" << m_participantId
|
||||
<< ", aesItemId=" << m_aesItemId
|
||||
<< ", intendendTrajectory().size()=" << this->intendendTrajectory().size();
|
||||
}
|
||||
}
|
||||
|
||||
// Anhand der EX-L39 Streuungsdaten wird eine Trajektorie für diesen
|
||||
@@ -209,7 +215,8 @@ void ObjectEffector::setIndendedTrajectory(const std::vector<Core::RelativePosit
|
||||
|
||||
void ObjectEffector::setEffectorData(const EffectorData &effectorData)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "setEffectorData";
|
||||
DEBUG_LOG(m_logger) << "setEffectorData" << ", effectorData.properties() = '" << effectorData.properties() << "'";
|
||||
|
||||
m_effectorData = effectorData;
|
||||
setIndendedTrajectory(effectorData.trajectoryRelative());
|
||||
delete m_firingStrategy;
|
||||
|
||||
Reference in new issue
Block a user