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,91 @@
|
||||
/**
|
||||
* Handler for all oc data at the server
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Philipp Dassow, NLST, 14-02-2018
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include "main_handler.h"
|
||||
#include "logger.h"
|
||||
|
||||
#include <QMap>
|
||||
#include <QMutex>
|
||||
#include <QTimer>
|
||||
|
||||
namespace OcSituationServer
|
||||
{
|
||||
class ThreadOcCentralAesData;
|
||||
class ThreadOcSituationData;
|
||||
class HandlerOcAesData;
|
||||
class HandlerOcData : public QObject
|
||||
, protected Interface::Fts::SendEquipmentMessageOcRequestHandler
|
||||
, protected Interface::Fts::EquipmentErrorRequestHandler
|
||||
, protected Evaluations::Interface::Ftc::EvlCommentModifyReplyHandler
|
||||
, protected Messaging::Interface::Ftc::CreateOperatorMessageReplyHandler
|
||||
, protected ParticipantManagement::Interface::Ftc::RegisterParticipantReplyHandler
|
||||
, protected TrainingAreaBase::Interface::Ftc::SendOcDataReplyHandler
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit HandlerOcData(MainHandler *mainHandler,
|
||||
QObject *parent = nullptr);
|
||||
|
||||
~HandlerOcData();
|
||||
|
||||
bool init();
|
||||
|
||||
protected:
|
||||
void onEvlCommentModifyReply(const Core::FunctionReplyObject &reply) override final;
|
||||
void onCreateOperatorMessageReply(const Core::FunctionReplyObject &reply) override final;
|
||||
void onSendOcDataReply(const Core::FunctionReplyObject &reply) override final;
|
||||
void onRegisterParticipantReply(const ParticipantManagement::RegisterReply &reply) override final;
|
||||
|
||||
private slots:
|
||||
void onEvaluationSchemaChanged(const Evaluations::EvaluationSchema &data, DataModification modType);
|
||||
void onOcDataChanged(const TrainingAreaBase::OcData &data, DataModification modType);
|
||||
void onSendOcData(const TrainingAreaBase::SendOcDataRequest &req);
|
||||
void sendStateInformation();
|
||||
void onSituationThreadExit();
|
||||
void onCentralAesThreadExit();
|
||||
|
||||
private:
|
||||
void onSendEquipmentMessageOcRequest(const rti::core::SampleIdentity &cookie,
|
||||
const SendEquipmentMessageRequest &request) override final;
|
||||
void onEquipmentErrorRequest(const rti::core::SampleIdentity &cookie,
|
||||
const EquipmentErrorRequest &request) override final;
|
||||
|
||||
void handleDemandSituation(const QByteArray &data, int equipmentId);
|
||||
void handleDemandEvaluationSchema(const QByteArray &data, int equipmentNumber);
|
||||
void handleEvaluation(const QByteArray &data);
|
||||
void handleMessage(const QByteArray &data);
|
||||
void handleEquipmentErrorRegistration(const QByteArray &data);
|
||||
void handleEquipmentRegistration(const QByteArray &data);
|
||||
|
||||
|
||||
MainHandler *m_mainHandler;
|
||||
HandlerOcAesData *m_handlerOcAesData;
|
||||
|
||||
std::shared_ptr<Interface::Dts> m_dts;
|
||||
std::shared_ptr<Interface::Fts> m_fts;
|
||||
|
||||
std::shared_ptr<Evaluations::Interface::Dtc> m_evlDtc;
|
||||
std::shared_ptr<Evaluations::Interface::Ftc> m_evlFtc;
|
||||
std::shared_ptr<Messaging::Interface::Ftc> m_msgFtc;
|
||||
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
|
||||
std::shared_ptr<ParticipantManagement::Interface::Ftc> m_ppmFtc;
|
||||
|
||||
std::shared_ptr<TrainingAreaBase::Interface::Dtc> m_tabDtc;
|
||||
std::shared_ptr<TrainingAreaBase::Interface::Ftc> m_tabFtc;
|
||||
|
||||
int m_currentActiveEvaluationSchemaId;
|
||||
QMap<int, ThreadOcSituationData *> m_situationThreads; // equipmentId, thread for situation data handling
|
||||
QMap<int, ThreadOcCentralAesData *> m_centralAesDataThreads; // equipmentId, thread for central aes data handling
|
||||
QMutex m_accessMutex; // Mutex-Object
|
||||
QTimer *m_stateInformationTimer;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
}
|
||||
Reference in new issue
Block a user