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>
69 lines
2.0 KiB
C++
69 lines
2.0 KiB
C++
/**
|
|
* Thin wrapper around json telegram data
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Christian Ehrlicher, SLSE, 2016-04-22
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <QJsonObject>
|
|
#include <QByteArray>
|
|
#include <CoPrtCnv/coprtcnv_export.h>
|
|
#include <TrainingAreaBase/training_area_telegrams.h>
|
|
|
|
namespace N_CoPrtCnv
|
|
{
|
|
/**
|
|
* The central-telegram, an subclass of XDR_Wrapper_it used for creation of
|
|
* telegrams with telegramId. It also contains the deletion of dynamic allocated
|
|
* space within central-telegrams.
|
|
*/
|
|
class COPRTCNV_EXPORT CoPrtCnvCentralTelegram final
|
|
{
|
|
public:
|
|
explicit CoPrtCnvCentralTelegram(TrainingAreaBase::TetraIcd::TelegramId telegramId)
|
|
: m_telegramId(telegramId)
|
|
{}
|
|
explicit CoPrtCnvCentralTelegram(const QByteArray &data)
|
|
: m_data(data)
|
|
, m_telegramId(TrainingAreaBase::TetraIcd::UNKNOWN)
|
|
{}
|
|
CoPrtCnvCentralTelegram(const QByteArray &data, TrainingAreaBase::TetraIcd::TelegramId telegramId)
|
|
: m_data(data)
|
|
, m_telegramId(telegramId)
|
|
{}
|
|
CoPrtCnvCentralTelegram(const QByteArray &data, const QJsonObject &json, TrainingAreaBase::TetraIcd::TelegramId telegramId)
|
|
: m_data(data)
|
|
, m_json(json)
|
|
, m_telegramId(telegramId)
|
|
{}
|
|
|
|
explicit CoPrtCnvCentralTelegram(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram &tele)
|
|
: m_telegramId(tele.id())
|
|
{
|
|
m_json[QStringLiteral("type")] = tele.type();
|
|
m_json[QStringLiteral("typeId")] = tele.id();
|
|
m_json[QStringLiteral("data")] = tele.toJson();
|
|
}
|
|
|
|
void setData(const QByteArray &data);
|
|
QByteArray data();
|
|
QJsonObject json(); // complete json
|
|
QJsonObject jsonData(); // json()["data"]
|
|
TrainingAreaBase::TetraIcd::TelegramId telegramId();
|
|
void setCounter(qint32 counter);
|
|
qint32 counter();
|
|
|
|
private:
|
|
void ensureJson();
|
|
void ensureByteArray();
|
|
private:
|
|
QByteArray m_data;
|
|
QJsonObject m_json;
|
|
TrainingAreaBase::TetraIcd::TelegramId m_telegramId;
|
|
};
|
|
|
|
}
|