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>
48 lines
1.2 KiB
C++
48 lines
1.2 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* LTS web socket server - Abstract Reply Message and Reply Handler
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Philipp Dassow, SLST, 2017-11-28
|
|
*/
|
|
|
|
#include "reply_message.h"
|
|
|
|
#include "json_keys.h"
|
|
|
|
#include <QUuid>
|
|
|
|
namespace LtsWebSocket
|
|
{
|
|
|
|
// ######## ReplyMessage begin ########
|
|
QString ReplyMessage::toJsonString() const
|
|
{
|
|
return QString::fromUtf8(QJsonDocument(m_jsonRepresentation).toJson(QJsonDocument::Compact));
|
|
}
|
|
|
|
ReplyMessage::ReplyMessage(const QString &type, const int typeId, const QString &uuid)
|
|
{
|
|
m_jsonRepresentation.insert(JsonKeys::TYPE(), type);
|
|
m_jsonRepresentation.insert(JsonKeys::TYPEID(), typeId);
|
|
|
|
if (!uuid.isEmpty())
|
|
m_jsonRepresentation.insert(JsonKeys::UUID_(), uuid);
|
|
}
|
|
// ######## ReplyMessage end ########
|
|
|
|
// ######## ErrorMessage begin ########
|
|
ErrorMessage::ErrorMessage(const ErrorMessage::ErrorData &data)
|
|
: ReplyMessage(JsonKeys::ERROR_(), -1, QUuid::createUuid().toString())
|
|
{
|
|
m_jsonRepresentation.insert(JsonKeys::DATA(),
|
|
QJsonObject({{JsonKeys::UUID_(), data.uuid},
|
|
{JsonKeys::ERROR_CLASS(), data.errorClass},
|
|
{JsonKeys::ERROR_MESSAGE(), data.errorMessage}
|
|
}));
|
|
}
|
|
// ######## ErrorMessage end ########
|
|
|
|
} // namespace LtsWebSocketServer
|