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,49 @@
|
||||
#include "toolz.h"
|
||||
|
||||
#include <LtsScriptTimeline/script_timeline.h>
|
||||
#include <LtsScriptTimeline/track_widget.h>
|
||||
#include <LtsScriptTimeline/track_content_widget.h>
|
||||
#include <LtsScriptTimeline/track_entry_painters.h>
|
||||
|
||||
|
||||
namespace PresentationManagement
|
||||
{
|
||||
void prepareScriptTimeline(LtsScriptTimeline::ScriptTimeline *scriptTimeline, const QString &screen1Text, const QString &screen2Text, const QString &replayText, const QString &audioText)
|
||||
{
|
||||
LtsScriptTimeline::TrackWidget *twScreen2 = scriptTimeline->addTrack(screen2Text);
|
||||
twScreen2->setInternalName(QStringLiteral("Screen 2"));
|
||||
twScreen2->getTrackContentWidget()->addDisallowedType(LtsScriptTimeline::TrackEntryType::SituationReplay);
|
||||
twScreen2->getTrackContentWidget()->addDisallowedType(LtsScriptTimeline::TrackEntryType::Snapshot);
|
||||
twScreen2->getTrackContentWidget()->addDisallowedType(LtsScriptTimeline::TrackEntryType::Audio);
|
||||
|
||||
|
||||
LtsScriptTimeline::TrackWidget *twScreen1 = scriptTimeline->addTrack(screen1Text);
|
||||
twScreen1->setInternalName(QStringLiteral("Screen 1"));
|
||||
twScreen1->getTrackContentWidget()->addDisallowedType(LtsScriptTimeline::TrackEntryType::SituationReplay);
|
||||
twScreen1->getTrackContentWidget()->addDisallowedType(LtsScriptTimeline::TrackEntryType::Snapshot);
|
||||
twScreen1->getTrackContentWidget()->addDisallowedType(LtsScriptTimeline::TrackEntryType::Audio);
|
||||
|
||||
|
||||
// Give both trackwidgets knowledge of each other which allows detecting collisions on both TrackEntryWidgets
|
||||
twScreen1->addCorrespondingTrackWidget(twScreen2->getTrackContentWidget());
|
||||
twScreen2->addCorrespondingTrackWidget(twScreen1->getTrackContentWidget());
|
||||
|
||||
|
||||
LtsScriptTimeline::TrackWidget *twReplay = scriptTimeline->addTrack(replayText, false);
|
||||
twReplay->setInternalName(QStringLiteral("Replay"));
|
||||
twReplay->getTrackContentWidget()->addAllowedType(LtsScriptTimeline::TrackEntryType::SituationReplay);
|
||||
twReplay->getTrackContentWidget()->addAllowedType(LtsScriptTimeline::TrackEntryType::Snapshot);
|
||||
twReplay->getTrackContentWidget()->addDisallowedType(LtsScriptTimeline::TrackEntryType::Audio);
|
||||
|
||||
// add replay to screens and vice versa
|
||||
twScreen1->addCorrespondingTrackWidget(twReplay->getTrackContentWidget());
|
||||
twScreen2->addCorrespondingTrackWidget(twReplay->getTrackContentWidget());
|
||||
twReplay->addCorrespondingTrackWidget(twScreen1->getTrackContentWidget());
|
||||
twReplay->addCorrespondingTrackWidget(twScreen2->getTrackContentWidget());
|
||||
|
||||
|
||||
LtsScriptTimeline::TrackWidget *twAudio = scriptTimeline->addTrack(audioText, false);
|
||||
twAudio->setInternalName(QStringLiteral("Audio"));
|
||||
twAudio->getTrackContentWidget()->addAllowedType(LtsScriptTimeline::TrackEntryType::Audio);
|
||||
}
|
||||
} // namespace PresentationManagement
|
||||
Reference in new issue
Block a user