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,57 @@
|
||||
/**
|
||||
* Handle Participants which are available in the system (map between Wls id and ParticipantId)
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Christian Ehrlicher, SLSE, 2017-01-10
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "logger.h"
|
||||
#include "wls_participant.h"
|
||||
#include <QHash>
|
||||
#include <QObject>
|
||||
#include <QTimer>
|
||||
#include <unordered_map>
|
||||
#include <unordered_set>
|
||||
|
||||
namespace WirelessLocationSystem
|
||||
{
|
||||
class WebSocketHandler;
|
||||
class WlsHandler;
|
||||
|
||||
class WlsParticipantHandler : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit WlsParticipantHandler(QObject *parent = nullptr);
|
||||
~WlsParticipantHandler();
|
||||
|
||||
void init(WebSocketHandler *wsHandler,
|
||||
WlsHandler *wlsHandler);
|
||||
|
||||
// ownership stays here
|
||||
WlsParticipant *createNewParticipant(const QByteArray &tagId);
|
||||
void setEquipmentNumber(WlsParticipant *participant, int equipmentNumber);
|
||||
|
||||
WlsParticipant *participantByTagId(const QByteArray &tagId) const;
|
||||
const QHash<QByteArray, WlsParticipant *> &participants() const { return m_participantsByTagId; }
|
||||
|
||||
void exerciseEquipmentAssignmentChanged(const std::unordered_map<int, std::unordered_set<int>> &eea);
|
||||
void handleWlsBinarySfmData(const TrainingAreaBase::TetraIcd::WlsBinarySfmData &data);
|
||||
|
||||
private Q_SLOTS:
|
||||
void onGpsOnOffTimeoutTimer();
|
||||
private:
|
||||
WebSocketHandler *m_wsHandler = nullptr;
|
||||
WlsHandler *m_wlsHandler = nullptr;
|
||||
|
||||
QHash<QByteArray, WlsParticipant *> m_participantsByTagId;
|
||||
QHash<int, WlsParticipant *> m_participantsByEqId;
|
||||
QHash<int, int> m_equipNo2ExerciseId;
|
||||
|
||||
QTimer *m_gpsOnOffTimeoutTimer;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
} // namespace WirelessLocationSystem
|
||||
Reference in new issue
Block a user