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,87 @@
|
||||
/**
|
||||
* Exercise object
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include "dds_handler.h"
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
|
||||
// Generated
|
||||
#include <ExerciseManagement/exm_db.h>
|
||||
|
||||
namespace DBAdministration
|
||||
{
|
||||
class CopyExercise;
|
||||
class ExerciseTableGenerator;
|
||||
}
|
||||
namespace ExerciseManagement
|
||||
{
|
||||
class DatabaseInterface;
|
||||
class ExerciseStateMachine;
|
||||
class HandlerExercise;
|
||||
|
||||
class ObjectExercise final : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit ObjectExercise(const std::shared_ptr<DdsHandler> &ddsHandler,
|
||||
const std::shared_ptr<DatabaseInterface> &db,
|
||||
const std::shared_ptr<DBAdministration::ExerciseTableGenerator> &exTblGen,
|
||||
HandlerExercise *exHandler);
|
||||
~ObjectExercise();
|
||||
|
||||
Core::FunctionReplyObject createObject(const Database::ExmExercise &data, bool forceInsert = false);
|
||||
Core::FunctionReplyObject updateObject(const Database::ExmExercise &data);
|
||||
Core::FunctionReplyObject removeObject(bool force);
|
||||
bool setLinkedExerciseId(int newLinkedExerciseId);
|
||||
bool setSendToWms(bool bSend);
|
||||
void initStateMachine();
|
||||
|
||||
qint32 id() const { return m_data.id; }
|
||||
ExerciseState exerciseState() const { return m_data.exerciseStateId; }
|
||||
int linkedExerciseId() const { return m_data.linkedExerciseId; }
|
||||
QString name() const { return m_data.name; }
|
||||
bool sendToWms() const { return m_data.sendToWms; }
|
||||
// for updating (when part of the data is changed)
|
||||
const Database::ExmExercise &data() const { return m_data; }
|
||||
|
||||
// Used for Unittest (getting the signals)
|
||||
ExerciseStateMachine* getStateMachine() { return m_stateMachine; }
|
||||
|
||||
// Used by ExerciseStateManager (only internal)
|
||||
bool setExerciseState(const ExerciseState &exerciseState);
|
||||
|
||||
// Used by Client
|
||||
Core::FunctionReplyObject switchToState(const ExerciseState &newExerciseState, int operatorId, int workstationId);
|
||||
|
||||
// TODO: implement
|
||||
bool isEditable() const{ return true; }
|
||||
bool isValid() const;
|
||||
bool isRunning() const;
|
||||
bool isStopped() const;
|
||||
|
||||
bool sendStateToServiceManagement(ExerciseState state);
|
||||
bool transferExerciseToEvaluationDb();
|
||||
|
||||
private:
|
||||
void onPublishData();
|
||||
void fixupTimeZone();
|
||||
void onErrorOccured();
|
||||
void onTransferDbFinished();
|
||||
|
||||
private:
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler;
|
||||
std::shared_ptr<DatabaseInterface> m_db;
|
||||
const std::shared_ptr<DBAdministration::ExerciseTableGenerator> m_exTblGen;
|
||||
Database::ExmExercise m_data;
|
||||
ExerciseStateMachine *m_stateMachine;
|
||||
HandlerExercise *m_exerciseHandler;
|
||||
DBAdministration::CopyExercise *m_copyExercise;
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
}
|
||||
Reference in new issue
Block a user