lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
272 Commits 11 Branches 0 Tags
ce111dffa48ba42ec00bd193fadd4c4a8873a15e
Commit Graph
72 Commits
Author SHA1 Message Date
Berrux Kana 3f7beb3c7e Qt6 migration: build fixes for Groups 10/11 + missing plugin modules 
Continue the Qt5->Qt6 migration so the LTS Projects (Group 10) and LTS
Application (Group 11) compile, link, and ctest runs.

Qt5->Qt6 API migration (resolves removed/deprecated Qt6 APIs) across Lts
Tools and Apps, e.g. QAction->QActionGroup, QAbstractSocket::errorOccurred,
Qt::SkipEmptyParts, QRandomGenerator, QInputDevice::DeviceType,
QRegularExpression, QLatin1Literal->QStringLiteral, and the SampleModel
m_description->description rename.

CMake build fixes:
- CMakeLists.txt: add Lts/Common to CMAKE_AUTOMOC_INCLUDE_DIRECTORIES so moc
  resolves Q_INTERFACES(ProjectPlugin::Plugin) for the migrated Projects.
- cmake/NGLMacros.cmake: NGL_COMPILE_RESOURCES - replace return() (which aborts
  the calling CMakeLists.txt) with an if/else/endif.
- OpApp/THP: guard the ArcGISQt5Hack link with $<IF:$<TARGET_EXISTS:...>> (the
  target is absent when the SituationMap viewer is stubbed); matches
  CentralEffectSimulation.
- LtsSession: prefer the in-tree svcCoreClient target over a FIND_LIBRARY in
  /usr/local/lib.
- CnrProxyTester/DotMatrixDisplay: set AUTOUIC_SEARCH_PATHS for the ui/ subdir.
- TopicDiscover: link NGLLogger.

Export-header visibility stubs (expand the empty *_EXPORT macro to
__attribute__((visibility("default"))); the build sets -fvisibility=hidden and
these stubs shadow the CMake-generated header):
- include/LtsProjectionWorkstation/ltsprojectionworkstation_export.h (fixes
  undefined reference to LtsProjectionWorkstation::getInstance /
  setProjectionOperatorPreset)
- include/LtsSession/ltssession_export.h, include/LtsUtilsGuiDds/ltsutilsguidds_export.h (same pattern)

New plugin modules (copied from legacy) so LtsAppDescriptorChecker finds the
gui:3 IIDs referenced by the Projects' apps.json:
- TakeHomePackageManager/OldTHP              gui:3:tpm.man, gui:3:tpm.usb
- PresentationManagement/.../ScriptEditor   gui:3:pre.script.edit
- Timeline/Gui/EventTimelineClassic         gui:3:tln.view

new_docker_build.sh: correct group targets to the actual CMake target names,
guard LtsReportDisplay on BUILD_CODIFICATION, and skip modules unavailable in
the prebuilt image (AsmWorkstationCertifier/botan2, TrajectoryWidget,
VideoImport, thp_viewer/VLC).
 2026-10-05 10:49:34 +02:00
berrux-dev 8345470273 fix Warning 2026-10-03 09:20:13 +02:00
berrux-dev 9c1ac7cbef Merge feature/lts-viewer-validation-testing-phase into feature/qt6-migration-basis-modules-merge 
Resolves 1 conflict (new_docker_build.sh, union of viewer-only + codification options); folds in fixes for pre-existing defects surfaced by the validation runs (KDReports-qt6 wiring, LtsSession RTI linking, LtsFileDialog/WLS/BSM Qt6/RTI API migration, GROUP4 target list, new --cmake_build_flags option); validated with BUILD_RTI=ON BUILD_GRANTLEE=ON in 3 Docker runs (run 3: build green, 6 base-state first-run CTest failures documented).
 2026-09-27 07:33:29 +02:00
berrux-dev 36f077bce4 Emit record_replay fromQVariant for plain enums; document PPM MOC exclusion 2026-09-26 00:49:47 +02:00
berrux-dev 5381c65fee Merge feature/qt6-migration-basis-modules-services into feature/qt6-migration-basis-modules 
Resolves 17 conflicts against legacy Qt5 semantics; validates with BUILD_RTI=ON BUILD_GRANTLEE=ON.
 2026-09-24 10:10:25 +02:00
berrux-dev 881d44f4dd Migrates residual Lts sources to generated rtiddsgen API 
Adds NmeaManagement tests, fixes codegen includes and Qt6 SerialPort CMake target.
 2026-09-23 12:05:37 +02:00
