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
+61
-4
@@ -14,13 +14,18 @@
|
||||
|
||||
#include <QCheckBox>
|
||||
#include <QInputDialog>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtWidgets/QLineEdit>
|
||||
#include <QJsonDocument>
|
||||
#include <QLineEdit>
|
||||
#include <QPushButton>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QTime>
|
||||
#include <QString>
|
||||
#include <QTime>
|
||||
#include <QVBoxLayout>
|
||||
|
||||
#include <QFileDialog>
|
||||
#include <QFile>
|
||||
#include <QMessageBox>
|
||||
#include <QSettings>
|
||||
|
||||
#include <AdlerJson/generatetelegrams.h>
|
||||
#include <AdlerJson/telegrams.h>
|
||||
|
||||
@@ -41,6 +46,7 @@ ICDTest::ICDTest(QWidget *parent)
|
||||
generatePositionReportsPage();
|
||||
generateTextMessagePage();
|
||||
generateErkundungsergebnissePage();
|
||||
generateFilePage();
|
||||
connect(m_ui->tbTrash, &QToolButton::clicked, m_ui->textEdit, &QTextEdit::clear);
|
||||
connect(m_ui->tbRestart, &QToolButton::clicked, this, &ICDTest::doRestart);
|
||||
connect(&m_heartbeatTimer, &QTimer::timeout, this, &ICDTest::generateConnectionTestMessage);
|
||||
@@ -1170,6 +1176,57 @@ void ICDTest::generateErkundungsergebnissePage()
|
||||
m_ui->toolBox->addItem(widget, tr("Erkundungsergebnisse"));
|
||||
}
|
||||
|
||||
void ICDTest::selectAndSendJson() {
|
||||
// 1. QSettings initialisieren
|
||||
QSettings settings(QStringLiteral("Legatus"), QStringLiteral("JsonWebsocketSender"));
|
||||
|
||||
// 2. Letzten Pfad auslesen (Standard: leerer String)
|
||||
QString lastDir = settings.value(QStringLiteral("lastDirectory"), QStringLiteral("")).toString();
|
||||
|
||||
// 3. Dialog mit dem letzten Pfad öffnen
|
||||
QString filePath = QFileDialog::getOpenFileName(this,
|
||||
tr("Select JSON file"),
|
||||
lastDir, // Hier wird der gemerkte Pfad übergeben
|
||||
tr("JSON Files (.json);;Text Files (.txt)"));
|
||||
|
||||
if (filePath.isEmpty()) return;
|
||||
|
||||
// 4. Neuen Pfad für das nächste Mal speichern
|
||||
QFileInfo fileInfo(filePath);
|
||||
settings.setValue(QStringLiteral("lastDirectory"), fileInfo.absolutePath());
|
||||
|
||||
// 5. Datei einlesen
|
||||
QFile file(filePath);
|
||||
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
|
||||
QMessageBox::critical(this, tr("Error"), tr("Couldn't open file"));
|
||||
return;
|
||||
}
|
||||
|
||||
m_pendingData = file.readAll();
|
||||
file.close();
|
||||
|
||||
QString message = QString::fromUtf8(m_pendingData);
|
||||
m_ui->textEdit->append(message);
|
||||
emit messsageToProxy(message);
|
||||
|
||||
}
|
||||
|
||||
void ICDTest::generateFilePage()
|
||||
{
|
||||
QVBoxLayout *lay = new QVBoxLayout(this);
|
||||
QSpacerItem *item = new QSpacerItem(1, 1, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding);
|
||||
QWidget *widget = new QWidget(this);
|
||||
|
||||
QPushButton *btnEXAQ = new QPushButton(tr("JSON Files"));
|
||||
connect(btnEXAQ, &QPushButton::clicked, this, &ICDTest::selectAndSendJson);
|
||||
lay->addWidget(btnEXAQ);
|
||||
|
||||
lay->addItem(item);
|
||||
widget->setLayout(lay);
|
||||
m_ui->toolBox->addItem(widget, tr("Load JSON File"));
|
||||
}
|
||||
|
||||
|
||||
void ICDTest::generateStatusPage()
|
||||
{
|
||||
QVBoxLayout *lay = new QVBoxLayout(this);
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <QTimer>
|
||||
#include <QWidget>
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
@@ -82,6 +82,7 @@ class ICDTest : public QWidget
|
||||
void generateEXFlugbahnberechnung(); // Flugbahnberechnung
|
||||
void generateEXFlugbahndaten(); // Flugbahndaten
|
||||
void onSendHeartbeatChanged();
|
||||
void selectAndSendJson();
|
||||
|
||||
private:
|
||||
void generateConnectionPage();
|
||||
@@ -91,6 +92,7 @@ class ICDTest : public QWidget
|
||||
void generateTrajectoryGenerationPage();
|
||||
void generateTextMessagePage();
|
||||
void generateErkundungsergebnissePage();
|
||||
void generateFilePage();
|
||||
void generateStatusPage();
|
||||
void generateEXSQWS_1WS(const QString &verein, const QString &kenner);
|
||||
|
||||
@@ -101,6 +103,7 @@ class ICDTest : public QWidget
|
||||
QTimer m_heartbeatTimer;
|
||||
QString m_lastFeuerkampfReferenz;
|
||||
QString m_fixedReference;
|
||||
QByteArray m_pendingData;
|
||||
};
|
||||
|
||||
} // namespace AdlerWebSocketSimulator
|
||||
Reference in new issue
Block a user