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,64 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Main for SitMapReplayTest
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Christian Ehrlicher, SLSE, 2016-02-29
|
||||
*/
|
||||
|
||||
#include <nglapplication/nglapplication.h>
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <DDS/QosProfile/DDS_DefaultQos.h>
|
||||
#include <QNetworkProxy>
|
||||
#include <SituationReplay/main_handler_sqlite.h>
|
||||
#include <SituationMap/situation_map_init.h>
|
||||
#include <SituationMap/Utils/movement_track_manager.h>
|
||||
#include "../thp_plugin_provider.h"
|
||||
#include "srp_main_window.h"
|
||||
#include "ui_srp_main_window.h"
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
QNetworkProxy::setApplicationProxy(QNetworkProxy());
|
||||
NGLApplication app(argc, argv);
|
||||
app.createLogger("SRP");
|
||||
app.setAttribute(Qt::AA_UseHighDpiPixmaps);
|
||||
|
||||
SituationReplay::ConnectionParams connParams;
|
||||
connParams.domainId = 1;
|
||||
connParams.partitionId = 1;
|
||||
std::shared_ptr<SituationReplay::MainHandlerSqlite> srpMainHandler(new SituationReplay::MainHandlerSqlite);
|
||||
if (!srpMainHandler->initDds(connParams))
|
||||
return 1;
|
||||
// TODO: fixme or trash me
|
||||
SituationReplay::ReplayInformation ri;
|
||||
ri.databaseFilePath = QStringLiteral("dump.sqlite");
|
||||
ri.replayConfigPath = QStringLiteral("dump.json");
|
||||
if (!srpMainHandler->initDb(ri, {}, {}))
|
||||
return 2;
|
||||
|
||||
std::shared_ptr<DDSConnector::DdsConnector> ddsConn = srpMainHandler->ddsReplay();
|
||||
THP::SitMapPluginProvider *pp = new THP::SitMapPluginProvider;
|
||||
pp->init(ddsConn);
|
||||
|
||||
SituationMap::SituationMapInit *smi = new SituationMap::SituationMapInit(nullptr);
|
||||
smi->initPluginProvider(pp);
|
||||
|
||||
QPointer<SituationMap::MovementTrackManager> movementTrackMgr =
|
||||
QPointer<SituationMap::MovementTrackManager>(new SituationMap::MovementTrackManager(smi));
|
||||
|
||||
smi->initAdapter(movementTrackMgr, false);
|
||||
smi->initMap(true, SituationMap::Mode::Mode_2D);
|
||||
|
||||
SituationReplay::MainWindow *mw = new SituationReplay::MainWindow(smi, srpMainHandler->handlerSrp());
|
||||
mw->show();
|
||||
|
||||
int ret = app.exec();
|
||||
|
||||
delete mw;
|
||||
delete smi;
|
||||
delete pp;
|
||||
ddsConn.reset();
|
||||
return ret;
|
||||
}
|
||||
Reference in new issue
Block a user