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,78 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Exercise
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Christian Fröbel, SLSE, 2017-11-30
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "exercise_context.h"
|
||||
#include "avm_export.h"
|
||||
#include "asset.h"
|
||||
#include "mounting_point.h"
|
||||
#include <QObject>
|
||||
#include <boost/optional.hpp>
|
||||
#include <memory>
|
||||
#include <map>
|
||||
#include <vector>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
|
||||
class Asset;
|
||||
class MountingPoint;
|
||||
|
||||
/**
|
||||
* @author Christian Fröbel
|
||||
*/
|
||||
class AVM_COMMON_EXPORT Exercise : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit Exercise(const ExerciseContext &context)
|
||||
: m_context(context)
|
||||
{}
|
||||
|
||||
const ExerciseContext &context() const { return m_context; }
|
||||
|
||||
/**
|
||||
* Move the *mounted* Asset and MountingPoint from this Exercise
|
||||
* to the targetExercise.
|
||||
* Emits assetUnassigned() for this Exercise and assetAssigned() for targetExercise.
|
||||
* If modifiedData is set, the asset will be updated with that data.
|
||||
* The update will be applied between both signals.
|
||||
*/
|
||||
void moveMountedTo(Asset *asset, Exercise *targetExercise, const boost::optional<InfrastructureManagement::InstrumentationAsset> &modifiedData);
|
||||
|
||||
void add(std::unique_ptr<Asset> &&asset);
|
||||
void add(std::unique_ptr<MountingPoint> &&mountingPoint);
|
||||
|
||||
std::unique_ptr<Asset> take(Asset *asset);
|
||||
std::unique_ptr<MountingPoint> take(MountingPoint *mountingPoint);
|
||||
|
||||
/** @return nullptr if not found */
|
||||
Asset *findAsset(int id);
|
||||
|
||||
std::vector<Asset *> assets() const;
|
||||
|
||||
/** @return nullptr if not found */
|
||||
MountingPoint *findMountingPoint(int id);
|
||||
|
||||
bool isEmpty() const { return m_assets.empty() && m_mountingPoints.empty(); }
|
||||
|
||||
signals:
|
||||
void assetAssigned(Asset *asset);
|
||||
void assetUnassigned(Asset *asset);
|
||||
|
||||
private:
|
||||
ExerciseContext m_context;
|
||||
std::map<int, std::unique_ptr<Asset>> m_assets;
|
||||
std::map<int, std::unique_ptr<MountingPoint>> m_mountingPoints;
|
||||
};
|
||||
|
||||
} // namespace AudioVideoManagement
|
||||
|
||||
Reference in new issue
Block a user