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,104 @@
|
||||
/**
|
||||
* Exercises Handler - checks the avilable exercises and creates subhandlers fort each of them
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Christian Ehrlicher, SLSE, 2016-04-14
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <AudioVideoManagement/avm_db.h>
|
||||
#include <ExerciseManagement/exm_enums.hpp>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QTimer>
|
||||
#include <map>
|
||||
#include <memory>
|
||||
|
||||
namespace ExerciseManagement
|
||||
{
|
||||
|
||||
class Exercise;
|
||||
|
||||
namespace Interface
|
||||
{
|
||||
class Dtc;
|
||||
}
|
||||
|
||||
} // namespace ExerciseManagement
|
||||
|
||||
|
||||
enum class DataModification;
|
||||
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
|
||||
class ExerciseHandler;
|
||||
class ExerciseContext;
|
||||
class AudioVideoHandler;
|
||||
class MainHandler;
|
||||
class AssetAssignmentManager;
|
||||
|
||||
class ExercisesHandler : public QObject
|
||||
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit ExercisesHandler(MainHandler *mainHandler);
|
||||
~ExercisesHandler();
|
||||
|
||||
bool init();
|
||||
|
||||
ExerciseHandler *exerciseHandler(int exerciseId) const;
|
||||
AudioVideoHandler *audioVideoHandler(int exerciseId) const;
|
||||
|
||||
signals:
|
||||
/**
|
||||
* @name Signals that notify a state change regarding the notion of whether the
|
||||
* context is active or not.
|
||||
* A context is considered active when the corresponding excercise has one of the
|
||||
* following states: Started, Paused, Resumed.
|
||||
* The state can only change from activated to deactivated but not back.
|
||||
*/
|
||||
///@{
|
||||
void contextActivated(const ExerciseContext &context);
|
||||
void contextDeactivated(const ExerciseContext &context);
|
||||
///@}
|
||||
|
||||
public slots:
|
||||
/**
|
||||
* Triggers AVS to reload the DeviceConfig after 1s unless called again within that time.
|
||||
* The avDbReloadNeeded() signals of the following entities will be connected here:
|
||||
* - ExerciseHandler
|
||||
* - AudioVideoHandler
|
||||
* - ImportHandler
|
||||
* - TvcHandler
|
||||
* - CnrHandler
|
||||
*/
|
||||
void onAvDbReloadNeeded();
|
||||
|
||||
private:
|
||||
void createExerciseHandlerFromLastSeen(const Database::AvmExerciseLastSeen &lastSeen);
|
||||
ExerciseHandler *getOrCreateExerciseHandler(int exerciseId);
|
||||
ExerciseHandler *createExerciseHandler(int exerciseId);
|
||||
|
||||
void exerciseModified(int exerciseId, const ExerciseManagement::ExerciseState &state);
|
||||
|
||||
DatabaseInterface *db();
|
||||
ExerciseManagement::Interface::Dtc *exmDtc();
|
||||
|
||||
private slots:
|
||||
void onExerciseChanged(const ExerciseManagement::Exercise &data, DataModification modType);
|
||||
void exerciseFinished(int exerciseId);
|
||||
|
||||
private:
|
||||
MainHandler *m_mainHandler;
|
||||
QTimer *m_triggerAvUpdateTimer;
|
||||
std::unique_ptr<AssetAssignmentManager> m_assetAssignmentManager;
|
||||
|
||||
class ExerciseParts;
|
||||
std::map<int, ExerciseParts> m_exercises;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
} // namespace WarehouseManagement
|
||||
Reference in new issue
Block a user