torsten ed9fc51e7a Migrates ./Lts/Viewer successfully to Qt6 2026-09-23 10:14:59 +02:00
torsten 0997dcba79 Fixes merge conflicts, but leaves out-of-DDS-scope build errors (tbc) 2026-09-21 17:04:53 +00:00
torstenandCopilot ab29b7b2d5 Merge origin/feature/migrate-and-test-DDS-targets into feature/qt6-migration-basis-modules 
Resolve merge conflicts between Qt6 migration basis modules and DDS test/target migration:

- codegen_simple.py: Keep Qt6 includes (generic_dtc_impl.h, service header)
- svc_ftc_impl.cpp.grantlee: Adopt DDS branch conditional logic ({% if ft.isCoreFt %})
- generic_dtc.h/.impl.h (include/ and Lts/): Keep Qt6 full-path includes, explicit wrapper methods for consistency
- connext.h: Add logger initialization for Requester/Replier (DDS branch enhancement)
- new_docker_build.sh:
  - Add GROUP4_TARGETS for DDS tests
  - Smart DOCKER_IMAGE selection (prebuilt vs ubuntu:26.04)
  - Add BUILD_TESTING=ON to cmake
  - Add Group 4 (DDS Tests) build step

Strategy: Preserve Qt6 migration decisions while incorporating DDS test/target changes.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
 2026-09-21 14:07:42 +00:00
torsten 7cd3e43959 Adds ktexttemplate as apt package to new_docker_build.sh and builds successfully 2026-09-21 15:43:39 +02:00
berrux-dev 29002f2a48 Migrates remaining include, viewer and DDS headers to rtiddsgen API 
Converts accessor calls to plain member access and fixes SituationMap CMake.
 2026-09-21 02:47:50 +02:00
berrux-dev e8d07af320 Adapts shared tests and common code to generated rtiddsgen API 
Updates test suites and Lts/Common consumers to plain member access.
 2026-09-21 02:44:07 +02:00
berrux-dev cf62b17d58 Reworks CMake wiring for Qt6 codegen include order 
Adds missing toolchain packages and include dirs so generated headers resolve.
 2026-09-21 02:42:27 +02:00
torsten a1914cb7d9 Adds succesfull lts/proxies migration & testsuite 2026-09-19 09:18:18 +00:00
berrux-dev 9e553e5d7a Links Qt6 WebSockets in LtsWebSocketCommon when real 2026-09-18 17:49:15 +02:00
berrux-dev 9a9a023b70 Links Qt6 WebSockets in httq when module is real 2026-09-18 17:49:15 +02:00
berrux-dev a318dbb64a Restores logger and db interface members in DataManagerBaseDl 2026-09-18 17:45:16 +02:00
berrux-dev 851cbd5cec Adapts codegen templates to rtiddsgen 7.7 plain data members 2026-09-18 17:45:15 +02:00
torsten f42bd0276c Integrates unittests for lts/services/s almost successfull into final validation phase 2026-09-17 07:17:28 +00:00
torsten 86f331341a Integrates unittests for lts/services/s almost successfull into final validation phase 2026-09-17 07:13:12 +00:00
torsten 80d73fc330 Integrates unittests for Lts/Services/S* into validation step 2026-09-16 19:13:40 +00:00
torstenandCopilot 691bf21f3e Replace Qt5:: with Qt6:: in 26 CMakeLists.txt files 
Qt6 migration: Update all target_link_libraries to use Qt6::Core, Qt6::Widgets,
Qt6::Network, Qt6::Svg, Qt6::Xml, Qt6::Concurrent, Qt6::PrintSupport, Qt6::Sql,
Qt6::Test, Qt6::WebSockets, Qt6::SerialPort instead of Qt5:: equivalents.

Affected components:
- Lts/Common: LtsRestClient, LtsWidgets
- Lts/Application: THP, SitMapReplayTest
- Lts/Plugins: ParticipantManagement, ServiceManagement
- Lts/Services: VideoOverlayManagement
- Lts/Tools: 18 tool CMakeLists.txt files

Validated with BUILD_RTI=ON and BUILD_RTI=OFF - both builds successful.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
 2026-09-15 19:38:18 +00:00
torstenandCopilot 7173785915 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>
 2026-09-15 18:20:26 +00:00
