torstenandCopilot
7173785915
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>
51 lines
1.2 KiB
C++
51 lines
1.2 KiB
C++
/**
|
|
* WebSocketServer to publish Events
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Christian Ehrlicher, SLSE, 2017-02-06
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <QMap>
|
|
#include <QObject>
|
|
#include <QSet>
|
|
#include <QSqlDatabase>
|
|
#include <QVector>
|
|
#include <ExerciseEventManagement/eem_db_structs.h>
|
|
#include "logger.h"
|
|
|
|
class QTimer;
|
|
class QUrl;
|
|
class QWebSocket;
|
|
class QWebSocketServer;
|
|
namespace ExerciseEventManagement
|
|
{
|
|
class WebSocketEventServer : public QObject
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
WebSocketEventServer(const QSqlDatabase &db, QObject *parent = nullptr);
|
|
~WebSocketEventServer();
|
|
|
|
bool listen(const QPair<quint16, quint16> &portRange);
|
|
bool listen(quint16 port);
|
|
quint16 listenPort() const;
|
|
|
|
void sendEvent(const QJsonObject &obj);
|
|
private:
|
|
void onNewConnection();
|
|
void onSocketDisconnected();
|
|
void onCleanupLiveHistory();
|
|
void historyDataRequested(const QSqlDatabase &db, QWebSocket *ws, const QUrl &requestUrl);
|
|
private:
|
|
QSet<QWebSocket *> m_liveSockets;
|
|
QMap<qint64, QVector<QString>> m_liveHistory;
|
|
QWebSocketServer *m_wsServer;
|
|
QTimer *m_cleanupTimer;
|
|
QSqlDatabase m_db;
|
|
NGL::INGLLogger &m_logger;
|
|
};
|
|
} // namespace ExerciseEventManagement
|