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>
88 lines
1.8 KiB
C++
88 lines
1.8 KiB
C++
/**
|
|
* Thin wrapper around json telegram data
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Christian Ehrlicher, SLSE, 2016-04-22
|
|
*/
|
|
|
|
#include "CoPrtCnvCentralTelegram.hpp"
|
|
#include <QJsonDocument>
|
|
|
|
namespace N_CoPrtCnv
|
|
{
|
|
|
|
void CoPrtCnvCentralTelegram::setData(const QByteArray &data)
|
|
{
|
|
m_data = data;
|
|
m_json = QJsonObject();
|
|
}
|
|
|
|
QByteArray CoPrtCnvCentralTelegram::data()
|
|
{
|
|
ensureByteArray();
|
|
return m_data;
|
|
}
|
|
|
|
QJsonObject CoPrtCnvCentralTelegram::json()
|
|
{
|
|
ensureJson();
|
|
return m_json;
|
|
}
|
|
|
|
QJsonObject CoPrtCnvCentralTelegram::jsonData()
|
|
{
|
|
return json()[QStringLiteral("data")].toObject();
|
|
}
|
|
|
|
TrainingAreaBase::TetraIcd::TelegramId CoPrtCnvCentralTelegram::telegramId()
|
|
{
|
|
if (m_telegramId != TrainingAreaBase::TetraIcd::UNKNOWN)
|
|
return m_telegramId;
|
|
|
|
ensureJson();
|
|
m_telegramId = static_cast<TrainingAreaBase::TetraIcd::TelegramId>(m_json[QStringLiteral("typeId")].toInt());
|
|
return m_telegramId;
|
|
}
|
|
|
|
void CoPrtCnvCentralTelegram::setCounter(qint32 counter)
|
|
{
|
|
if (m_json.isEmpty())
|
|
m_json = QJsonDocument::fromJson(m_data).object();
|
|
m_json[QStringLiteral("counter")] = counter;
|
|
m_data.clear();
|
|
}
|
|
|
|
qint32 CoPrtCnvCentralTelegram::counter()
|
|
{
|
|
ensureJson();
|
|
const QString key(QStringLiteral("counter"));
|
|
const QJsonValue sendCounter(m_json[key]);
|
|
if (!sendCounter.isDouble())
|
|
throw TrainingAreaBase::TetraIcd::JsonException(m_json, key);
|
|
return sendCounter.toInt(-1);
|
|
}
|
|
|
|
void CoPrtCnvCentralTelegram::ensureJson()
|
|
{
|
|
if (m_json.isEmpty())
|
|
{
|
|
if (m_data.isEmpty())
|
|
return;
|
|
m_json = QJsonDocument::fromJson(m_data).object();
|
|
}
|
|
}
|
|
|
|
void CoPrtCnvCentralTelegram::ensureByteArray()
|
|
{
|
|
if (m_data.isEmpty())
|
|
{
|
|
if (m_json.isEmpty())
|
|
return;
|
|
m_data = QJsonDocument(m_json).toJson(QJsonDocument::Compact);
|
|
}
|
|
}
|
|
|
|
|
|
} // namespace N_CoPrtCnv
|