Qt6 Migration: Complete migration with DDS/RTI support and build validation
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>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,112 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* The MessageModel class handles message related data
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Hannes Fritsche, SLSE, 2017-09-06
|
||||
*/
|
||||
|
||||
#include "message_model.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonArray>
|
||||
|
||||
MessageModel::MessageModel(QObject *parent)
|
||||
: LtsAbstractTableModel<MessageInfo>( { tr("Time"), tr("Direction"), tr("Type"), tr("UUID"), tr("Data") }, parent)
|
||||
{
|
||||
setData(QVector<MessageInfo>());
|
||||
}
|
||||
|
||||
void MessageModel::addMessage(MessageModel::MessageDirection direction, const QString &message)
|
||||
{
|
||||
QJsonParseError parseError;
|
||||
|
||||
QString uuid = QLatin1String("-");
|
||||
QString data = uuid;
|
||||
|
||||
QJsonDocument doc = QJsonDocument::fromJson(message.toLatin1(), &parseError);
|
||||
|
||||
QString type;
|
||||
|
||||
if (parseError.error != QJsonParseError::NoError)
|
||||
type = parseError.errorString();
|
||||
else if (!doc.isObject())
|
||||
type = QLatin1String("invalid");
|
||||
else
|
||||
{
|
||||
QJsonObject obj = doc.object();
|
||||
|
||||
type = obj.value(QLatin1String("type")).toString(QLatin1String("not present"));
|
||||
uuid = obj.value(QLatin1String("uuid")).toString(QLatin1String("not present"));
|
||||
|
||||
QJsonObject dataObj = obj.value(QLatin1String("data")).toObject();
|
||||
|
||||
if (dataObj.isEmpty())
|
||||
data = QLatin1String("not present");
|
||||
else
|
||||
data = QString::fromUtf8(QJsonDocument(dataObj).toJson());
|
||||
}
|
||||
|
||||
addMessage(direction, type, uuid, data);
|
||||
}
|
||||
|
||||
void MessageModel::addMessage(MessageModel::MessageDirection direction, const QString &type, const QString &uuid, const QString &data)
|
||||
{
|
||||
int32_t rows = rowCount();
|
||||
|
||||
onDataChanged({rows, toString(direction), type, uuid, data}, DataModification::eAdded);
|
||||
}
|
||||
|
||||
QVariant MessageModel::data(const QModelIndex &index, int role) const
|
||||
{
|
||||
if (role != Qt::DisplayRole || !indexIsValid(index))
|
||||
return QVariant();
|
||||
|
||||
const MessageInfo &infoData = m_vecData.at(index.row());
|
||||
|
||||
switch (index.column())
|
||||
{
|
||||
case TIME:
|
||||
return infoData.time.toString();
|
||||
case DIRECTION:
|
||||
return infoData.direction;
|
||||
case TYPE:
|
||||
return infoData.type;
|
||||
case UUID:
|
||||
return infoData.uuid;
|
||||
case DATA:
|
||||
{
|
||||
if (!infoData.data.size())
|
||||
return infoData.data;
|
||||
|
||||
QJsonObject obj = QJsonDocument::fromJson(infoData.data.toLatin1()).object();
|
||||
QString result = infoData.data;
|
||||
const QStringList keys = obj.keys();
|
||||
|
||||
for (const QString ¤tKey : keys)
|
||||
{
|
||||
const QJsonValue subObj = obj.value(currentKey);
|
||||
if (subObj.isArray())
|
||||
result.prepend(QStringLiteral("%1 size: %2\n").arg(currentKey).arg(subObj.toArray().size()));
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
return QVariant();
|
||||
}
|
||||
|
||||
QString MessageModel::toString(MessageModel::MessageDirection direction) const
|
||||
{
|
||||
switch (direction)
|
||||
{
|
||||
case TO_PROXY:
|
||||
return tr(" > to Proxy");
|
||||
case FROM_PROXY:
|
||||
return tr(" < from Proxy");
|
||||
default:
|
||||
return QString();
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user