torsten be912de9d6 Removes .IDL warnings: multiple enum definitons and builtin-type collisions 2026-09-14 15:45:58 +00:00
torsten eb02c1f001 Removes code-generated files that were accidentally committed to the repo 2026-09-14 11:21:00 +00:00
torsten 3aa0b04ebd Cleans up only warnings and specific CMake/include path error in the Qt6 migration tree, using strictly minimal changes with minimal side effects. 2026-09-11 15:14:11 +00:00
torsten 8cec9973e7 Migration of Legatus codebase to Qt6 with RTI Connext DDS 7.7 integration is partially complete. Core DDS targets build successfully, but ProjectDataManagement module blocks full ddsfts compilation due to IDL definition conflicts. 2026-09-07 19:36:21 +02:00
torsten ba1d9e2c04 Migration of Legatus codebase to Qt6 with RTI Connext DDS 7.7 integration is partially complete. Core DDS targets build successfully, but ProjectDataManagement module blocks full ddsfts compilation due to IDL definition conflicts. 2026-09-07 19:30:39 +02:00
torsten b656e1aaa9 Resolves latest issues in Lts/Common Lts/DDS 2026-09-06 18:45:59 +02:00
torsten c270b7ebe7 Integrates qt6-ported code generator into qt6-overall-build-pipeline 2026-09-04 15:31:59 +02:00
torsten f528f9b609 Inserts ktexttemplate ported idl files parser 2026-09-02 20:32:15 +02:00
torsten 0c1503d85c Adds latest migration results 2026-09-01 12:27:57 +02:00
torstenandCopilot ad07345480 Grantlee Templates: Fix namespace resolution for RTI DTC generation 
- Changed {{ namespace }}::{{ dt.type }} to ::{{ namespace }}::{{ dt.type }}
  in svc_dtc.h.grantlee, svc_dtc_impl.cpp.grantlee, svc_dtc_impl.h.grantlee
- Ensures absolute namespace resolution for Core::* types
- Fixes MOC/compilation errors for CurrentRunningState, LockedEntity, etc.

- Updated CMakeLists.txt for RTI 7.7.0 detection with DDS_PATH
- Fixed RTI include paths (ndds/hpp and ndds directories)
- Updated Lts/DDS module files for Qt6/RTI 7.7 compatibility

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
 2026-08-31 12:51:26 +02:00
torsten bb1447c858 Qt6 migration fixes: RTI DDS alias targets, ErrorMessage namespace, DDS header include path 2026-08-27 09:02:26 +02:00
torstenandCopilot ec83f017be cmake: migrate Qt5:: to Qt6:: in LtsWidgets CMakeLists_rc.txt 
- Qt5::Core → Qt6::Core
- Qt5::Gui → Qt6::Gui
- Qt5::Widgets → Qt6::Widgets
- Qt5::Network → Qt6::Network
- Qt5::Svg → Qt6::Svg

Part of Qt5→Qt6 migration under C++17 constraint (RTI Connext DDS 7.7.0 blocker).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
 2026-08-25 15:27:14 +02:00
torstenandCopilot 0ca0e9ac60 SIGNAL/SLOT migration: lts_app_descriptor_editor.cpp and qsql_informix.cpp 
- Migrated 12 SIGNAL/SLOT connections in lts_app_descriptor_editor.cpp to function-pointer syntax
  - clicked, editingFinished, pressed, textChanged signals
  - Added required includes: QListView, QLineEdit, QPushButton
- Migrated 2 SIGNAL/SLOT connections in qsql_informix.cpp to function-pointer syntax
  - timeout signal connections
- Added Qt5::Core5Compat dependency for QTextCodec support in Qt6
  - Updated CMakeLists.txt to link Qt6::Core5Compat

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
 2026-08-25 09:24:42 +02:00
torstenandCopilot d7c8c9e6bd BUILD_RTI=ON: Fix DDS header includes and logger initialization 
- dynamic_data_reader.h: Add #include <rti/core/xtypes/DynamicDataImpl.hpp>
  to resolve incomplete type error when deleting DynamicDataImpl pointers

- generic_dts_impl.h: Add m_logger member variable declaration (LOGGER_T&)

- dynamic_data_reader.h: Add m_logger member variable declaration (LOGGER_T&)

- pub_sub_base.cpp: Fix logger initialization to use
  NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger() instead of
  non-existent NGL::getNGLLogger()

- lts_session_data_dds.h: Add DataPluginBase::Interface forward declaration
  to both #ifdef BUILD_RTI and #else blocks for consistent compilation

- LtsUtilsCore/CMakeLists.txt: Fix include path from /.. to /../..
  for LtsUtilsCoreHeaderOnly target

- tests/CMakeLists.txt: Move Grantlee test filtering BEFORE executable
  creation to prevent build failures when Grantlee is disabled

