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
+55
-46
@@ -1,5 +1,12 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* PresentationManagement - Script Editor
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*
|
||||
* Created by Mike Wille, SLSE, 2017-03-17
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
@@ -7,29 +14,29 @@
|
||||
#include "pre_journal_types.h"
|
||||
#include "pre_utils.h"
|
||||
|
||||
#include <Core/core_dtc.h>
|
||||
#include <DDS/Core/core_dtc.h>
|
||||
#include <LtsPluginManager/lts_plugin_manager.h>
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
#include <LtsUtilsGuiDds/request_helper.h>
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
#include <PluginInterfaces/topic_replay_interface.h>
|
||||
#include <PresentationManagement/Common/topic_assignment.h>
|
||||
#include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
|
||||
#include <SituationReplay/srp_gui_plugin_interface.h>
|
||||
#include <OperatorManagement/opm_dtc.h>
|
||||
#include <ExerciseManagement/exm_dtc.h>
|
||||
#include <PresentationManagement/pre_dtc.h>
|
||||
#include <PresentationManagement/pre_ftc.h>
|
||||
#include <SituationReplayManagement/srm_ftc.h>
|
||||
#include <Plugins/PresentationManagement/Gui/Common/topic_assignment.h>
|
||||
#include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
|
||||
#include <Plugins/SituationReplay/srp_gui_plugin_interface.h>
|
||||
#include <Services/OperatorManagement/opm_dtc.h>
|
||||
#include <Services/ExerciseManagement/exm_dtc.h>
|
||||
#include <Services/PresentationManagement/pre_dtc.h>
|
||||
#include <Services/PresentationManagement/pre_ftc.h>
|
||||
#include <Services/SituationReplayManagement/srm_ftc.h>
|
||||
#include <TopicEditorBase/topic_editor_utils.h>
|
||||
#include <LtsWidgets/lts_overlay_loading.h>
|
||||
|
||||
#include <functional>
|
||||
#include <memory>
|
||||
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QStringList>
|
||||
#include <QtCore/QMap>
|
||||
#include <QString>
|
||||
#include <QStringList>
|
||||
#include <QMap>
|
||||
#include <QTemporaryDir>
|
||||
|
||||
|
||||
@@ -60,13 +67,13 @@ class CoolExporter;
|
||||
namespace Interface { class Ftc; }
|
||||
|
||||
|
||||
|
||||
//template<typename Type = void *>
|
||||
class Scope
|
||||
{
|
||||
public:
|
||||
explicit Scope(const std::function<void (void)> &ctor, const std::function<void (void)> &dtor)
|
||||
|
||||
|
||||
//: m_fn(fn)
|
||||
//: m_data(ctor())
|
||||
: m_dtor(dtor)
|
||||
{
|
||||
ctor();
|
||||
@@ -77,15 +84,15 @@ public:
|
||||
m_dtor();
|
||||
}
|
||||
|
||||
// Scope(const std::function<Type (void)> &ctor, const std::function<void (Type)> &dtor)
|
||||
// //: m_fn(fn)
|
||||
// : m_data({})
|
||||
// {
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// }
|
||||
|
||||
private:
|
||||
|
||||
//Type m_data;
|
||||
std::function<void (void)> m_dtor;
|
||||
};
|
||||
|
||||
@@ -148,7 +155,7 @@ public:
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
// LtsDialog override
|
||||
void retranslate() override;
|
||||
bool apply() override;
|
||||
void aboutToClose() override;
|
||||
@@ -163,16 +170,16 @@ private:
|
||||
);
|
||||
bool getTopicItems();
|
||||
void getSitMapApp() noexcept(false);
|
||||
void getPresentationContent();
|
||||
void getPresentationContent(); // tryAddTopics has to be called first to populate m_topicAssignments
|
||||
void getProjectionWidget(Screen **pointerToWidgetPointer, bool placeAutomatically = false);
|
||||
|
||||
|
||||
// dds stuff
|
||||
bool enableFireEventFlash(bool enable);
|
||||
|
||||
|
||||
// io stuff
|
||||
void exportPresentationContent(const Core::FunctionReply &baseReply);
|
||||
|
||||
|
||||
// ui stuff
|
||||
void disableSessionDialog(LtsSession::LtsSession *session, bool disable);
|
||||
void startEssentialsViewStage2(const Core::ReplayPartition &replay, bool openTopicEditor, int topicType, int topicItemId);
|
||||
static bool hasEssentialsViewTopicType(TopicEditorBase::TopicType topicType);
|
||||
@@ -192,15 +199,15 @@ private:
|
||||
void enaDisa();
|
||||
void startEssentialsView(int topicItemId = -1, int topicType = -1, bool openTopicEditor = false);
|
||||
|
||||
|
||||
// topic stuff
|
||||
void openContextMenu(QPoint pos, int topicItemId);
|
||||
void setTopicDescription(int topicItemId);
|
||||
void enableTopicEditors(bool enable);
|
||||
|
||||
|
||||
// replay stuff
|
||||
qint64 positionTime() const;
|
||||
void setPositionTime(qint64 time, bool setByUser = false);
|
||||
void setPositionTimeActive(qint64 time, bool setByUser = false);
|
||||
void setPositionTimeActive(qint64 time, bool setByUser = false); // setPositionTime, but, if playing, also ticks and resets timeout
|
||||
void playTopic(int topicItemId);
|
||||
void pause();
|
||||
void stop(bool ended = false, bool ignoreFireEventFlashing = false);
|
||||
@@ -208,7 +215,7 @@ private:
|
||||
qint64 nextTopicTime() const;
|
||||
bool hasPreviousTopic() const { return previousTopicTime() > -1; }
|
||||
bool hasNextTopic() const { return nextTopicTime() > -1; }
|
||||
void removeTopicItemFromPlaylist(int topicItemId);
|
||||
void removeTopicItemFromPlaylist(int topicItemId); // WARNING: use a mutable iterator while iterating over m_currentlyPlayingTopics and remove the entry before calling this method!
|
||||
|
||||
bool isTopicAlreadyOpened(const TopicEditorBase::TopicData &data);
|
||||
template <typename TopicEditorInterface>
|
||||
@@ -252,7 +259,7 @@ private:
|
||||
QStringList &resultList,
|
||||
const SpecialTopicType &specialTopicType = SpecialTopicType::Normal)
|
||||
{
|
||||
|
||||
// qWarning() << "mep" << QStringLiteral("%1:%2").arg(QString::fromUtf8(__FILE__).split(QStringLiteral("/")).last()).arg(__LINE__);
|
||||
|
||||
if (isTopicDisabled(topicType))
|
||||
return true;
|
||||
@@ -307,7 +314,7 @@ private slots:
|
||||
void onDiscard();
|
||||
void onNull(QObject *obj);
|
||||
|
||||
|
||||
// io stuff
|
||||
void onLoad();
|
||||
void onExport();
|
||||
void onExport2();
|
||||
@@ -315,7 +322,7 @@ private slots:
|
||||
void onBurnDvD(const QString &strExportPath);
|
||||
void onBurningFinished(bool success);
|
||||
|
||||
|
||||
// ui stuff
|
||||
void onPresentationContent(const GetPresentationContentReply &reply);
|
||||
void onEssentialsView();
|
||||
void onTopicItemPositionChanged(QWidget *previewWidget, int ignoreTopicForReplay);
|
||||
@@ -327,16 +334,16 @@ private slots:
|
||||
void onTopicDesignerChangesMade();
|
||||
void onTopicEditorChangesSaved(const TopicEditorBase::TopicData &data);
|
||||
|
||||
|
||||
// topic stuff
|
||||
void onGetTopicEditor(const TopicEditorBase::TopicData &data);
|
||||
void onEditSelectedTopicItem();
|
||||
void onEditTopicItem(int itemId);
|
||||
void onRemoveSelectedTopics();
|
||||
void onContextMenu(QPoint pos);
|
||||
// void onMergeTopics();
|
||||
// void onSplitTopic();
|
||||
|
||||
|
||||
|
||||
|
||||
// replay stuff
|
||||
void onTimeout();
|
||||
void onPlay();
|
||||
void onPause();
|
||||
@@ -348,7 +355,7 @@ private slots:
|
||||
void onShowStoryboard();
|
||||
void onShowJournal();
|
||||
|
||||
|
||||
// other stuff
|
||||
bool checkBuildingViewerAndEssentialsView();
|
||||
|
||||
signals:
|
||||
@@ -358,14 +365,14 @@ signals:
|
||||
void scriptTick(qint64 positionTime);
|
||||
|
||||
private:
|
||||
LtsSession::LtsSession *m_exerciseSession { nullptr };
|
||||
LtsSession::LtsSession *m_exerciseSession { nullptr }; // aka. script editor app
|
||||
LtsSession::LtsSession *m_replaySession { nullptr };
|
||||
LtsSession::LtsSession *m_sitMapSession { nullptr };
|
||||
LtsSession::LtsSession *m_essentialsViewSession { nullptr };
|
||||
LtsPluginManager::LtsPluginManager *m_essentialsViewApp { nullptr };
|
||||
LtsPluginManager::LtsPluginManager *m_sitMapApp { nullptr };
|
||||
LtsUtils::RequestHelper *m_requestHelper { nullptr };
|
||||
TakeHomePackageGenerator::ExportProcess *m_exportProcess { nullptr };
|
||||
TakeHomePackageGenerator::ExportProcess *m_exportProcess { nullptr }; // OLD exporter!
|
||||
|
||||
std::shared_ptr<Core::Interface::Dtc> m_coreDtc { nullptr };
|
||||
std::shared_ptr<PresentationManagement::Interface::Dtc> m_dtc { nullptr };
|
||||
@@ -402,7 +409,7 @@ private:
|
||||
int m_selectedTeId;
|
||||
QMap<QString, TopicAssignment> m_topicAssignments;
|
||||
QMap<TopicEditorBase::TopicType, TopicAssignment> m_trackEntryToTopicAssignment;
|
||||
QMultiMap<int, LtsScriptTimeline::TrackEntry *> m_topicMap;
|
||||
QMultiMap<int, LtsScriptTimeline::TrackEntry *> m_topicMap; // <seconds, trackEntry>
|
||||
|
||||
QTimer *m_presentationTimer { nullptr };
|
||||
qint64 m_firstTopicTime { -1 };
|
||||
@@ -431,7 +438,8 @@ private:
|
||||
|
||||
Ui::ScriptDialog *m_ui { nullptr };
|
||||
bool m_lastScriptHasEnded { false };
|
||||
QMap<TopicEditorBase::TopicType, int> m_avaibleTopics{};
|
||||
NGL::INGLLogger &m_logger;
|
||||
QMap<TopicEditorBase::TopicType, int> m_avaibleTopics{}; // <data.topicType, data.id>
|
||||
QVector<TopicEditorBase::TopicType> m_modifiedTopicTypesList;
|
||||
|
||||
LtsSession::LtsSession *m_session { nullptr };
|
||||
@@ -456,6 +464,7 @@ private:
|
||||
ScriptTimelineDialog &m_this;
|
||||
std::unique_ptr<LtsWidgets::LtsOverlayLoading> m_loading;
|
||||
bool m_stoppedPrematurely { false };
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
} // namespace PresentationManagement
|
||||
Reference in new issue
Block a user