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,83 @@
|
||||
/**
|
||||
* Websocket interface for building control unit
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Christian Ehrlicher, SLSE, 2017-01-30
|
||||
*/
|
||||
|
||||
#include "abstract_socket_handler.h"
|
||||
#include "guez_nasat_telegrams.h"
|
||||
#include "settings.h"
|
||||
#include <QDateTime>
|
||||
#include <QJsonDocument>
|
||||
|
||||
namespace GuezNasat
|
||||
{
|
||||
AbstractSocketHandler::AbstractSocketHandler(const char *loggerName, QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_logger(getLogger(loggerName))
|
||||
{}
|
||||
|
||||
void AbstractSocketHandler::setSimulationStatus(int nasatId, bool bActivateSimulation)
|
||||
{
|
||||
NasatSimulationRequest req;
|
||||
req.aircraftId = nasatId;
|
||||
req.timestamp = QDateTime::currentSecsSinceEpoch();
|
||||
req.enableSimulation = bActivateSimulation;
|
||||
const QPointF pos = Settings::simulationPositionDegree();
|
||||
req.position.lon = pos.x();
|
||||
req.position.lat = pos.y();
|
||||
sendTelegram(&req);
|
||||
}
|
||||
|
||||
bool AbstractSocketHandler::sendTelegram(const NasatBase *tele)
|
||||
{
|
||||
if (!isConnected() || !tele)
|
||||
return false;
|
||||
|
||||
QJsonObject obj;
|
||||
obj[QStringLiteral("data")] = tele->toJson();
|
||||
obj[QStringLiteral("type")] = tele->type();
|
||||
return sendTelegramInternal(QJsonDocument(obj).toJson(QJsonDocument::Compact));
|
||||
}
|
||||
|
||||
void AbstractSocketHandler::textMessageReceived(const QByteArray &msg)
|
||||
{
|
||||
if (msg.isEmpty())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Empty message received";
|
||||
return;
|
||||
}
|
||||
const QJsonObject obj = QJsonDocument::fromJson(msg).object();
|
||||
DEBUG_LOG(m_logger) << "incoming telegram: " << msg;
|
||||
|
||||
const QJsonValue type = obj.value(QStringLiteral("type"));
|
||||
if (!type.isString())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Can not read type id: " << msg;
|
||||
return;
|
||||
}
|
||||
const QString typeStr = type.toString();
|
||||
const QJsonObject data = obj.value(QStringLiteral("data")).toObject();
|
||||
try
|
||||
{
|
||||
if (typeStr.compare(Constraints<NasatPosition>::type(), Qt::CaseInsensitive) == 0)
|
||||
emit positionReceived(NasatPosition::fromJson(data));
|
||||
else if (typeStr.compare(Constraints<NasatWeaponRelease>::type(), Qt::CaseInsensitive) == 0)
|
||||
emit weaponReleaseReceived(NasatWeaponRelease::fromJson(data));
|
||||
else if (typeStr.compare(Constraints<NasatNineLiner>::type(), Qt::CaseInsensitive) == 0)
|
||||
emit nineLinerReceived(NasatNineLiner::fromJson(data));
|
||||
else if (typeStr.compare(Constraints<NasatSimulationStatus>::type(), Qt::CaseInsensitive) == 0)
|
||||
emit simulationStatusReceived(NasatSimulationStatus::fromJson(data));
|
||||
else
|
||||
ERROR_LOG(m_logger) << "Got unknown json telegram: " << msg;
|
||||
}
|
||||
catch (const JsonException &ex)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not parse json telegram: " << msg
|
||||
<< ", error: " << ex.what();
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace GuezNasat
|
||||
Reference in new issue
Block a user