Build validation:
- BUILD_RTI=OFF: ✅ 0 errors (previously completed)
- BUILD_RTI=ON: ✅ DDS core components compile successfully
  - libddsconnector.so created successfully
  - Remaining build errors in unrelated modules (IsmDataPluginInterface,
    IsmShared, BuildingControlBsm) are pre-existing dependency issues

C++ Standard: Enforcing C++17 across all builds due to RTI Connext DDS 7.7.0
incompatibility with C++20/C++23 (known header bugs with newer standards).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
 2026-08-23 21:21:10 +02:00
torstenandCopilot 7a6be7474e Qt6 migration: Fix BUILD_RTI=OFF build errors in TrainingAreaBase 
- training_area_telegrams.cpp: Fixed QJsonObject initializer syntax (Qt6 requires {{}} not ({}))
- training_area_telegrams.cpp: Fixed fromJson() methods to access m_* members directly
- training_area_telegrams.cpp: Fixed brace mismatches in multiple toJson() methods
- training_area_telegrams.h: Changed Header struct to public members for consistency
- tx_mixin.cpp: Fixed getEquipmentNumber() template for direct member access
- lts_coordinate.cpp: Added missing #include <iomanip>
- MIGRATION_STATUS.md: Added migration progress tracking document

C++17 constraint enforced due to RTI Connext DDS 7.7.0 incompatibility with C++20+

Build status: BUILD_RTI=OFF successful (0 errors, warnings only)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
 2026-08-23 20:49:23 +02:00
torstenandCopilot 3d3c3b48fe Qt6 API fixes: QJsonObject and QJsonDocument serialization 
- training_area_telegrams.cpp:3168: Fixed QJsonObject initializer list syntax
  - Changed QJsonObject({{...}}) to QJsonObject{{...}} (double braces)
  - Changed header.toJson() to header().toJson() (method call)

- track_content_widget.cpp:37,51: Fixed QJsonDocument serialization
  - Replaced toBinaryData() with toJson(QJsonDocument::Compact)
  - Replaced fromBinaryData() with fromJson()
  - Qt6 removed binary serialization methods

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
 2026-08-23 18:38:42 +02:00
torsten c042faae9e Fix BUILD_RTI=OFF build: Guard RTI-only DDS modules 
- LtsUtilsSettings: Fix export header include path (angle brackets)
- LtsWidgets: Move LtsUtilsSettings to PUBLIC link libraries
- BatteryNotification: Remove unused QDesktopWidget include
- DDS/FTC: Wrap ddsftccore library in IF(BUILD_RTI) guards
- DDS/FTS: Remove ELSE block, wrap entire library in IF(BUILD_RTI)
- DDS/DTC: Wrap entire library definition in IF(BUILD_RTI)
- DDS/DTS: Wrap entire library definition in IF(BUILD_RTI)
- DDS/DDSConnector: Wrap entire library in IF(BUILD_RTI), remove ELSE
- DDS/Routing: Wrap entire library in IF(BUILD_RTI)

All RTI Connext DDS-specific libraries (ddscore, ddsQoS, ddsgen,
ddsdtc, ddsdts, ddsfts, ddsconnector, routing_plugin) are now
properly guarded so BUILD_RTI=OFF builds can succeed.
 2026-08-23 01:19:06 +02:00
torsten 950d669538 Qt6 Migration: BUILD_RTI guards und CMake fixes 
- BUILD_RTI conditional compilation für RTI Connext DDS dependencies
- Namespace fixes in core_dtc.h (Core:: → DDS::Core::)
- CMakeLists.txt: BUILD_RTI option und conditional dependencies
- Handler minelayer: namespace closing mit BUILD_RTI guard
- Build erfolgreich mit BUILD_RTI=OFF validiert

Signed-off-by: Torsten Wierschin <torsten.wierschin@life-maps.com>
 2026-08-21 18:37:18 +02:00
torsten c599be63e3 Qt6: QActionGroup Include in lts_text_editor2.cpp hinzufügen 
- #include <QActionGroup> hinzugefügt für Qt6-Kompatibilität
- Behebt 'incomplete type' Compiler-Fehler
- Teil der LtsWidgets Qt6-Migration
 2026-08-21 11:27:25 +02:00
torstenandCopilot 22a3a8d5b1 Fix Qt6 API compatibility in LtsWidgets 
- lts_date_time_edit_p.cpp: Replace QWheelEvent::delta() with angleDelta().y()
- lts_notification_box.cpp: Remove QStyleOption::init() call (removed in Qt6)
- lts_text_editor2.cpp: Remove QTextCodec include, use QString::fromUtf8 instead

All changes are Qt6 API compatibility fixes required for building with Qt 6.10.2.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
 2026-08-21 11:19:16 +02:00
