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,86 @@
|
||||
/**
|
||||
* Websocket interface to the training area proxy
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Christian Ehrlicher, SLSE, 2017-01-11
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QQueue>
|
||||
#include <QWebSocketServer>
|
||||
#include <memory>
|
||||
#include <TrainingAreaBase/training_area_telegrams.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
#include "logger.h"
|
||||
|
||||
namespace WirelessLocationSystem
|
||||
{
|
||||
class IsmHandler;
|
||||
class WebSocketWrapper;
|
||||
class WlsHandler;
|
||||
class WlsParticipant;
|
||||
class WlsParticipantHandler;
|
||||
|
||||
class WebSocketHandler : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit WebSocketHandler(QObject *parent = nullptr);
|
||||
~WebSocketHandler();
|
||||
|
||||
bool init(std::shared_ptr<WlsHandler> wlsHandler,
|
||||
std::shared_ptr<WlsParticipantHandler> participantHandler,
|
||||
std::shared_ptr<IsmHandler> ismHandler,
|
||||
quint16 listenPort);
|
||||
|
||||
template <typename T>
|
||||
bool sendTelegram(const T *data, int exerciseId)
|
||||
{
|
||||
if (!data)
|
||||
return false;
|
||||
|
||||
sendTelegramInternal(data,
|
||||
TrainingAreaBase::TetraIcd::Constraints<T>::type(),
|
||||
exerciseId);
|
||||
|
||||
return true;
|
||||
}
|
||||
bool sendWlsStateReport(int exerciseId = 0);
|
||||
|
||||
public slots:
|
||||
void sendBinarySfmData(const WlsParticipant *participant);
|
||||
void sendDataCommunicationState(const WlsParticipant *participant);
|
||||
void sendGpsPositionUsage(const WlsParticipant *participant);
|
||||
void sendPosition(const WlsParticipant *participant);
|
||||
void forceSendPosition(const WlsParticipant *participant,
|
||||
int moutObjectId, int moutRoomId);
|
||||
|
||||
private slots:
|
||||
void onNewConnection();
|
||||
void onTextMessageReceived(const QString &baJson);
|
||||
|
||||
signals:
|
||||
void signalBroadcastMessage(const QString &msg, int exerciseId);
|
||||
|
||||
private:
|
||||
template <typename T>
|
||||
void setPosition(T &tele, const WlsParticipant *participant);
|
||||
void sendTelegramInternal(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *data,
|
||||
const QString &type, int exerciseId);
|
||||
void sendParticipantConnectionStates(int exerciseId);
|
||||
|
||||
QWebSocketServer *m_webSocketServer;
|
||||
std::shared_ptr<WlsHandler> m_wlsHandler;
|
||||
std::shared_ptr<IsmHandler> m_ismHandler;
|
||||
std::shared_ptr<WlsParticipantHandler> m_participantHandler;
|
||||
|
||||
LtsCoordTrans::UtmCoordinate m_basePoint;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
|
||||
} // namespace WirelessLocationSystem
|
||||
Reference in new issue
Block a user