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,93 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* ActiveExercises
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Christian Fröbel, NLE, 2019-08-01
|
||||
*/
|
||||
|
||||
#include "active_exercises.h"
|
||||
#include <ExerciseManagement/exm_dtc.h>
|
||||
#include <ExerciseManagement/exm.hpp>
|
||||
#include <LtsUtilsCore/data_modification_enum.h>
|
||||
#include <QtGlobal>
|
||||
|
||||
namespace
|
||||
{
|
||||
|
||||
bool isActive(ExerciseManagement::ExerciseState state)
|
||||
{
|
||||
return (state == ExerciseManagement::ExerciseState::Started ||
|
||||
state == ExerciseManagement::ExerciseState::Paused);
|
||||
}
|
||||
|
||||
} // anonymous namespace
|
||||
|
||||
|
||||
namespace CombatNetRadio
|
||||
{
|
||||
|
||||
ActiveExercises::ActiveExercises(ExerciseManagement::Interface::Dtc *exmDtc)
|
||||
: m_exmDtc(exmDtc)
|
||||
{
|
||||
Q_ASSERT(exmDtc);
|
||||
|
||||
connect(m_exmDtc, &ExerciseManagement::Interface::Dtc::exerciseChanged, this, &ActiveExercises::onExerciseChanged);
|
||||
|
||||
// Make sure that the topic is enabled *after* construction.
|
||||
Q_ASSERT(!m_exmDtc->isExerciseEnabled());
|
||||
}
|
||||
|
||||
void ActiveExercises::onExerciseChanged(const ExerciseManagement::Exercise &exercise, DataModification modType)
|
||||
{
|
||||
switch (modType)
|
||||
{
|
||||
case DataModification::eAdded:
|
||||
Q_FALLTHROUGH();
|
||||
case DataModification::eModified:
|
||||
check(exercise);
|
||||
break;
|
||||
|
||||
case DataModification::eRemoved:
|
||||
tryDeactivate(exercise.id());
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void ActiveExercises::check(const ExerciseManagement::Exercise &exercise)
|
||||
{
|
||||
Q_ASSERT(exercise.id() > 0);
|
||||
|
||||
if (isActive(exercise.state()))
|
||||
tryActivate(exercise.id());
|
||||
else
|
||||
tryDeactivate(exercise.id());
|
||||
}
|
||||
|
||||
void ActiveExercises::tryActivate(int exerciseId)
|
||||
{
|
||||
Q_ASSERT(exerciseId > 0);
|
||||
|
||||
auto found = m_activeExercises.find(exerciseId);
|
||||
if (found != m_activeExercises.end())
|
||||
return;
|
||||
|
||||
m_activeExercises.insert(exerciseId);
|
||||
emit activated(exerciseId);
|
||||
}
|
||||
|
||||
void ActiveExercises::tryDeactivate(int exerciseId)
|
||||
{
|
||||
Q_ASSERT(exerciseId > 0);
|
||||
|
||||
auto found = m_activeExercises.find(exerciseId);
|
||||
if (found == m_activeExercises.end())
|
||||
return;
|
||||
|
||||
m_activeExercises.erase(found);
|
||||
emit deactivated(exerciseId);
|
||||
}
|
||||
|
||||
|
||||
} // namespace CombatNetRadio
|
||||
Reference in new issue
Block a user