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>
107 lines
2.8 KiB
C++
Executable File
107 lines
2.8 KiB
C++
Executable File
/**
|
|
* @RDE_HEADER@
|
|
* The ClientMessage class is an abstract base class for concrete ClientMessage objects
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Philipp Dassow, SLST, 2017-12-05
|
|
*/
|
|
#pragma once
|
|
|
|
#include <QtCore/QJsonObject>
|
|
#include <QVector>
|
|
|
|
#include <DDS/Core/core.hpp>
|
|
|
|
#include <LtsWebSocket/client_message_factory.h>
|
|
#include <LtsWebSocket/client_message.h>
|
|
|
|
#include "logger.h"
|
|
|
|
namespace OcSituationClient
|
|
{
|
|
namespace WebSocketInterface
|
|
{
|
|
class DataManager;
|
|
|
|
namespace Messages
|
|
{
|
|
|
|
/**
|
|
* @brief The ClientMessageFactory class creates ClientMessages which will then be processed
|
|
*/
|
|
class ClientMessageFactory final : public LtsWebSocket::AbstractClientMessageFactory
|
|
{
|
|
public:
|
|
explicit ClientMessageFactory(DataManager *dataManager);
|
|
virtual ~ClientMessageFactory();
|
|
/**
|
|
* @brief create Only way to create a ClientMessage object
|
|
* @param message Text message which will be converted to a ClientMessage object
|
|
* @return A ClientMessage object, which represents a concrete ClientMessage
|
|
*/
|
|
LtsWebSocket::AbstractClientMessage *createMessage(LtsWebSocket::ReplyHandler *client,
|
|
const QString &message);
|
|
|
|
private:
|
|
DataManager *m_dataManager;
|
|
|
|
}; // class ClientMessageFactory
|
|
|
|
/**
|
|
* @brief The ClientMessage class is an abstract base class for concrete ClientMessage objects
|
|
*/
|
|
class ClientMessage : public LtsWebSocket::AbstractClientMessage
|
|
{
|
|
protected: // method
|
|
explicit ClientMessage(DataManager *dataManager, LtsWebSocket::ReplyHandler *client, const QString &type, const QString &uuid, const QJsonValue &data = QJsonValue());
|
|
|
|
protected: // attributes
|
|
DataManager *m_dataManager;
|
|
}; // class ClientMessage
|
|
|
|
// ################## Message Implementations ##################
|
|
class ServicePortsInformation : public ClientMessage
|
|
{
|
|
public:
|
|
explicit ServicePortsInformation (DataManager *dataManager, LtsWebSocket::ReplyHandler *client, const QString &type, const QString &uuid, const QJsonValue &data);
|
|
|
|
public:
|
|
|
|
/**
|
|
* @brief The PortInformation struct holds the information what kind of port we have here
|
|
*/
|
|
struct PortInformation
|
|
{
|
|
int32_t number;
|
|
int32_t type;
|
|
};
|
|
|
|
/**
|
|
* @brief The ServiceInformation struct information about a service
|
|
*/
|
|
struct ServiceInformation
|
|
{
|
|
QString name;
|
|
QString abbreviation;
|
|
QVector<PortInformation> ports;
|
|
};
|
|
|
|
/**
|
|
* @brief The ExerciseInformation struct with information about an exercise (could also be a replay)
|
|
*/
|
|
struct ExerciseInformation
|
|
{
|
|
int32_t exerciseId;
|
|
dds::core::optional<int32_t> replayPartitionId;
|
|
QVector<ServiceInformation> services;
|
|
};
|
|
|
|
void process();
|
|
bool hasValidData() const;
|
|
}; // class ServicesInformation
|
|
|
|
} // namespace Messages
|
|
} // namespace WebSocketInterface
|
|
} // namespace OcSituationClient
|