torsten 418443c841 LtsWidgets: Qt6 API fixes complete 
- QComboBox::activated signal: QString→int parameter (lts_text_editor)
- qAsConst→std::as_const (5 files)
- localPos()→position() (lts_height_plot_widget)
- setMargin→setContentsMargins (tests/window.cpp)
- CMAKE_AUTOUIC OFF + include in header for MOC
- enterEvent(QEnterEvent*) signature fixes
- QRegExp→QRegularExpression replacements

All LtsWidgets module files now Qt6-compatible.
 2026-08-21 11:08:24 +02:00
torsten ffa25fb394 LtsWidgets: project_defines.h Include-Pfad korrigiert 2026-08-21 10:35:36 +02:00
torstenandCopilot d890b11c5f Qt6 Migration: LtsWidgets, BUILD_RTI Guards, externe Dependencies dokumentiert 
- LtsWidgets Verzeichnis vollständig migriert (Qt5→Qt6)
- BUILD_RTI Guards für RTI-spezifische Module hinzugefügt
- Externe Dependencies in EXTERNAL_DEPS.md dokumentiert
- Qt6 API-Änderungen: QRegExp→QRegularExpression, enterEvent(QEnterEvent*)
- AutoUic-Fehler bei ui_requirement behoben (SKIP_AUTOUIC)
- Include-Pfade korrigiert (LtsElevation, LtsMultiMonitor, LtsUtilsCore)
- MOC-Fehler behoben (Q_INTERFACES entfernt wo nicht benötigt)
- CMakeLists.txt Anpassungen für Qt6 (PUBLIC statt INTERFACE)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
 2026-08-21 10:29:34 +02:00
torsten 27fe03a03a WIP: Build fixes und EXTERNAL_DEPENDENCIES.md 2026-08-21 07:04:40 +02:00
torsten d17d397fe7 LtsUtilsCore: Alle Include-Pfade korrigiert (LtsUtils/ → LtsUtilsCore/) 
- CMakeLists.txt: Include-Pfade von ../ zu . geändert, json.h hinzugefügt
- ~95 Dateien: Include-Pfade systematisch korrigiert
  - LtsUtils/ → LtsUtilsCore/ für alle Core-Header
  - LtsUtilsGui/LtsUtils/LtsUtilsGui/ → LtsUtilsGui/LtsUtilsGuiDds/
- Logger-API: getLogger() mit const char* Parameter
- DataModification: enum class global (nicht im Lts-Namespace)
- Participant-Struct: Member mit m_-Präfix
- Export-Macro: SVCALMCOMMON_EXPORT statt ALMCOMMON_EXPORT
- Signal/Slot-Signaturen korrigiert für Qt6 template matching

Build validiert: LtsUtilsCore, LtsUtilsDds, LtsSessionData erfolgreich
 2026-08-21 01:49:35 +02:00
torsten c7fa97c8bf GuezNasat: DataModification-Type-Konsistenz und Include-Pfade korrigiert 
- gna_nasat_aircraft_model.h/.cpp: Include-Pfad zu <GuezNasat/logger.h>
  korrigiert, Logger-Initialisierung auf GuezNasat::getLogger() umgestellt
- gna_nasat_aircraft_part_model.h/.cpp: Methodensignaturen von
  ParticipantManagement::DataModification zu globalem DataModification
  geändert für konsistente Type-Verwendung
- gna_dtc.h: Include-Pfad für logger.h korrigiert
- gna_nasat_aircraft.h: Member-Variablen zu Getter-Methoden geändert
- CMakeLists.txt: Include-Verzeichnis für GuezNasat-Modul hinzugefügt

Alle Callback-Lambdas verwenden jetzt das globale DataModification-Enum
aus LtsUtilsCore statt dem veralteten ParticipantManagement-Namespace.
 2026-08-21 01:49:35 +02:00
torstenandCopilot e22dd98040 LtsSession: STUB-Unterstützung und Build-Fixes 
- lts_session_data_dds.h/cpp: BUILD_RTI guards für STUB/Real-Implementation
- Include-Pfad fix: DDS/QosProfile/DDS_DefaultQos (ohne .h)
- CMakeLists.txt: qtservice_export.h Includer Pfad korrigiert
- AdvancedSymbology/Data: Qt6 Core5Compat Verlinkung

RTI License: ~/swy/sandbox/rti_license.dat (leer, vom Installer)
ArcGIS SDK: ./external/ArcGIS/MapsSDK_Qt_300.0.0/

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
 2026-08-21 01:49:35 +02:00