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,56 @@
|
||||
/**
|
||||
* UAS Plugin Interface Factory
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Mike Wille, ESZS, 2025-04-17
|
||||
*/
|
||||
|
||||
#include "plugin.h"
|
||||
#include "plugin_instance.h"
|
||||
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
|
||||
#include <QSettings>
|
||||
#include <QDebug>
|
||||
|
||||
|
||||
namespace UAS
|
||||
{
|
||||
std::shared_ptr<TrainingAreaBase::Plugin::Interface> TabPluginUAS::createInterface(TrainingAreaBase::Plugin::DataProvider *dataProvider,
|
||||
const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb,
|
||||
const std::shared_ptr<TrainingAreaBase::TxMixin> &,
|
||||
const std::shared_ptr<TrainingAreaBase::DdsHandler> &ddsHandler,
|
||||
NGL::Settings *settings)
|
||||
{
|
||||
qDebug() << "UAS Plugin starting for ex "<<dataProvider->exerciseId()<<"!\n";
|
||||
|
||||
/* set this on the machine running the TMS-IF TrainingAreaBase plugin, to the
|
||||
* ip address of the interface of the server which is in the same network as the
|
||||
* gateway machines (e.g. Salchau's tds01 is 10.5.144.32 and the gateway machines
|
||||
* are in the same subnet, so enter "10.5.144.32" on tds01) */
|
||||
const QString ip(settings->settings()->value(QStringLiteral("UAS/TmsIfIpAddress"), QStringLiteral("127.0.0.1")).toString()); // 127.0.0.1 if IA runs on the same machine
|
||||
qDebug() << "TabPluginUAS::createInterface: TMS-IF will be started on the network interface with ip address: '" << ip << "' \n";
|
||||
qputenv("CYCLONEDDS_URI", QStringLiteral("<CycloneDDS><Domain><General><Interfaces><NetworkInterface address=\"%1\"></NetworkInterface></Interfaces></General></Domain></CycloneDDS>").arg(ip).toUtf8());
|
||||
|
||||
if ( !hostAvailable(ip))
|
||||
return nullptr;
|
||||
|
||||
return std::make_shared<PluginInstance>(dataProvider, recvFromTabCb, ddsHandler, settings);
|
||||
}
|
||||
|
||||
bool TabPluginUAS::hostAvailable(QString hostname) {
|
||||
|
||||
// Blocking call: This pauses execution until the lookup is finished
|
||||
QHostInfo info = QHostInfo::fromName(hostname);
|
||||
|
||||
// Check if the lookup was successful
|
||||
if (info.error() == QHostInfo::NoError) {
|
||||
qCritical() << "Success! Host found. IP addresses:" << hostname;
|
||||
return true;
|
||||
}
|
||||
// Handle errors like 'Host not found' or 'Network unreachable'
|
||||
return false;
|
||||
}
|
||||
|
||||
} // namespace UAS
|
||||
Reference in new issue
Block a user