From 131a6714cf95189098c81e3019c4b2b2442176b0 Mon Sep 17 00:00:00 2001 From: berrux_dev Date: Wed, 21 Oct 2026 10:18:32 +0200 Subject: [PATCH 1/6] Restore BZip2 in nglcompression (legacy REQUIRED it) Define HAVE_BZIP2 so the real impl compiles instead of the stub; link libbz2; nglcomp_test green --- .../Z/src/nglcompression/CMakeLists.txt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/CMakeLists.txt index a4e2f7ca7..2804f874b 100755 --- a/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Z/src/nglcompression/CMakeLists.txt @@ -5,9 +5,8 @@ # $Author$ # -# BZip2 stub - libbz2-dev not available, disable bzip2 support -SET(HAVE_BZIP2 FALSE) -MESSAGE(STATUS "BZip2 disabled - development headers not available") +# BZip2 (legacy REQUIRED it; defines HAVE_BZIP2 so the real impl compiles instead of the stub) +FIND_PACKAGE(BZip2 REQUIRED) SET(nglcomp_SRCS nglcomp_bzip2iodevice.cpp @@ -25,8 +24,14 @@ NGL_TARGET_LINK_LIBRARIES(nglcompression PRIVATE Qt6::Concurrent NGLLogger + ${BZIP2_LIBRARIES} ) -# BZip2 disabled - no linking needed +NGL_TARGET_INCLUDE_DIRECTORIES(nglcompression + PRIVATE + ${BZIP2_INCLUDE_DIR} +) +# Enable the real bzip2 impl (guard in nglcomp_bzip2iodevice.{h,cpp}); legacy always compiled it +TARGET_COMPILE_DEFINITIONS(nglcompression PRIVATE HAVE_BZIP2) NGL_INSTALL_TARGET(nglcompression) IF(BUILD_WS AND BUILD_TESTING) From e067c21b0dda2543c01762c1d58818fa36a93bd0 Mon Sep 17 00:00:00 2001 From: berrux_dev Date: Wed, 21 Oct 2026 13:50:10 +0200 Subject: [PATCH 2/6] Enable Codification/OHP/PlanEditor/OrgChart plugin groups (G12 225); harden new_docker_build.sh First-build fixes (DDS members, Qt6 transitive WebChannel/PrintSupport drops, logger init, Qt5 guard); script: log_warn, BUILD_WLS default ON, Poppler image+APT, XmlPatterns 6.0 wording --- qt6-after/qt6-migrated-legatus/.envrc | 1 + qt6-after/qt6-migrated-legatus/CMakeLists.txt | 31 +++ .../cod_assign_codification_data_table.cpp | 14 +- .../ParticipantManagement/CMakeLists.txt | 5 +- .../Gui/ParticipantOrgChart/CMakeLists.txt | 3 + .../participant_org_chart.cpp | 33 ++-- .../participant_org_chart.h | 3 +- .../Lts/Plugins/PlanEditor/CMakeLists.txt | 3 + .../Gui/plan_editor_gui_plugin.cpp | 58 +++--- .../Gui/plan_editor_gui_plugin.h | 2 +- .../qt6-migrated-legatus/new_docker_build.sh | 186 +++++++++++++++++- 11 files changed, 278 insertions(+), 61 deletions(-) diff --git a/qt6-after/qt6-migrated-legatus/.envrc b/qt6-after/qt6-migrated-legatus/.envrc index ea7026e9e..ccbc58ca6 100644 --- a/qt6-after/qt6-migrated-legatus/.envrc +++ b/qt6-after/qt6-migrated-legatus/.envrc @@ -1,4 +1,5 @@ # export MIGRATE_PIPELINE_ROOT="/home/torsten/sandbox/qt6-migration-pipeline" export MIGRATE_PIPELINE_ROOT="/home/nkana/repo/qt6-migration-pipeline" +export CLAUDE_CODE_MAX_OUTPUT_TOKENS=16000 export LANG=C.UTF-8 export LC_ALL=C.UTF-8 \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/CMakeLists.txt index a9042d043..87bc4a0a3 100755 --- a/qt6-after/qt6-migrated-legatus/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/CMakeLists.txt @@ -360,6 +360,37 @@ if(NOT Qt6_FOUND) message(STATUS "Found Qt6 (minimal): ${Qt6Core_VERSION}") endif() +# Qt6::XmlPatterns (consumed by the MSDL/Saab import libs, gated by +# BUILD_PLUGINS_MSDL / BUILD_PLUGINS_SAAB): the XmlPatterns module (its own +# qtxmlpatterns repo) was removed in Qt 6.0 and never re-introduced, so no Qt 6 +# install carries it. It is NOT part of the component lists above (a missing +# component there would flip Qt6_FOUND off and disable the whole GUI path). +# Find it separately; when absent the two plugins must stay disabled - their +# CMakeLists reference Qt6::XmlPatterns in link libraries and CMake errors at +# generate time for an undefined namespaced target. +if(NOT TARGET Qt6::XmlPatterns) + find_package(Qt6XmlPatterns QUIET) + if(Qt6XmlPatterns_FOUND) + message(STATUS "Found Qt6XmlPatterns") + else() + message(STATUS "Qt6XmlPatterns not found (PpmMSDLGuiPlugin/PpmSAABGuiPlugin require it; keep BUILD_PLUGINS_MSDL/BUILD_PLUGINS_SAAB OFF)") + endif() +endif() + +# Qt6::WebChannel (consumed by PpmOrgChartGuiPlugin's QWebChannel page setup): +# in Qt5 Qt5::WebEngineWidgets transitively linked Qt5::WebChannel (Qt5's +# webengine depended on webchannel), but Qt6 dropped that dependency, so the +# module must be found and linked explicitly. Separate QUIET find - never let +# a missing optional component flip Qt6_FOUND off. +if(NOT TARGET Qt6::WebChannel) + find_package(Qt6 6.2 COMPONENTS WebChannel QUIET) + if(Qt6WebChannel_FOUND) + message(STATUS "Found Qt6WebChannel") + else() + message(STATUS "Qt6WebChannel not found (PpmOrgChartGuiPlugin requires it; keep BUILD_PLUGINS_PARTICIPANT_ORG_CHART OFF)") + endif() +endif() + # Manual Qt6 configuration - create imported targets for available libraries if(NOT TARGET Qt6::Core) find_package(Qt6 6.2 COMPONENTS Core REQUIRED) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_assign_codification_data_table.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_assign_codification_data_table.cpp index d9e0ad4fe..38eaba6c2 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_assign_codification_data_table.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_assign_codification_data_table.cpp @@ -64,20 +64,20 @@ bool AssignCodificationDataTable::init(const std::shared_ptrpartyLayout->addWidget(new QLabel(partyName, this), i, 0, 1, 1); LtsWidgets::LtsComboBox* cb = new LtsWidgets::LtsComboBox(this); - cb->setProperty(QLatin1String("partyId").data(), party.id()); + cb->setProperty(QLatin1String("partyId").data(), party.id); m_tableVec.append(cb); cb->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred); cb->addItem(QStringLiteral("---"), 0); @@ -88,7 +88,7 @@ bool AssignCodificationDataTable::init(const std::shared_ptrdata(m_model->index(row, CodificationDataOverviewModel::Id), Qt::DisplayRole)); DEBUG_LOG(m_logger) - << "Init Combobox[" << row << "]: PartyId: " << party.id() << " Identifier: " + << "Init Combobox[" << row << "]: PartyId: " << party.id << " Identifier: " << m_model->data(m_model->index(row, CodificationDataOverviewModel::Identifier), Qt::DisplayRole) .toString() << " CodTabId: " @@ -105,7 +105,7 @@ bool AssignCodificationDataTable::init(const std::shared_ptrdata(m_model->index(row, CodificationDataOverviewModel::Id), Qt::DisplayRole).toInt(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/CMakeLists.txt index ccc9903c6..7af92847b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/CMakeLists.txt @@ -91,7 +91,10 @@ ADD_INTERFACE_LIBRARY(PpmDataPluginInterface svcPpmCommon ) -IF(Qt5WebEngineWidgets_VERSION VERSION_GREATER 5.7.9) +# Qt6 Migration: legacy guarded on Qt5WebEngineWidgets_VERSION > 5.7.9; the +# Qt6 equivalent is that the Qt6::WebEngineWidgets target exists (consumer +# plugins are additionally gated by BUILD_PLUGINS_PARTICIPANT_ORG_CHART). +IF(TARGET Qt6::WebEngineWidgets) # # Combat Power Gui Plugin Interface # diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/CMakeLists.txt index 6196d3a23..a87fe3829 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/CMakeLists.txt @@ -44,6 +44,9 @@ if(QT6_GUI_AVAILABLE) ${Qt6_Widgets} Qt6::WebEngineCore Qt6::WebEngineWidgets + # Qt6 Migration: Qt5::WebEngineWidgets transitively linked Qt5::WebChannel; + # Qt6 dropped that dependency, so link the module explicitly. + Qt6::WebChannel LtsSession NGLLogger PUBLIC diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart.cpp index e98f04287..21bd59f55 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart.cpp @@ -2,6 +2,7 @@ #include "participant_org_chart.h" #include "ui_participant_org_chart.h" +#include #include #include @@ -16,9 +17,9 @@ namespace ParticipantManagement inline bool compareState(const StateInformation &a, const StateInformation &b) { - if (a.stateTime() != b.stateTime()) - return a.stateTime() < b.stateTime(); - return a.vulnerabilityState() < b.vulnerabilityState(); + if (a.stateTime != b.stateTime) + return a.stateTime < b.stateTime; + return a.vulnerabilityState < b.vulnerabilityState; } LtsParticipantsOrgChart::LtsParticipantsOrgChart(QWidget *parent) @@ -32,6 +33,7 @@ LtsParticipantsOrgChart::LtsParticipantsOrgChart(QWidget *parent) , m_dtc(nullptr) , m_asbItc(nullptr) , m_ui(new Ui::LtsParticipantsOrgChart) + , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { m_ui->setupUi(this); } @@ -137,16 +139,16 @@ void LtsParticipantsOrgChart::loadParty(int partyId) for (const ParticipantManagement::Participant &part : participantMap) { - if (part.isDeleted() || part.partyId() != m_partyId) + if (part.isDeleted || part.partyId != m_partyId) continue; - if (part.superiorId() == 0) + if (part.superiorId == 0) { root = part; break; } } - if (root.inferiorIds().size() == 0) + if (root.inferiorIds.size() == 0) { m_dataSource = preDefThing; m_ui->wevOrgChart->reload(); @@ -166,10 +168,10 @@ void LtsParticipantsOrgChart::loadParty(int partyId) connect(m_participantOrgChart_MimeDataHelper.data(), &ParticipantOrgChart_MimeDataHelper::finished, this, &LtsParticipantsOrgChart::onParticipantOrgChart_MimeDataHelperFinished); - m_participantOrgChart_MimeDataHelper->run(root.id(), + m_participantOrgChart_MimeDataHelper->run(root.id, false, - AdvancedSymbology::roleToRole<>(m_dtc->party(m_partyId).role()), - QColor::fromRgb(QRgb(m_dtc->party(m_partyId).color())), + AdvancedSymbology::roleToRole<>(m_dtc->party(m_partyId).role), + QColor::fromRgb(QRgb(m_dtc->party(m_partyId).color)), m_useSymData); } @@ -231,10 +233,10 @@ bool LtsParticipantsOrgChart::loadTemplate(int templateRootId) connect(m_participantOrgChart_MimeDataHelper.data(), &ParticipantOrgChart_MimeDataHelper::finished, this, &LtsParticipantsOrgChart::onParticipantOrgChart_MimeDataHelperFinished); - m_participantOrgChart_MimeDataHelper->run(root.templateId(), + m_participantOrgChart_MimeDataHelper->run(root.templateId, false, - AdvancedSymbology::roleToRole<>(m_dtc->party(m_partyId).role()), - QColor::fromRgb(QRgb(m_dtc->party(m_partyId).color())), + AdvancedSymbology::roleToRole<>(m_dtc->party(m_partyId).role), + QColor::fromRgb(QRgb(m_dtc->party(m_partyId).color)), false); return true; @@ -258,8 +260,8 @@ void LtsParticipantsOrgChart::updateParticipant(int participantId) helper->run(participantId, true, - AdvancedSymbology::roleToRole<>(m_dtc->party(m_partyId).role()), - QColor::fromRgb(QRgb(m_dtc->party(m_partyId).color())), + AdvancedSymbology::roleToRole<>(m_dtc->party(m_partyId).role), + QColor::fromRgb(QRgb(m_dtc->party(m_partyId).color)), m_useSymData); } @@ -301,8 +303,7 @@ void LtsParticipantsOrgChart::getWholeHierarchy() WebNofitifier::WebNofitifier(QObject *parent) : QObject(parent) , m_currentJsonString(QString()) , m_updateString(QString()) - , m_updateTimer(new QTimer(this)), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { + , m_updateTimer(new QTimer(this)) { connect(m_updateTimer, &QTimer::timeout, this, &WebNofitifier::onTimerTick); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart.h index 3dd5f2f0c..94b3e40a4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart.h @@ -97,7 +97,6 @@ signals: private: -NGL::INGLLogger &m_logger; int m_partyId; bool m_useSymData; bool m_isMenuEnabled; @@ -114,6 +113,8 @@ NGL::INGLLogger &m_logger; std::shared_ptr m_dtc; std::shared_ptr m_asbItc; Ui::LtsParticipantsOrgChart *m_ui; + + NGL::INGLLogger &m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/CMakeLists.txt index d9ecbb0a3..3432eb9c2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/CMakeLists.txt @@ -75,6 +75,9 @@ if(QT6_GUI_AVAILABLE) LtsSessionData NGLLogger Qt6::Xml + # Qt6 Migration: Qt5::WebEngineWidgets transitively linked Qt5::PrintSupport + # (plan_editor.cpp includes ); Qt6 dropped that. + Qt6::PrintSupport ngltranslator PUBLIC diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/PlanEditorPlugin/Gui/plan_editor_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/PlanEditorPlugin/Gui/plan_editor_gui_plugin.cpp index 730a586c8..2fb0be259 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/PlanEditorPlugin/Gui/plan_editor_gui_plugin.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/PlanEditorPlugin/Gui/plan_editor_gui_plugin.cpp @@ -23,7 +23,7 @@ #include -#include +#include #include #include @@ -475,9 +475,9 @@ bool InterfaceImpl::fmsCreatePlan(bool clearGeometryModel) FileManagement::FileContent fc = m_internal->m_flmDtc->fileContent(fileId); - m_internal->m_currentFolderId = fc.folderId(); + m_internal->m_currentFolderId = fc.folderId; m_internal->m_currentFileId = fileId; - m_internal->m_currentNameOfPlan = QString::fromStdString(fc.name()); + m_internal->m_currentNameOfPlan = QString::fromStdString(fc.name); QFileInfo fileInfo(m_internal->m_currentNameOfPlan); m_internal->m_planEditor->setNameOfPlan(fileInfo.baseName()); @@ -511,7 +511,7 @@ bool InterfaceImpl::fmsModifyPlan(int fileId, bool saveAs) } FileManagement::FileContent fileContent = m_internal->m_flmDtc->fileContent(fileId); - bool differentUser = fileContent.operatorId() != LtsSessionData::LtsSessionData::getInstance()->getOperatorId(); + bool differentUser = fileContent.operatorId != LtsSessionData::LtsSessionData::getInstance()->getOperatorId(); if (saveAs || differentUser) { @@ -527,8 +527,8 @@ bool InterfaceImpl::fmsModifyPlan(int fileId, bool saveAs) } - QString nameOfPlan = QString::fromStdString(fileContent.name()); - m_internal->m_currentFolderId = fileContent.folderId(); + QString nameOfPlan = QString::fromStdString(fileContent.name); + m_internal->m_currentFolderId = fileContent.folderId; m_internal->m_currentNameOfPlan = nameOfPlan; m_internal->m_currentFileId = fileId; @@ -592,7 +592,7 @@ void InterfaceImpl::fmsReadPlan() m_internal->m_planEditor->onPlanReset(); FileManagement::FileContent fc = m_internal->m_flmDtc->fileContent(fileId); - QString nameOfPlan = QString::fromStdString(fc.name()); + QString nameOfPlan = QString::fromStdString(fc.name); if (content.size() == 0) { @@ -606,8 +606,8 @@ void InterfaceImpl::fmsReadPlan() m_internal->m_planEditor->setPlan(content); m_internal->m_currentNameOfPlan = nameOfPlan; - m_internal->m_currentFolderId = fc.folderId(); - m_internal->m_currentFileId = fc.id(); + m_internal->m_currentFolderId = fc.folderId; + m_internal->m_currentFileId = fc.id; QFileInfo fileInfo(m_internal->m_currentNameOfPlan); m_internal->m_planEditor->setNameOfPlan(fileInfo.baseName()); @@ -650,7 +650,7 @@ void InterfaceImpl::fmsImportPlan() if (fileId > 0) { FileManagement::FileContent fc = m_internal->m_flmDtc->fileContent(fileId); - QString nameOfPlan = QString::fromStdString(fc.name()); + QString nameOfPlan = QString::fromStdString(fc.name); if (content.size() == 0) { ERROR_LOG(m_logger) << "Error plan [" << nameOfPlan << "] is empty"; @@ -690,7 +690,7 @@ bool InterfaceImpl::fmsWritePlan(bool saveAs) FileManagement::FileContent planFileContent; if (m_internal->m_flmDtc->getFile(FileManagement::FileType::TacticalPlan, m_internal->m_currentFolderId, m_internal->m_currentNameOfPlan, planFileContent)) - m_internal->m_currentFileId = planFileContent.id(); + m_internal->m_currentFileId = planFileContent.id; } if (saveAs || (m_internal->m_currentFileId <= 0)) @@ -726,7 +726,7 @@ void InterfaceImpl::fmsDeletePlan() if (fileId > 0) { FileManagement::FileContent fc = m_internal->m_flmDtc->fileContent(fileId); - QString nameOfPlan = QString::fromStdString(fc.name()); + QString nameOfPlan = QString::fromStdString(fc.name); LtsWidgets::Button doIt = LtsWidgets::LtsMessageDialog::showMessage( m_session->baseLayout() @@ -753,7 +753,7 @@ void InterfaceImpl::fmsDeletePlan() void InterfaceImpl::onPlanContentChanged(const FileManagement::FileContent &data, DataModification modType) { - if (data.fileType() != FileManagement::FileType::TacticalPlan) + if (data.fileType != FileManagement::FileType::TacticalPlan) return; switch (modType) @@ -761,7 +761,7 @@ void InterfaceImpl::onPlanContentChanged(const FileManagement::FileContent &data case DataModification::eModified : break; case DataModification::eRemoved : - if (m_internal->m_currentFileId == data.id()) + if (m_internal->m_currentFileId == data.id) m_internal->m_currentFileId = -1; break; @@ -780,7 +780,7 @@ void InterfaceImpl::onIterateParticipantsSidc() auto gatherUpSidc = [&participantSidcsInUse](const ParticipantManagement::Participant & data) { - const QString &sidcCode = QString::fromStdString(data.symbol()); + const QString &sidcCode = QString::fromStdString(data.symbol); if (AdvancedSymbology::SidcCodec::isEncoded(sidcCode)) { @@ -822,7 +822,7 @@ void InterfaceImpl::readSymbolFavouritesRequest(const QString &favName, QString return; } - int fileId = fileContent.id(); + int fileId = fileContent.id; QByteArray content; if (!m_internal->m_flmGui->loadContent(fileId, content, true)) @@ -929,23 +929,23 @@ void InterfaceImpl::storeSymbolFavouritesRequest(const QString &favName, const Q LtsWidgets::LtsMessageDialog::showMessage(m_session->baseLayout(), msg, m_internal->m_messageBoxTitle); return; } - if (!m_internal->m_flmGui->saveContent(favContent.id(), favXMLContent.toUtf8(), QString())) + if (!m_internal->m_flmGui->saveContent(favContent.id, favXMLContent.toUtf8(), QString())) ERROR_LOG(m_logger) << "Cannot save symbol favourites in library"; } else { - favContent.name(favName.toStdString()); - favContent.isTemplate(false); - favContent.isUsedBy(false); - favContent.usedBy(0); - favContent.folderId(folderId); - favContent.fileStatus(FileManagement::FileStatus::Valid); - favContent.fileCategory(FileManagement::FileCategory::Global); - favContent.fileType(FileManagement::FileType::OperatorFavourite); - favContent.exerciseId(); - favContent.phaseId(); - favContent.lastModified(QDateTime::currentMSecsSinceEpoch()); - favContent.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId()); + favContent.name = favName.toStdString(); + favContent.isTemplate = false; + favContent.isUsedBy = false; + favContent.usedBy = 0; + favContent.folderId = folderId; + favContent.fileStatus = FileManagement::FileStatus::Valid; + favContent.fileCategory = FileManagement::FileCategory::Global; + favContent.fileType = FileManagement::FileType::OperatorFavourite; + favContent.exerciseId = 0; + favContent.phaseId = 0; + favContent.lastModified = QDateTime::currentMSecsSinceEpoch(); + favContent.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId(); ERROR_LOG(m_logger) << "New file content = " << favXMLContent; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/PlanEditorPlugin/Gui/plan_editor_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/PlanEditorPlugin/Gui/plan_editor_gui_plugin.h index 14ba88489..b86a5c152 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/PlanEditorPlugin/Gui/plan_editor_gui_plugin.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/PlanEditorPlugin/Gui/plan_editor_gui_plugin.h @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/new_docker_build.sh b/qt6-after/qt6-migrated-legatus/new_docker_build.sh index 90e82395b..f0dcd0a1e 100755 --- a/qt6-after/qt6-migrated-legatus/new_docker_build.sh +++ b/qt6-after/qt6-migrated-legatus/new_docker_build.sh @@ -36,7 +36,34 @@ BUILD_ARCGIS: --arcgis / --no-arcgis Enable/disable BUILD_ARCGIS (default: OFF) BUILD_CODIFICATION: - --codification / --no-codification Enable/disable BUILD_CODIFICATION (default: OFF, requires KDReports) + --codification / --no-codification Enable/disable BUILD_CODIFICATION (default: ON, requires KDReports) + +BUILD_WLS: + --wls / --no-wls Enable/disable BUILD_WLS (default: ON; the + GROUP4 targets svcWirelessLocationSystem / + wlsJsonClientTest only exist when it is ON) + +BUILD_FILTERMANAGEMENT: + --filtermanagement / --no-filtermanagement Enable/disable BUILD_FILTERMANAGEMENT (default: ON) + +BUILD_PLUGINS_SERVICEMONITOR: + --servicemonitor / --no-servicemonitor Enable/disable BUILD_PLUGINS_SERVICEMONITOR (default: ON) + +BUILD_WEBENGINE_PLUGINS: + --webengine-plugins / --no-webengine-plugins + Enable/disable the WebEngine-based plugins (PlanEditor, + OnlineHelp, ParticipantOrgChart). PlanEditor links + situationMap, so ON promotes BUILD_ARCGIS to ON. (default: ON) + +BUILD_XMLPATTERNS_PLUGINS: + --xmlpatterns-plugins / --no-xmlpatterns-plugins + Enable/disable the XmlPatterns-based plugins (MSDL, Saab) + when Qt6XmlPatterns is present in the Qt install. Qt + removed the XmlPatterns module in Qt 6.0 ("What's New in + Qt 6.0" / Qt Wiki: removed, not planned to be + re-introduced; no Qt 6 release ships it, no aqt + module), so with a stock Qt 6.10.2 install these + plugins stay disabled (environmental floor). (default: ON) Build groups: --group1 / --no-group1 Enable/disable DDS core libraries build @@ -77,6 +104,11 @@ Environment variable overrides: BUILD_GRANTLEE=ON|OFF BUILD_ARCGIS=ON|OFF BUILD_CODIFICATION=ON|OFF + BUILD_FILTERMANAGEMENT=ON|OFF + BUILD_WLS=ON|OFF + BUILD_PLUGINS_SERVICEMONITOR=ON|OFF + BUILD_WEBENGINE_PLUGINS=ON|OFF + BUILD_XMLPATTERNS_PLUGINS=ON|OFF BUILD_GROUP1=ON|OFF BUILD_GROUP2=ON|OFF BUILD_GROUP3=ON|OFF @@ -107,7 +139,12 @@ Defaults: BUILD_RTI=ON BUILD_GRANTLEE=ON BUILD_ARCGIS=OFF - BUILD_CODIFICATION=OFF + BUILD_CODIFICATION=ON + BUILD_FILTERMANAGEMENT=ON + BUILD_WLS=ON + BUILD_PLUGINS_SERVICEMONITOR=ON + BUILD_WEBENGINE_PLUGINS=ON + BUILD_XMLPATTERNS_PLUGINS=ON BUILD_GROUP1=ON BUILD_GROUP2=ON BUILD_GROUP3=ON @@ -147,6 +184,10 @@ log_info() { printf 'INFO: %s\n' "$*" } +log_warn() { + printf 'WARNING: %s\n' "$*" >&2 +} + log_error() { printf 'ERROR: %s\n' "$*" >&2 } @@ -264,6 +305,12 @@ APT_PACKAGES=( vlc-plugin-base git python3-pip + # Poppler-Qt6 (PDF support): Z/src/nglwidgets detects it via + # pkg_check_modules(POPPLER_QT6 poppler-qt6) - pkg-config must be present for + # the probe to run at all. FlmExplorerGuiPlugin's flm_preview_playback.cpp + # uses Poppler types unconditionally, so a green Group 12 build requires it. + pkg-config + libpoppler-qt6-dev ) # INTERFACE libraries (header-only) are built automatically as dependencies @@ -554,8 +601,8 @@ GROUP4_TARGETS=( svcTabocServer svcTrainingAreaBaseOC serialtest - # Proxies module - WirelessLocationSystem (requires -DBUILD_WLS=ON, e.g. via - # --cmake_build_flags "-DBUILD_WLS=ON") + # Proxies module - WirelessLocationSystem (only exists when BUILD_WLS=ON, + # script default; see the --wls flag) svcWirelessLocationSystem wlsJsonClientTest # Proxies module - Other @@ -607,6 +654,16 @@ RUN pip3 install --break-system-packages --quiet aqtinstall && \ --outputdir ${QT_BASE_DIR} && \ rm -rf /root/.cache/Aqt +# Qt6 XmlPatterns (MSDL/Saab plugins) is intentionally NOT installed: Qt removed +# the XmlPatterns module in Qt 6.0 ("What's New in Qt 6.0" / Qt Wiki: removed and +# not planned to be re-introduced - unlike e.g. Multimedia/WebEngine which +# returned in 6.1/6.2; no Qt 6 release ships it, no aqt module). Mixing an +# out-of-tree libQt6XmlPatterns built against an older Qt with a 6.10 install +# would put two Qt minor versions in one +# process. MSDL/Saab therefore stay disabled with a stock Qt install; to enable +# them, install a Qt-version-matching XmlPatterns (lib + headers + cmake config) +# into ${QT_BASE_DIR}/${QT_VERSION}/${QT_ARCH_DIR} and pass --xmlpatterns-plugins. + # Install KDReports from source (apt package not available in Ubuntu 22.04/26.04) # Try apt install first (will fail), then build from KDAB GitHub mirror RUN apt-get install -y -qq libkdreports-dev 2>/dev/null || \ @@ -670,7 +727,12 @@ BUILD_AAR="${BUILD_AAR:-ON}" BUILD_RTI="${BUILD_RTI:-ON}" BUILD_GRANTLEE="${BUILD_GRANTLEE:-ON}" BUILD_ARCGIS="${BUILD_ARCGIS:-OFF}" -BUILD_CODIFICATION="${BUILD_CODIFICATION:-OFF}" +BUILD_CODIFICATION="${BUILD_CODIFICATION:-ON}" +BUILD_FILTERMANAGEMENT="${BUILD_FILTERMANAGEMENT:-ON}" +BUILD_WLS="${BUILD_WLS:-ON}" +BUILD_PLUGINS_SERVICEMONITOR="${BUILD_PLUGINS_SERVICEMONITOR:-ON}" +BUILD_WEBENGINE_PLUGINS="${BUILD_WEBENGINE_PLUGINS:-ON}" +BUILD_XMLPATTERNS_PLUGINS="${BUILD_XMLPATTERNS_PLUGINS:-ON}" BUILD_GROUP1="${BUILD_GROUP1:-ON}" BUILD_GROUP2="${BUILD_GROUP2:-ON}" BUILD_GROUP3="${BUILD_GROUP3:-ON}" @@ -802,6 +864,36 @@ while [[ $# -gt 0 ]]; do --no-codification) BUILD_CODIFICATION=OFF ;; + --wls) + BUILD_WLS=ON + ;; + --no-wls) + BUILD_WLS=OFF + ;; + --filtermanagement) + BUILD_FILTERMANAGEMENT=ON + ;; + --no-filtermanagement) + BUILD_FILTERMANAGEMENT=OFF + ;; + --servicemonitor) + BUILD_PLUGINS_SERVICEMONITOR=ON + ;; + --no-servicemonitor) + BUILD_PLUGINS_SERVICEMONITOR=OFF + ;; + --webengine-plugins) + BUILD_WEBENGINE_PLUGINS=ON + ;; + --no-webengine-plugins) + BUILD_WEBENGINE_PLUGINS=OFF + ;; + --xmlpatterns-plugins) + BUILD_XMLPATTERNS_PLUGINS=ON + ;; + --no-xmlpatterns-plugins) + BUILD_XMLPATTERNS_PLUGINS=OFF + ;; --no-ctest) RUN_CTEST=OFF ;; @@ -870,6 +962,18 @@ BUILD_RTI="$(normalize_on_off "$BUILD_RTI" "BUILD_RTI")" BUILD_GRANTLEE="$(normalize_on_off "$BUILD_GRANTLEE" "BUILD_GRANTLEE")" BUILD_ARCGIS="$(normalize_on_off "$BUILD_ARCGIS" "BUILD_ARCGIS")" BUILD_CODIFICATION="$(normalize_on_off "$BUILD_CODIFICATION" "BUILD_CODIFICATION")" +BUILD_FILTERMANAGEMENT="$(normalize_on_off "$BUILD_FILTERMANAGEMENT" "BUILD_FILTERMANAGEMENT")" +BUILD_WLS="$(normalize_on_off "$BUILD_WLS" "BUILD_WLS")" +BUILD_PLUGINS_SERVICEMONITOR="$(normalize_on_off "$BUILD_PLUGINS_SERVICEMONITOR" "BUILD_PLUGINS_SERVICEMONITOR")" +BUILD_WEBENGINE_PLUGINS="$(normalize_on_off "$BUILD_WEBENGINE_PLUGINS" "BUILD_WEBENGINE_PLUGINS")" +BUILD_XMLPATTERNS_PLUGINS="$(normalize_on_off "$BUILD_XMLPATTERNS_PLUGINS" "BUILD_XMLPATTERNS_PLUGINS")" + +# PlanEditorGuiPlugin links situationMap (ArcGIS scope), so the WebEngine plugin +# set cannot configure without ArcGIS: promote BUILD_ARCGIS when it is enabled. +if [[ "${BUILD_WEBENGINE_PLUGINS}" == "ON" && "${BUILD_ARCGIS}" == "OFF" ]]; then + log_info "BUILD_WEBENGINE_PLUGINS=ON implies ArcGIS-scope targets (PlanEditorGuiPlugin -> situationMap): promoting BUILD_ARCGIS=ON" + BUILD_ARCGIS=ON +fi BUILD_GROUP1="$(normalize_on_off "$BUILD_GROUP1" "BUILD_GROUP1")" BUILD_GROUP2="$(normalize_on_off "$BUILD_GROUP2" "BUILD_GROUP2")" BUILD_GROUP3="$(normalize_on_off "$BUILD_GROUP3" "BUILD_GROUP3")" @@ -900,7 +1004,7 @@ fi CMAKE_BUILD_FLAGS="${CMAKE_BUILD_FLAGS:-}" # Export variables for Docker container -export BUILD_ALL BUILD_RTI BUILD_GRANTLEE BUILD_ARCGIS BUILD_CODIFICATION BUILD_GROUP1 BUILD_GROUP2 BUILD_GROUP3 BUILD_GROUP4 BUILD_GROUP5 BUILD_GROUP6 BUILD_GROUP7 BUILD_GROUP8 BUILD_GROUP9 BUILD_GROUP10 BUILD_GROUP11 BUILD_VIEWER_ONLY RUN_CTEST TESTS_ONLY INTEGRATION_TEST USE_PREBUILT_IMAGE BUILD_PREBUILT_IMAGE DELETE_PREBUILT_IMAGE DOCKER_IMAGE CMAKE_BUILD_FLAGS +export BUILD_ALL BUILD_RTI BUILD_GRANTLEE BUILD_ARCGIS BUILD_CODIFICATION BUILD_FILTERMANAGEMENT BUILD_WLS BUILD_PLUGINS_SERVICEMONITOR BUILD_WEBENGINE_PLUGINS BUILD_XMLPATTERNS_PLUGINS BUILD_GROUP1 BUILD_GROUP2 BUILD_GROUP3 BUILD_GROUP4 BUILD_GROUP5 BUILD_GROUP6 BUILD_GROUP7 BUILD_GROUP8 BUILD_GROUP9 BUILD_GROUP10 BUILD_GROUP11 BUILD_GROUP12 BUILD_VIEWER_ONLY RUN_CTEST TESTS_ONLY INTEGRATION_TEST USE_PREBUILT_IMAGE BUILD_PREBUILT_IMAGE DELETE_PREBUILT_IMAGE DOCKER_IMAGE CMAKE_BUILD_FLAGS # Group 5: Viewer module targets (conditional on BUILD_ARCGIS) # Note: LtsFileDialog excluded from viewer-only builds due to Group 4 dependencies (svcExmCommon, svcOpmCommon, svcFlmCommon) @@ -1083,6 +1187,23 @@ GROUP11_TARGETS=( # Excluded (environmental floors, not migration regressions): # cesPluginGeoPairing - needs the external Schusstafel.h header (missing) # BldInfoGuiPlugin - links BuildingViewerCommon (dtEntity/OSG SDK absent) +# BdvViewerGuiPlugin - links BuildingViewerCommon (same floor; CMake skips its +# subdirectory when BuildingViewerCommon is not built) +# PpmMSDLGuiPlugin - links Qt6::XmlPatterns; Qt removed the XmlPatterns +# PpmSAABGuiPlugin - module in Qt 6.0 (not re-introduced; no Qt 6 release +# ships it, incl. 6.10.2). With a stock Qt install the +# BUILD_PLUGINS_MSDL/SAAB flags resolve to OFF (see +# resolve_xmlpatterns) +# The Flt*/Smo* targets only exist when BUILD_FILTERMANAGEMENT / +# BUILD_PLUGINS_SERVICEMONITOR are ON (script defaults; see the cmake call). +# With them OFF the five unconditional GUI plugins (EvlEdit, PpmParticipantInfo, +# Pws, SrmReplayManagement, OpmSettings) also fail to link (they need the +# FilterManagement interface libs) - so these defaults are load-bearing. +# The PlanEditorGuiPlugin/OhpOnlineHelpViewerGuiPlugin/PpmOrgChartGuiPlugin +# targets only exist when BUILD_WEBENGINE_PLUGINS=ON (script default; ON also +# promotes BUILD_ARCGIS=ON because PlanEditorGuiPlugin links situationMap), +# and the Cod*/codTopicTypePlugin targets when BUILD_CODIFICATION=ON (script +# default; requires KDReports). GROUP12_TARGETS=( AesAirSupportGuiPlugin AesBcContaminationGuiPlugin @@ -1120,6 +1241,8 @@ GROUP12_TARGETS=( CesParticipantMoveGuiPlugin CesParticipantUASGuiPlugin CmoDataPlugin + CodCodificationDataGuiPlugin + CodDataPlugin DevGuiPlugin EfmDataPlugin EfmSoundAreaGuiPlugin @@ -1137,6 +1260,10 @@ GROUP12_TARGETS=( FlmComboBoxGuiPlugin FlmDataPlugin FlmExplorerGuiPlugin + FltAesGuiPlugin + FltDataPlugin + FltParticipantGuiPlugin + Fltbldg_cmpntGuiPlugin FspGuiPlugin GimDataPlugin GimInfoGuiPlugin @@ -1163,6 +1290,7 @@ GROUP12_TARGETS=( NomEditGuiPlugin ObdBaseDownloaderGuiPlugin ObdDataPlugin + OhpOnlineHelpViewerGuiPlugin OpmComboBoxGuiPlugin OpmDataPlugin OpmEditGuiPlugin @@ -1176,10 +1304,12 @@ GROUP12_TARGETS=( PdmChargeTableGuiPlugin PdmComboBoxGuiPlugin PdmDataPlugin + PlanEditorGuiPlugin PlanOverlaysGuiPlugin PpmComboBoxGuiPlugin PpmDataPlugin PpmOperationalPlaningGuiPlugin + PpmOrgChartGuiPlugin PpmParticipantEditGuiPlugin PpmParticipantInfoGuiPlugin PpmParticipantTemplatesGuiPlugin @@ -1210,6 +1340,10 @@ GROUP12_TARGETS=( ScrScreenRecordingGuiPlugin SitmapGuiPlugin SituationMapScriptFilterGuiPlugin + SmoEquipmentErrorRegistrationGuiPlugin + SmoHgrAndMineSearchGuiPlugin + SmoMonitorsGuiPlugin + SmoSystemMonitorGuiPlugin SrmDataPlugin SrmReplayManagementGuiPlugin SrpDataPlugin @@ -1415,6 +1549,10 @@ log_info() { printf 'INFO: %s\n' "$*" } +log_warn() { + printf 'WARNING: %s\n' "$*" >&2 +} + install_qt6_packages() { log_info "Installing Qt6 packages via aqtinstall" @@ -1518,6 +1656,29 @@ if [[ "${BUILD_ARCGIS}" == "ON" ]]; then fi fi +# The MSDL/Saab plugins link Qt6::XmlPatterns. Qt removed the XmlPatterns +# module in Qt 6.0 ("What's New in Qt 6.0" removal table / Qt Wiki: removed and +# not planned to be re-introduced - unlike Multimedia/WebEngine, which returned +# in 6.1/6.2). No Qt 6 release (incl. 6.10.2) ships it and there is no aqt +# module. An out-of-tree libQt6XmlPatterns built against an older Qt would mix +# two Qt minor versions in one process (ABI risk), so with a stock Qt install +# the plugins are gated OFF. If a Qt-version-matching XmlPatterns (lib + +# headers + Qt6XmlPatterns cmake config) is placed into the Qt prefix, they +# enable automatically. +resolve_xmlpatterns() { + BUILD_XMLPATTERNS_EFFECTIVE="${BUILD_XMLPATTERNS_PLUGINS}" + if [[ "${BUILD_XMLPATTERNS_EFFECTIVE}" == "ON" ]]; then + if ls "${QT_BASE_DIR}/${QT_VERSION}/${QT_ARCH_DIR}/lib/libQt6XmlPatterns.so.6" >/dev/null 2>&1; then + log_info "Qt6XmlPatterns present in the Qt install - MSDL/Saab plugins will be built" + else + log_warn "Qt6XmlPatterns is not present in the Qt install (removed in Qt 6.0, not re-introduced) - keeping BUILD_PLUGINS_MSDL/BUILD_PLUGINS_SAAB OFF (ppm.msdl / ppm.saab stay unbuilt)" + BUILD_XMLPATTERNS_EFFECTIVE=OFF + fi + fi +} + +resolve_xmlpatterns + cd /workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus rm -rf build4 @@ -1535,6 +1696,14 @@ cmake .. \ -DBUILD_GRANTLEE="${BUILD_GRANTLEE}" \ -DBUILD_ARCGIS="${BUILD_ARCGIS}" \ -DBUILD_CODIFICATION="${BUILD_CODIFICATION}" \ + -DBUILD_FILTERMANAGEMENT="${BUILD_FILTERMANAGEMENT}" \ + -DBUILD_WLS="${BUILD_WLS}" \ + -DBUILD_PLUGINS_SERVICEMONITOR="${BUILD_PLUGINS_SERVICEMONITOR}" \ + -DBUILD_PLUGINS_PLANEDITOR="${BUILD_WEBENGINE_PLUGINS}" \ + -DBUILD_PLUGINS_ONLINEHELP="${BUILD_WEBENGINE_PLUGINS}" \ + -DBUILD_PLUGINS_PARTICIPANT_ORG_CHART="${BUILD_WEBENGINE_PLUGINS}" \ + -DBUILD_PLUGINS_MSDL="${BUILD_XMLPATTERNS_EFFECTIVE}" \ + -DBUILD_PLUGINS_SAAB="${BUILD_XMLPATTERNS_EFFECTIVE}" \ ${CMAKE_BUILD_FLAGS:-} \ -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_BUILD_TYPE=Release \ @@ -1605,6 +1774,11 @@ docker run --rm \ -e BUILD_GRANTLEE \ -e BUILD_ARCGIS \ -e BUILD_CODIFICATION \ + -e BUILD_FILTERMANAGEMENT \ + -e BUILD_WLS \ + -e BUILD_PLUGINS_SERVICEMONITOR \ + -e BUILD_WEBENGINE_PLUGINS \ + -e BUILD_XMLPATTERNS_PLUGINS \ -e BUILD_GROUP1 \ -e BUILD_GROUP2 \ -e BUILD_GROUP3 \ From fb3e91ea4b830206073401d21010f90dcfa34fe7 Mon Sep 17 00:00:00 2001 From: berrux_dev Date: Thu, 22 Oct 2026 13:16:23 +0200 Subject: [PATCH 3/6] Close Schusstafel + KDChart plugin floors: cesPluginGeoPairing/OreOnlineReportsGuiPlugin in GROUP12 (presence-gated), image bakes KDChart DDS member fixes (GeoPairing, OnlineReports charts/dialogs); FindKDChart/FindSchusstafel find-module wiring --- .../Charts/ore_detailed_chart_model.cpp | 12 +-- .../Charts/ore_simple_chart_model.cpp | 16 +-- .../ore_create_report_dialog.cpp | 8 +- .../Gui/OnlineReports/ore_report_dialog.cpp | 2 +- .../Gui/OnlineReports/ore_type_model.cpp | 12 +-- .../GeoPairing/GeoPairing/GeoPairing.cpp | 32 +++--- .../cmake/FindKDChart.cmake | 4 +- .../cmake/FindSchusstafel.cmake | 20 +++- .../qt6-migrated-legatus/new_docker_build.sh | 99 ++++++++++++++++++- 9 files changed, 160 insertions(+), 45 deletions(-) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_detailed_chart_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_detailed_chart_model.cpp index 25010c402..b591be91c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_detailed_chart_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_detailed_chart_model.cpp @@ -84,17 +84,17 @@ void DetailedChartModel::onDynamicParticipantDataChanged(const ParticipantManage { Q_UNUSED(modType); - const ParticipantManagement::StateInformation &stateInfo = m_config.ppmDtc->youngestStateInformation(data.stateHistory()); + const ParticipantManagement::StateInformation &stateInfo = m_config.ppmDtc->youngestStateInformation(data.stateHistory); - if (!m_config.participantIds.contains(data.participantId()) || - stateInfo.vulnerabilityState() > ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill) + if (!m_config.participantIds.contains(data.participantId) || + stateInfo.vulnerabilityState > ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill) return; for (auto it = m_participantStates.begin(); it != m_participantStates.end(); ++it) - it.value() -= data.participantId(); + it.value() -= data.participantId; - m_participantStates[stateInfo.vulnerabilityState()] += data.participantId(); + m_participantStates[stateInfo.vulnerabilityState] += data.participantId; emit dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1)); } @@ -113,7 +113,7 @@ DetailedChartModel::DetailedChartModel(const AbstractChartModel::ChartConfig &co auto cb = [this](const ParticipantManagement::DynamicParticipantData & data) { - if (!m_config.participantIds.contains(data.participantId())) + if (!m_config.participantIds.contains(data.participantId)) return; onDynamicParticipantDataChanged(data, DataModification::eAdded); }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_simple_chart_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_simple_chart_model.cpp index 394404427..1462b5776 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_simple_chart_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_simple_chart_model.cpp @@ -56,18 +56,18 @@ void SimpleChartModel::onDynamicParticipantDataChanged(const ParticipantManageme { Q_UNUSED(modType); - if (!m_config.participantIds.contains(data.participantId())) + if (!m_config.participantIds.contains(data.participantId)) return; - const ParticipantManagement::StateInformation &stateInfo = m_config.ppmDtc->youngestStateInformation(data.stateHistory()); + const ParticipantManagement::StateInformation &stateInfo = m_config.ppmDtc->youngestStateInformation(data.stateHistory); - DEBUG_LOG(m_logger) << "Participant id = " << data.participantId(); - DEBUG_LOG(m_logger) << "State Info Vulnerability = " << stateInfo.vulnerabilityState(); + DEBUG_LOG(m_logger) << "Participant id = " << data.participantId; + DEBUG_LOG(m_logger) << "State Info Vulnerability = " << static_cast(stateInfo.vulnerabilityState); - if (stateInfo.vulnerabilityState() < ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill) - setCombatReady(data.participantId()); + if (stateInfo.vulnerabilityState < ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill) + setCombatReady(data.participantId); else - setKilled(data.participantId()); + setKilled(data.participantId); emit dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1)); } @@ -76,7 +76,7 @@ SimpleChartModel::SimpleChartModel(const AbstractChartModel::ChartConfig &config , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { auto cb = [this](const ParticipantManagement::DynamicParticipantData & data) { - if (!m_config.participantIds.contains(data.participantId())) + if (!m_config.participantIds.contains(data.participantId)) return; onDynamicParticipantDataChanged(data, DataModification::eAdded); }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_create_report_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_create_report_dialog.cpp index 0e74c662f..bed65d8db 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_create_report_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_create_report_dialog.cpp @@ -160,10 +160,10 @@ bool CreateReportDialog::apply() { ParticipantManagement::ParticipantData data = m_participantModel->getParticipantData(index); - if (data.id() != 0 && - data.equipmentNumber().has_value() && - typeIds.contains(data.typeId())) - participantIds.insert(data.id()); + if (data.id != 0 && + data.equipmentNumber.has_value() && + typeIds.contains(data.typeId)) + participantIds.insert(data.id); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_report_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_report_dialog.cpp index fa89185da..96b22a0be 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_report_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_report_dialog.cpp @@ -54,7 +54,7 @@ ReportDialog::ReportDialog(const AbstractChartModel::ChartConfig &config, QWidge for (int32_t participantId :config.participantIds) { ParticipantManagement::Participant participant = config.ppmDtc->participant(participantId); - ParticipantManagement::TypeClass typeClass = config.ppmDtc->type(participant.typeId()).typeClass(); + ParticipantManagement::TypeClass typeClass = config.ppmDtc->type(participant.typeId).typeClass; participantIdsByTypeClass[typeClass] += participantId; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_type_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_type_model.cpp index d70f80afd..54e937678 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_type_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_type_model.cpp @@ -22,7 +22,7 @@ bool TypeModel::init() { m_ppmDtc->types([this](const ParticipantManagement::Type &type) { - if (m_ppmDtc->isTypeInUse(type.id())) + if (m_ppmDtc->isTypeInUse(type.id)) insertRow(type); }); @@ -33,7 +33,7 @@ int TypeModel::getTypeId(const QModelIndex &index) const { if (!indexIsValid(index)) return -1; - return m_vecData.at(index.row()).id(); + return m_vecData.at(index.row()).id; } QVariant TypeModel::data(const QModelIndex &index, int role) const @@ -46,9 +46,9 @@ QVariant TypeModel::data(const QModelIndex &index, int role) const switch (index.column()) { case 0: - return ParticipantManagement::toString(entry.typeClass()); + return ParticipantManagement::toString(entry.typeClass); case 1: - return QString::fromStdString(entry.name()); + return QString::fromStdString(entry.name); } return QVariant(); } @@ -56,8 +56,8 @@ QVariant TypeModel::data(const QModelIndex &index, int role) const bool TypeModel::isFiltered(const ParticipantManagement::Type &data, DataModification modType) const { Q_UNUSED(modType); - return (data.typeClass() == ParticipantManagement::TypeClass::Unit || - data.typeClass() == ParticipantManagement::TypeClass::SupportUnit); + return (data.typeClass == ParticipantManagement::TypeClass::Unit || + data.typeClass == ParticipantManagement::TypeClass::SupportUnit); } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairing/GeoPairing.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairing/GeoPairing.cpp index 21fcee05f..c1988745f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairing/GeoPairing.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairing/GeoPairing.cpp @@ -136,24 +136,24 @@ void GeoPairing::calculateAirFire(const QByteArray &transparentData, while (i.hasNext()) { i.next(); - SInt32 vulnerabilityState = i.value().vulnerabilityState; - Float64 lat = i.value().pos().lat() * 180 / M_PI; - Float64 lon = i.value().pos().lon() * 180 / M_PI; + SInt32 vulnerabilityState = static_cast(i.value().vulnerabilityState); + Float64 lat = i.value().pos.lat * 180 / M_PI; + Float64 lon = i.value().pos.lon * 180 / M_PI; DEBUG_LOG(m_logger) << "GeoPairing::calculateAirFire" << "\nl_Updater->update : " << i.key() - << "\n: participantId=" << i.value().participantId() - << "\n participantTypeId= " << i.value().participantTypeId() + << "\n: participantId=" << i.value().participantId + << "\n participantTypeId= " << i.value().participantTypeId << "\n pos lat=" << lat << "\n lon=" << lon - << "\n alt=" << i.value().pos().z() - << "\n posTime=" << i.value().sampleTime() + << "\n alt=" << i.value().pos.z + << "\n posTime=" << i.value().sampleTime << "\n state=" << i.value().vulnerabilityState << "\n state (SInt32)=" << vulnerabilityState; - l_Updater->update(i.value().participantId(), + l_Updater->update(i.value().participantId, lat, lon, - i.value().pos().z(), - i.value().sampleTime() / 1000, //s + i.value().pos.z, + i.value().sampleTime / 1000, //s vulnerabilityState); } @@ -225,7 +225,7 @@ void GeoPairing::calculateAirFire(const QByteArray &transparentData, if (l_TargetFound != l_CachedTrackingState || l_TimeoutPassed) { // prepare response for player - m_reportTarget.playerId = i.value().participantId(); + m_reportTarget.playerId = i.value().participantId; m_reportTarget.sendData.clear(); m_reportTarget.sendData.append(0xEB); // Report Target Detection @@ -843,11 +843,11 @@ bool GeoPairing::geoPairingData(const std::shared_ptr): +# carries the include dir for #include and the lib for the ST_* symbols. +IF(SCHUSSTAFEL_FOUND AND NOT TARGET Schusstafel::Schusstafel) + ADD_LIBRARY(Schusstafel::Schusstafel UNKNOWN IMPORTED) + SET_PROPERTY(TARGET Schusstafel::Schusstafel PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${SCHUSSTAFEL_INCLUDE_DIR}") + SET_PROPERTY(TARGET Schusstafel::Schusstafel PROPERTY IMPORTED_LOCATION "${SCHUSSTAFEL_LIBRARY}") +ENDIF() diff --git a/qt6-after/qt6-migrated-legatus/new_docker_build.sh b/qt6-after/qt6-migrated-legatus/new_docker_build.sh index f0dcd0a1e..288c480b9 100755 --- a/qt6-after/qt6-migrated-legatus/new_docker_build.sh +++ b/qt6-after/qt6-migrated-legatus/new_docker_build.sh @@ -680,6 +680,31 @@ RUN apt-get install -y -qq libkdreports-dev 2>/dev/null || \ # includes resolve through the default /usr/local/include search path. RUN ln -sfn KDReports-qt6 /usr/local/include/KDReports +# KDChart (KDAB, MIT) from source: FindKDChart RETURN()s without it, which skips +# OreOnlineReportsGuiPlugin (app requirement iid ore.onlinereports). The legacy +# env had a KDChart 2.6.0 Qt5 RPM; the Qt6 build needs a Qt6-compatible release. +# Pinned to the verified kdchart-3.0.0 tag (KDChart_QT6=true; needs the +# Gui/Widgets/PrintSupport/Svg Qt6 components above). ECM +# (extra-cmake-modules) is required: KDChart plain-include()s ECMGeneratePriFile +# for Qt > 6.2 and never find_package(ECM)s. +RUN apt-get update -qq && \ + apt-get install -y -qq extra-cmake-modules && \ + rm -rf /var/lib/apt/lists/* && \ + git clone --depth 1 --branch kdchart-3.0.0 https://github.com/KDAB/KDChart.git /tmp/KDChart && \ + cmake -S /tmp/KDChart -B /tmp/KDChart/build \ + -DKDChart_QT6=true -DKDChart_EXAMPLES=false -DKDChart_TESTS=false -DKDChart_DOCS=false \ + -DCMAKE_PREFIX_PATH=${QT_BASE_DIR}/${QT_VERSION}/${QT_ARCH_DIR} \ + -DCMAKE_MODULE_PATH=/usr/share/ECM/modules \ + -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local && \ + cmake --build /tmp/KDChart/build -j$(nproc) && \ + cmake --install /tmp/KDChart/build && \ + ldconfig && \ + rm -rf /tmp/KDChart + +# KDChart's Qt6 build installs headers under KDChart-qt6 (same -qt6 suffix +# pattern as KDReports); legacy sources include the prefix. +RUN ln -sfn KDChart-qt6 /usr/local/include/KDChart + CMD ["/bin/bash"] EOF @@ -1185,7 +1210,14 @@ GROUP11_TARGETS=( # without these the app reports "App Requirements check failed" at startup. # Plugin outputs land in build4/lib, the directory the loader scans. # Excluded (environmental floors, not migration regressions): -# cesPluginGeoPairing - needs the external Schusstafel.h header (missing) +# cesPluginGeoPairing - needs the external Schusstafel package (prebuilt +# Schusstafel.h + libSchusstafel.so) at +# external/Schusstafel (see resolve_schusstafel); it is +# built when the package is present +# OreOnlineReportsGuiPlugin - needs KDChart (open-source, KDAB) under +# /usr/local; built from github.com/KDAB/KDChart tag +# kdchart-3.0.0 with -DKDChart_QT6=true (see +# resolve_kdchart), built when present # BldInfoGuiPlugin - links BuildingViewerCommon (dtEntity/OSG SDK absent) # BdvViewerGuiPlugin - links BuildingViewerCommon (same floor; CMake skips its # subdirectory when BuildingViewerCommon is not built) @@ -1297,6 +1329,7 @@ GROUP12_TARGETS=( OpmLoginGuiPlugin OpmOverviewGuiPlugin OpmSettingsGuiPlugin + OreOnlineReportsGuiPlugin OscDataPlugin OscParticipantInfoGuiPlugin OscSystemGuiPlugin @@ -1381,6 +1414,7 @@ GROUP12_TARGETS=( cesPluginCES_NBC cesPluginCesBuildings cesPluginExplosions + cesPluginGeoPairing cesPluginMineAreas cesPluginMineLayingArtillery cesPluginParticipantBuildings @@ -1528,6 +1562,7 @@ BUILD_AAR="${BUILD_AAR:-ON}" BUILD_RTI="${BUILD_RTI:-ON}" BUILD_GRANTLEE="${BUILD_GRANTLEE:-ON}" BUILD_ARCGIS="${BUILD_ARCGIS:-OFF}" +WITH_SCHUSSTAFEL="${WITH_SCHUSSTAFEL:-ON}" BUILD_GROUP1="${BUILD_GROUP1:-ON}" BUILD_GROUP2="${BUILD_GROUP2:-ON}" BUILD_GROUP3="${BUILD_GROUP3:-ON}" @@ -1679,6 +1714,43 @@ resolve_xmlpatterns() { resolve_xmlpatterns +# Schusstafel is a prebuilt external package (Schusstafel.h + +# libSchusstafel.so) provided at external/Schusstafel, mirroring the ArcGIS +# symlink pattern. cesPluginGeoPairing #includes Schusstafel.h unconditionally, +# so without the package WITH_SCHUSSTAFEL stays OFF and the target is dropped +# from Group 12 (environmental floor, not a migration regression). +resolve_schusstafel() { + WITH_SCHUSSTAFEL_EFFECTIVE="${WITH_SCHUSSTAFEL}" + if [[ "${WITH_SCHUSSTAFEL_EFFECTIVE}" == "ON" ]]; then + if ls /workspace/external/Schusstafel/Schusstafel.h >/dev/null 2>&1; then + log_info "Schusstafel present at /workspace/external/Schusstafel - cesPluginGeoPairing will be built" + else + log_warn "Schusstafel not present at /workspace/external/Schusstafel - keeping WITH_SCHUSSTAFEL OFF (cesPluginGeoPairing stays unbuilt)" + WITH_SCHUSSTAFEL_EFFECTIVE=OFF + fi + fi +} + +# KDChart (KDAB, MIT) is an open-source Qt charts extension, installed under +# /usr/local (header KDChart/kdchart_export.h + libkdchart.so; FindKDChart +# searches /usr/local by default). The legacy env had a KDChart 2.6.0 Qt5 RPM; +# the Qt6 build needs a Qt6-compatible release (e.g. github.com/KDAB/KDChart +# tag kdchart-3.0.0 with -DKDChart_QT6=true). OreOnlineReportsGuiPlugin's +# CMake RETURN()s when KDChart is absent, so without it the plugin (iid +# ore.onlinereports) stays unbuilt - environmental floor. +resolve_kdchart() { + KDCHART_PRESENT=OFF + if [[ -f /usr/local/include/KDChart/kdchart_export.h ]]; then + KDCHART_PRESENT=ON + log_info "KDChart present at /usr/local - OreOnlineReportsGuiPlugin will be built" + else + log_warn "KDChart not present at /usr/local - OreOnlineReportsGuiPlugin stays unbuilt (legacy KDChart 2.6.0 was a Qt5 RPM; build a Qt6-compatible release from source to close this floor)" + fi +} + +resolve_schusstafel +resolve_kdchart + cd /workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus rm -rf build4 @@ -1704,6 +1776,7 @@ cmake .. \ -DBUILD_PLUGINS_PARTICIPANT_ORG_CHART="${BUILD_WEBENGINE_PLUGINS}" \ -DBUILD_PLUGINS_MSDL="${BUILD_XMLPATTERNS_EFFECTIVE}" \ -DBUILD_PLUGINS_SAAB="${BUILD_XMLPATTERNS_EFFECTIVE}" \ + -DWITH_SCHUSSTAFEL="${WITH_SCHUSSTAFEL_EFFECTIVE}" \ ${CMAKE_BUILD_FLAGS:-} \ -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_BUILD_TYPE=Release \ @@ -1722,6 +1795,30 @@ read -r -a GROUP10_ARRAY <<< "${GROUP10_TARGETS}" read -r -a GROUP11_ARRAY <<< "${GROUP11_TARGETS}" read -r -a GROUP12_ARRAY <<< "${GROUP12_TARGETS}" +# cesPluginGeoPairing #includes Schusstafel.h unconditionally - drop it from +# Group 12 when the Schusstafel package is unavailable (environmental floor). +if [[ "${WITH_SCHUSSTAFEL_EFFECTIVE}" != "ON" ]]; then + _GROUP12_ARRAY=() + for _t in "${GROUP12_ARRAY[@]}"; do + if [[ "${_t}" != "cesPluginGeoPairing" ]]; then + _GROUP12_ARRAY+=("${_t}") + fi + done + GROUP12_ARRAY=("${_GROUP12_ARRAY[@]}") +fi + +# OreOnlineReportsGuiPlugin RETURN()s at configure when KDChart is absent - +# drop it from Group 12 in that case (environmental floor, see resolve_kdchart). +if [[ "${KDCHART_PRESENT}" != "ON" ]]; then + _GROUP12_ARRAY=() + for _t in "${GROUP12_ARRAY[@]}"; do + if [[ "${_t}" != "OreOnlineReportsGuiPlugin" ]]; then + _GROUP12_ARRAY+=("${_t}") + fi + done + GROUP12_ARRAY=("${_GROUP12_ARRAY[@]}") +fi + if [[ "${TESTS_ONLY}" != "ON" ]]; then if [[ "${BUILD_VIEWER_ONLY}" == "ON" ]]; then log_info "BUILD_VIEWER_ONLY enabled - skipping Groups 1-4, building only Viewer module targets" From 3924b1e72bdd5234eea21d54e1283f0a81699115 Mon Sep 17 00:00:00 2001 From: berrux_dev Date: Fri, 23 Oct 2026 16:28:08 +0200 Subject: [PATCH 4/6] externel dependency --- qt6-after/qt6-migrated-legatus/external/Schusstafel | 1 + 1 file changed, 1 insertion(+) create mode 120000 qt6-after/qt6-migrated-legatus/external/Schusstafel diff --git a/qt6-after/qt6-migrated-legatus/external/Schusstafel b/qt6-after/qt6-migrated-legatus/external/Schusstafel new file mode 120000 index 000000000..1427e46a2 --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/external/Schusstafel @@ -0,0 +1 @@ +/workspace/external/Schusstafel \ No newline at end of file From 8e9594d25c1657bc2bfc55b0882db7362fb90b40 Mon Sep 17 00:00:00 2001 From: berrux_dev Date: Sat, 24 Oct 2026 19:31:04 +0200 Subject: [PATCH 5/6] Close ppm.msdl/ppm.saab floors: re-implement MSDL/SAAB import without Qt XmlPatterns Qt6::Xml (QDomDocument) + xmllint schema check; MSDL links XercesC + xsdc++ tree classes; both moved into GROUP12 --- qt6-after/qt6-migrated-legatus/CMakeLists.txt | 30 +++---- .../ParticipantManagement/Gui/CMakeLists.txt | 4 +- .../Gui/MSDL/msdl/CMakeLists.txt | 4 +- .../Gui/MSDL/msdl/msdl_export.cpp | 42 +++++----- .../MSDL/msdl/msdl_export_scenario_data.cpp | 10 +-- .../Gui/MSDL/msdl/msdl_import.cpp | 49 ++++-------- .../Gui/MSDL/msdl/msdl_import_show.cpp | 15 ---- .../Gui/MSDL/msdl/msdl_import_show.h | 18 ----- .../Gui/MSDL/msdl/msdl_mapping_dialog.cpp | 20 ++--- .../Gui/MSDL/ppm_msdl_edit.cpp | 3 +- .../Gui/Saab/ppm_saab_edit.cpp | 3 +- .../Gui/Saab/saab/CMakeLists.txt | 4 +- .../Gui/Saab/saab/saab_export.cpp | 73 ++++++++--------- .../Gui/Saab/saab/saab_import.cpp | 15 ++-- .../Gui/Saab/saab/saab_import_show.cpp | 15 ---- .../Gui/Saab/saab/saab_import_show.h | 20 ----- .../Gui/Saab/saab/saab_mapping_dialog.cpp | 24 +++--- .../qt6-migrated-legatus/new_docker_build.sh | 78 +++++++++++-------- 18 files changed, 179 insertions(+), 248 deletions(-) diff --git a/qt6-after/qt6-migrated-legatus/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/CMakeLists.txt index 87bc4a0a3..a49e9b53a 100755 --- a/qt6-after/qt6-migrated-legatus/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/CMakeLists.txt @@ -210,8 +210,12 @@ OPTION(BUILD_PLUGINS_PLANEDITOR "Build PlanEditor plugin (requires Qt6 WebEngine OPTION(BUILD_PLUGINS_ONLINEHELP "Build OnlineHelp plugin (requires Qt6 WebEngine)" OFF) OPTION(BUILD_PLUGINS_SERVICEMONITOR "Build ServiceMonitor plugin (requires Qt6 WebEngine)" OFF) OPTION(BUILD_PLUGINS_PARTICIPANT_ORG_CHART "Build ParticipantOrgChart (requires Qt6 WebEngine)" OFF) -OPTION(BUILD_PLUGINS_MSDL "Build MSDL module (requires Qt6 XmlPatterns)" OFF) -OPTION(BUILD_PLUGINS_SAAB "Build Saab module (requires Qt6 XmlPatterns)" OFF) +# MSDL/Saab no longer require Qt XmlPatterns (removed in Qt 6.0): their import +# code was re-implemented with Qt6::Xml (QDomDocument) for the schema check plus +# the external xmllint step for real XSD validation; MSDL additionally links +# XercesC + uses xsdc++-generated tree classes (needs libxerces-c-dev + xsdcxx). +OPTION(BUILD_PLUGINS_MSDL "Build MSDL module (needs XercesC + xsdc++)" OFF) +OPTION(BUILD_PLUGINS_SAAB "Build Saab module (Qt6::Xml only)" OFF) OPTION(BUILD_RTI "Build RTI Connext DDS dependent modules" OFF) OPTION(BUILD_VIEWER_ONLY "Build only Viewer module (no RTI required)" OFF) # Add Lts/ include path globally for QosProfile and other Lts headers @@ -360,22 +364,12 @@ if(NOT Qt6_FOUND) message(STATUS "Found Qt6 (minimal): ${Qt6Core_VERSION}") endif() -# Qt6::XmlPatterns (consumed by the MSDL/Saab import libs, gated by -# BUILD_PLUGINS_MSDL / BUILD_PLUGINS_SAAB): the XmlPatterns module (its own -# qtxmlpatterns repo) was removed in Qt 6.0 and never re-introduced, so no Qt 6 -# install carries it. It is NOT part of the component lists above (a missing -# component there would flip Qt6_FOUND off and disable the whole GUI path). -# Find it separately; when absent the two plugins must stay disabled - their -# CMakeLists reference Qt6::XmlPatterns in link libraries and CMake errors at -# generate time for an undefined namespaced target. -if(NOT TARGET Qt6::XmlPatterns) - find_package(Qt6XmlPatterns QUIET) - if(Qt6XmlPatterns_FOUND) - message(STATUS "Found Qt6XmlPatterns") - else() - message(STATUS "Qt6XmlPatterns not found (PpmMSDLGuiPlugin/PpmSAABGuiPlugin require it; keep BUILD_PLUGINS_MSDL/BUILD_PLUGINS_SAAB OFF)") - endif() -endif() +# MSDL/Saab import libs (gated by BUILD_PLUGINS_MSDL / BUILD_PLUGINS_SAAB) no +# longer use Qt XmlPatterns (QXmlSchema/QXmlSchemaValidator), which was removed +# in Qt 6.0. They were re-implemented with Qt6::Xml (QDomDocument) for the +# schema well-formedness check plus the external xmllint step for real XSD +# validation; MSDL additionally links XercesC and uses xsdc++-generated tree +# classes. No Qt6::XmlPatterns lookup is needed any more. # Qt6::WebChannel (consumed by PpmOrgChartGuiPlugin's QWebChannel page setup): # in Qt5 Qt5::WebEngineWidgets transitively linked Qt5::WebChannel (Qt5's diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/CMakeLists.txt index 102e64ea0..8fc189a76 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/CMakeLists.txt @@ -6,7 +6,7 @@ # ADD_SUBDIRECTORY(Common) -# MSDL requires XmlPatterns - skip for Qt6 migration baseline +# MSDL re-implemented without Qt XmlPatterns (Qt6::Xml + XercesC/xsdc++ + xmllint) IF(BUILD_PLUGINS_MSDL) ADD_SUBDIRECTORY(MSDL) ENDIF() @@ -21,7 +21,7 @@ ADD_SUBDIRECTORY(ParticipantSelection) ADD_SUBDIRECTORY(ParticipantTemplates) ADD_SUBDIRECTORY(PartyEdit) ADD_SUBDIRECTORY(PpmComboBox) -# Saab requires XmlPatterns - skip for Qt6 migration baseline +# Saab re-implemented without Qt XmlPatterns (Qt6::Xml only) IF(BUILD_PLUGINS_SAAB) ADD_SUBDIRECTORY(Saab) ENDIF() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/CMakeLists.txt index b931e8fef..6d9fdc275 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/CMakeLists.txt @@ -79,6 +79,9 @@ INSTALL_SHARED_FILES(zwmsmsdl_SRCS WS ) +# .ui files live in the ui/ subdirectory; tell AUTOUIC where to find them +set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui) + NGL_WRAP_UI(zwmsmsdl_SRCS ${zwmsmsdl_UICS}) NGL_ADD_LIBRARY2(WS zwmsmsdl SHARED ${zwmsmsdl_SRCS} ${zwmsmsdl_UICS} ${zwmsmsdl_IDLS}) NGL_TARGET_INCLUDE_DIRECTORIES(zwmsmsdl @@ -93,7 +96,6 @@ if(QT6_GUI_AVAILABLE) PRIVATE ${Qt6_Gui} Qt6::Xml - Qt6::XmlPatterns XercesC::XercesC PUBLIC svcPpmCommon diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_export.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_export.cpp index bc45fe3d9..e508a6412 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_export.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_export.cpp @@ -184,7 +184,7 @@ msdl_1::MilitaryScenarioType::ForceSides_type Private::createTagForceSides(const for (const ParticipantManagement::Party &party : mapForces) { - if (party.id() == 0 || party.id() == 1) + if (party.id == 0 || party.id == 1) continue; QString obHaStr = QUuid::createUuid().toString(); @@ -202,7 +202,7 @@ msdl_1::MilitaryScenarioType::ForceSides_type Private::createTagForceSides(const const ParticipantManagement::Party &party = itForce.value(); msdl_1::ForceSideType::ObjectHandle_type obHaTy(strUUID.toStdString().c_str()); - msdl_1::ForceSideType::ForceSideName_type foSiNaTy(party.name().c_str()); + msdl_1::ForceSideType::ForceSideName_type foSiNaTy(party.name.c_str()); msdl_1::ForceSideType foSiTy(obHaTy, foSiNaTy); @@ -218,7 +218,7 @@ msdl_1::MilitaryScenarioType::ForceSides_type Private::createTagForceSides(const - ParticipantManagement::Role role = itRelationship.value().role(); + ParticipantManagement::Role role = itRelationship.value().role; msdl_1::ForceSideType::Associations_type::Association_type::Relationship_type relType = msdl_1::ForceSideType::Associations_type::Association_type::Relationship_type::UNK; if (role == ParticipantManagement::Role::Enemy) @@ -238,7 +238,7 @@ msdl_1::MilitaryScenarioType::ForceSides_type Private::createTagForceSides(const foSiTy.Associations(asType); foSiSe.push_back(foSiTy); - mapForceHandles[party.id()] = strUUID; + mapForceHandles[party.id] = strUUID; } return foType; @@ -315,7 +315,7 @@ msdl_1::MilitaryScenarioType::Organizations_type::Units_type Private::createTagU QString obHaStr = QUuid::createUuid().toString(); obHaStr = obHaStr.mid(1, obHaStr.size() - 2); - mapParticipantsUUIDs[participant.id()] = obHaStr.toStdString(); + mapParticipantsUUIDs[participant.id] = obHaStr.toStdString(); } unitsType unitsTy; @@ -326,16 +326,16 @@ msdl_1::MilitaryScenarioType::Organizations_type::Units_type Private::createTagU for (const ParticipantManagement::Participant &participant : mapParticipants) { - if (participant.partyId() != it.key()) + if (participant.partyId != it.key()) continue; - if (participant.isDeleted()) + if (participant.isDeleted) continue; forceRelationDataType foReDaTy; forceRelationChoiceType foReChTy = forceRelationChoiceType::FORCE_SIDE; - if (participant.superiorId() == 0) + if (participant.superiorId == 0) { foReChTy = forceRelationChoiceType::FORCE_SIDE; @@ -346,12 +346,12 @@ msdl_1::MilitaryScenarioType::Organizations_type::Units_type Private::createTagU { foReChTy = forceRelationChoiceType::UNIT; - msdl_1::CommandRelationType::CommandingSuperiorHandle_type handle(mapParticipantsUUIDs.value(participant.superiorId())); + msdl_1::CommandRelationType::CommandingSuperiorHandle_type handle(mapParticipantsUUIDs.value(participant.superiorId)); forceRelationDataType::CommandRelation_type cmdRelation(handle, msdl_1::CommandRelationType::CommandRelationshipType_type::TACON); foReDaTy.CommandRelation(cmdRelation); } - unitType::ObjectHandle_type unObHaTy(mapParticipantsUUIDs.value(participant.id())); + unitType::ObjectHandle_type unObHaTy(mapParticipantsUUIDs.value(participant.id)); unitType::SymbolIdentifier_type syIdTy = "S--------------"; relationsType::ForceRelation_type foReTy(foReChTy, foReDaTy); @@ -360,7 +360,7 @@ msdl_1::MilitaryScenarioType::Organizations_type::Units_type Private::createTagU unitType unitTy(unObHaTy, syIdTy, reTy); unitTy.SymbolIdentifier(syIdTy); - unitType::Name_type naTy(participant.designator().c_str()); + unitType::Name_type naTy(participant.designator.c_str()); unitTy.Name(naTy); unSe.push_back(unitTy); @@ -389,16 +389,16 @@ msdl_1::MilitaryScenarioType::Organizations_type::Equipment_type Private::create for (const ParticipantManagement::Participant &participant : mapParticipants) { - if (participant.partyId() != partyId) + if (participant.partyId != partyId) continue; - if (participant.isDeleted()) + if (participant.isDeleted) continue; ownerDataType::UnitOwnerHandle_type foOwHaTy; - foOwHaTy = mapParticipantsUUIDs.value(participant.id()).c_str(); + foOwHaTy = mapParticipantsUUIDs.value(participant.id).c_str(); ownerDataType owDaTy; owDaTy.UnitOwnerHandle(foOwHaTy); @@ -409,11 +409,11 @@ msdl_1::MilitaryScenarioType::Organizations_type::Equipment_type Private::create - auto vecDISEntities = mapTypes.value(participant.typeId()).disEntities(); + auto vecDISEntities = mapTypes.value(participant.typeId).disEntities; if (!vecDISEntities.size()) { - WARNING_LOG(logger) << "Participant id " << participant.id() - << " belongs to a type id " << participant.typeId() << " which has no DIS id! Skipping export of participant!"; + WARNING_LOG(logger) << "Participant id " << participant.id + << " belongs to a type id " << participant.typeId << " which has no DIS id! Skipping export of participant!"; continue; } @@ -425,9 +425,9 @@ msdl_1::MilitaryScenarioType::Organizations_type::Equipment_type Private::create - coordDataType::GCC_type::X_type x(mapParticipantPositions[participant.id()].pos().lon()); - coordDataType::GCC_type::X_type y(mapParticipantPositions[participant.id()].pos().lat()); - coordDataType::GCC_type::Z_type z(mapParticipantPositions[participant.id()].pos().z()); + coordDataType::GCC_type::X_type x(mapParticipantPositions[participant.id].pos.lon); + coordDataType::GCC_type::X_type y(mapParticipantPositions[participant.id].pos.lat); + coordDataType::GCC_type::Z_type z(mapParticipantPositions[participant.id].pos.z); coordDataType::GCC_type utTy(x, y, z); coordDataType coDaTy; @@ -459,7 +459,7 @@ msdl_1::MilitaryScenarioType::Organizations_type::Equipment_type Private::create eqItTy.ObjectHandle(eqObHaTy); - equipItemType::Name_type naTy(mapEquipment.value(mapTypes.value(participant.typeId()).equipmentTypeId()).name()); + equipItemType::Name_type naTy(mapEquipment.value(mapTypes.value(participant.typeId).equipmentTypeId).name); eqItTy.Name(naTy); eqItTy.SymbolIdentifier(syIdTy); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_export_scenario_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_export_scenario_data.cpp index f4d7121b6..06946cc75 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_export_scenario_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_export_scenario_data.cpp @@ -22,21 +22,21 @@ ScenarioDataDialog::ScenarioDataDialog(QWidget *parent, connect(mUi->m_pushButton_Cancel, &QPushButton::clicked, this, &ScenarioDataDialog::onButtonCancel); ExerciseManagement::Exercise exercise = exmDtc->exercise(pSession->exerciseId()); - mUi->m_lineEdit_ExerciseDescription->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("exerciseDescription"), QString::fromStdString(exercise.description())).toString()); + mUi->m_lineEdit_ExerciseDescription->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("exerciseDescription"), QString::fromStdString(exercise.description)).toString()); - QString strName(QString::fromStdString(exercise.name())); + QString strName(QString::fromStdString(exercise.name)); strName.remove(QLatin1Char(' ')); mUi->m_lineEdit_ExerciseName->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("exerciseName"), strName).toString()); - mUi->m_lineEdit_Domain->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("exerciseDomain"), QString::fromStdString(exercise.partitionName())).toString()); + mUi->m_lineEdit_Domain->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("exerciseDomain"), QString::fromStdString(exercise.partitionName)).toString()); mUi->m_lineEdit_Version->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("exerciseVersion"), QString()).toString()); mUi->m_lineEdit_Purpose->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("exercisePurpose"), QString()).toString()); OperatorManagement::User user = opmDtc->user(LtsSessionData::LtsSessionData::getInstance()->getOperatorId()); - mUi->m_lineEdit_Type->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("pocType"), QString::fromStdString(user.description())).toString()); - mUi->m_lineEdit_AuthorName->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("pocAuthor"), QString::fromStdString(user.name())).toString()); + mUi->m_lineEdit_Type->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("pocType"), QString::fromStdString(user.description)).toString()); + mUi->m_lineEdit_AuthorName->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("pocAuthor"), QString::fromStdString(user.name)).toString()); mUi->m_lineEdit_Organization->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("pocOrganization"), QString()).toString()); mUi->m_lineEdit_Email->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("pocEmail"), QString()).toString()); mUi->m_lineEdit_Telephone->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("pocTelephone"), QString()).toString()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import.cpp index ce3c8d98f..fc086b703 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import.cpp @@ -17,12 +17,9 @@ #include #include #include -#include #include #include #include -#include -#include #include #include @@ -89,17 +86,17 @@ ImportMsdl::ImportMsdl(ParticipantManagement::ParticipantEditModel *pModel, cons for (const ParticipantManagement::Type &type : std::as_const(m_mapTypes)) { - for (const auto &disId : type.disEntities()) + for (const auto &disId : type.disEntities) { QString strMSDL_DISId = ParticipantManagement::DIS::convertDISTypeInteger2MSDLString(disId); if (m_mapMSDL_DIS_2TypeId.find(strMSDL_DISId) != m_mapMSDL_DIS_2TypeId.end()) { - WARNING_LOG(mLogger) << "DIS id \"" << strMSDL_DISId << "\" which is assigned to type id \"" << type.id() << "\" is already assigned to type id \"" << m_mapMSDL_DIS_2TypeId[strMSDL_DISId] << "\""; + WARNING_LOG(mLogger) << "DIS id \"" << strMSDL_DISId << "\" which is assigned to type id \"" << type.id << "\" is already assigned to type id \"" << m_mapMSDL_DIS_2TypeId[strMSDL_DISId] << "\""; continue; } - m_mapMSDL_DIS_2TypeId[strMSDL_DISId] = type.id(); + m_mapMSDL_DIS_2TypeId[strMSDL_DISId] = type.id; } } } @@ -286,13 +283,14 @@ bool ImportMsdl::schemaValidation() return false; } - QXmlSchema schema; - msdl::SchemaMessageHandler smh; - schema.setMessageHandler(&smh); - schema.load(&schemaFile, QUrl::fromLocalFile(schemaFile.fileName())); + // Qt6: Qt XmlPatterns (QXmlSchema) was removed. Check the schema file is + // well-formed XML via Qt6::Xml (QDomDocument); the external xmllint step below + // performs the full schema/instance validation. + QDomDocument schemaDoc; + schemaDoc.setContent(&schemaFile, false); - if (!schema.isValid()) + if (schemaDoc.documentElement().isNull()) { LtsWidgets::LtsMessageDialog::showMessage(this, tr("Schema is invalid")); return false; @@ -322,16 +320,6 @@ bool ImportMsdl::schemaValidation() #endif - QXmlSchemaValidator validator(schema); - - if (false ) - { -#ifdef LTS_DEBUG - LtsWidgets::LtsMessageDialog::showMessage(this, tr("Instance document is invalid")); -#endif - return false; - } - return true; } @@ -341,17 +329,14 @@ ParticipantManagement::ParticipantData ImportMsdl::createParticipant(const MSDLP ParticipantManagement::ParticipantData p; - p.designator(unit.m_designator.toStdString()); - p.tacticalIdentifier(unit.m_tacticalIdentifier.toStdString()); + p.designator = unit.m_designator.toStdString(); + p.tacticalIdentifier = unit.m_tacticalIdentifier.toStdString(); - - p.equipmentNumber() = 0; - p.assignState() = ParticipantManagement::ParticipantAssignState::HandoutExcon; + p.equipmentNumber = 0; + p.assignState = ParticipantManagement::ParticipantAssignState::HandoutExcon; - - - p.symbol(m_mapTypes[unit.m_mappedTypeId].symbol()); - p.typeId(unit.m_mappedTypeId); + p.symbol = m_mapTypes[unit.m_mappedTypeId].symbol; + p.typeId = unit.m_mappedTypeId; return p; } @@ -370,7 +355,7 @@ void ImportMsdl::insertParty(const MSDLParty &party) { ParticipantManagement::ParticipantData newParty; - newParty.designator(party.m_forceSideName.toStdString()); + newParty.designator = party.m_forceSideName.toStdString(); createNode(newParty, m_indexRoot, party.m_ownHandle); } @@ -753,7 +738,7 @@ void ImportMsdl::mapParticipant2Type(MSDLParticipant &participant, qint32 mapped { m_mapMSDL_DIS_2TypeId[participant.m_DISTypeMSDL] = mappedTypeId; - m_mapTypes[mappedTypeId].disEntities().push_back(ParticipantManagement::DIS::convertMSDLString2Integer(participant.m_DISTypeMSDL)); + m_mapTypes[mappedTypeId].disEntities.push_back(ParticipantManagement::DIS::convertMSDLString2Integer(participant.m_DISTypeMSDL)); m_setTouchedTypes.insert(mappedTypeId); } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import_show.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import_show.cpp index dc9fc8491..8f304bd90 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import_show.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import_show.cpp @@ -182,18 +182,3 @@ void ImportMsdlShow::slotCustomContextMenuActionTriggered(QAction *ac) } -void SchemaMessageHandler::handleMessage(QtMsgType type, - const QString &description, - const QUrl &identifier, - const QSourceLocation &sourceLocation) -{ - ERROR_LOG(mLogger) << "type: " << type << " desc: " << description; - if (identifier.isValid()) - ERROR_LOG(mLogger) << "identifier: " << identifier.toString(); - if (!sourceLocation.isNull()) - ERROR_LOG(mLogger) << "sourceLocation: " - << sourceLocation.uri().toString() - << " line: " << sourceLocation.line() - << " column: " << sourceLocation.column() - ; -} diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import_show.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import_show.h index 2d3c50053..bad1255d5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import_show.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import_show.h @@ -4,7 +4,6 @@ #pragma once #include -#include #include #include "msdl_logging.h" @@ -13,23 +12,6 @@ namespace msdl { -class SchemaMessageHandler : public QAbstractMessageHandler -{ - Q_OBJECT -public: - explicit SchemaMessageHandler(QObject *parent = nullptr) - : QAbstractMessageHandler(parent) - , mLogger(getLogger("SchemaMessageHandler")) - {} -protected: - void handleMessage(QtMsgType type, - const QString &description, - const QUrl &identifier = QUrl(), - const QSourceLocation &sourceLocation = QSourceLocation()) override; -private: - LOGGER_T mLogger; -}; - class ImportMsdlShow : public NGLDialog { Q_OBJECT diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_mapping_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_mapping_dialog.cpp index 0307a93b0..53f83a122 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_mapping_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_mapping_dialog.cpp @@ -26,13 +26,13 @@ MappingDialog::MappingDialog(QWidget *parent, bool typeClassIsUnit, const QStrin for (const ParticipantManagement::Type &type : std::as_const(m_mapTypes)) { - if (!m_offerDatabaseEntriesWithoutDISType && (type.disEntities().size() == 0)) + if (!m_offerDatabaseEntriesWithoutDISType && (type.disEntities.size() == 0)) { - WARNING_LOG(mLogger) << "Type id " << type.id() << " does not have assigned DIS types! Type cannot be used when importing MSDL data!"; + WARNING_LOG(mLogger) << "Type id " << type.id << " does not have assigned DIS types! Type cannot be used when importing MSDL data!"; continue; } - const ParticipantManagement::TypeClass typeClassId = type.typeClass(); + const ParticipantManagement::TypeClass typeClassId = type.typeClass; if (typeClassIsUnit) { @@ -49,7 +49,7 @@ MappingDialog::MappingDialog(QWidget *parent, bool typeClassIsUnit, const QStrin } for (const auto &typeclass : setTypeClasses) - mUi->m_ltsComboBox_typeClass->addItem(ParticipantManagement::toString(typeclass), typeclass); + mUi->m_ltsComboBox_typeClass->addItem(ParticipantManagement::toString(typeclass), static_cast(typeclass)); slotClassTypeChanged(); @@ -68,21 +68,21 @@ void MappingDialog::slotClassTypeChanged() { mUi->m_ltsComboBox_type->clear(); - int currentClass = mUi->m_ltsComboBox_typeClass->currentData().toInt(); + ParticipantManagement::TypeClass currentClass = static_cast(mUi->m_ltsComboBox_typeClass->currentData().toInt()); for (const ParticipantManagement::Type &type : std::as_const(m_mapTypes)) { - if (type.typeClass() != currentClass) + if (type.typeClass != currentClass) continue; - if (!m_offerDatabaseEntriesWithoutDISType && (type.disEntities().size() == 0)) + if (!m_offerDatabaseEntriesWithoutDISType && (type.disEntities.size() == 0)) { - WARNING_LOG(mLogger) << "Type id " << type.id() << " does not have assigned DIS types! Type cannot be used when importing MSDL data!"; + WARNING_LOG(mLogger) << "Type id " << type.id << " does not have assigned DIS types! Type cannot be used when importing MSDL data!"; continue; } - mUi->m_ltsComboBox_type->addItem(QString::fromStdString(type.name()), type.id()); + mUi->m_ltsComboBox_type->addItem(QString::fromStdString(type.name), type.id); } } @@ -122,6 +122,6 @@ bool MappingDialog::autoMapAllUnmappedElements() const int32_t MappingDialog::getMappedTypeId() const { int index = mUi->m_ltsComboBox_type->currentData().toInt(); - return m_mapTypes[index].id(); + return m_mapTypes[index].id; } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/ppm_msdl_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/ppm_msdl_edit.cpp index 409b38195..99f819382 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/ppm_msdl_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/ppm_msdl_edit.cpp @@ -3,7 +3,7 @@ #include "ppm_msdl_edit.h" #include "ui_ppm_msdl_edit.h" #include "msdl/msdl_import.h" -#include "msdl_export.h" +#include "msdl/msdl_export.h" #include #include @@ -18,6 +18,7 @@ namespace ParticipantManagement { MSDLEdit::MSDLEdit(LtsSession::LtsSession *session, QWidget *parent) : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel) + , m_logger(getLogger("MSDLEdit")) , m_actionRemove(nullptr) , m_actionEdit(nullptr) , m_ppmDtc(nullptr) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/ppm_saab_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/ppm_saab_edit.cpp index 56fabd209..0b17557e8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/ppm_saab_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/ppm_saab_edit.cpp @@ -3,7 +3,7 @@ #include "ppm_saab_edit.h" #include "ui_ppm_saab_edit.h" #include "saab/saab_import.h" -#include "saab_export.h" +#include "saab/saab_export.h" #include #include @@ -18,6 +18,7 @@ namespace ParticipantManagement { SAABEdit::SAABEdit(LtsSession::LtsSession *session, QWidget *parent) : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel) + , m_logger(getLogger("SAABEdit")) , m_actionRemove(nullptr) , m_actionEdit(nullptr) , m_ppmDtc(nullptr) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/CMakeLists.txt index 4fd044c91..e80348c24 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/CMakeLists.txt @@ -43,6 +43,9 @@ SET(zwmssaab_UICS ui/saab_mapping_dialog.ui ) +# .ui files live in the ui/ subdirectory; tell AUTOUIC where to find them +set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui) + NGL_WRAP_UI(zwmssaab_SRCS ${zwmssaab_UICS}) NGL_ADD_LIBRARY2(WS zwmssaab SHARED ${zwmssaab_SRCS} ${zwmssaab_UICS} ${zwmssaab_IDLS}) NGL_TARGET_INCLUDE_DIRECTORIES(zwmssaab @@ -55,7 +58,6 @@ if(QT6_GUI_AVAILABLE) PRIVATE ${Qt6_Gui} Qt6::Xml - Qt6::XmlPatterns PUBLIC svcPpmCommon LtsUtilsSettings diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_export.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_export.cpp index de4906c39..87f208b9b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_export.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_export.cpp @@ -45,6 +45,7 @@ ExportSaab::ExportSaab(LtsSession::LtsSession *session, const std::shared_ptrsetupUi(this); @@ -369,13 +370,13 @@ void ExportSaab::writeExercise(QXmlStreamWriter *writer) const using namespace XmlStrings; writer->writeStartElement(SAAB_EXERCISE()); - writer->writeAttribute(SAAB_ID(), QUuid(l, m_currentExercise.id(), w2, b1, b2, b3, b4, b5, b6, b7, GuidContext::GuidExercise).toString(QUuid::WithoutBraces)); + writer->writeAttribute(SAAB_ID(), QUuid(l, m_currentExercise.id, w2, b1, b2, b3, b4, b5, b6, b7, GuidContext::GuidExercise).toString(QUuid::WithoutBraces)); writer->writeTextElement(SAAB_EXPORT_TIME(), toSaabTime(m_session->partitionTime())); - writer->writeTextElement(SAAB_PLANNED_START_TIME(), toSaabTime(m_currentExercise.beginTime())); - writer->writeTextElement(SAAB_PLANNED_STOP_TIME(), toSaabTime(m_currentExercise.endTime())); - writer->writeTextElement(SAAB_DESIGNATION(), QString::fromStdString(m_currentExercise.name())); - writer->writeTextElement(SAAB_DESCRIPTION(), QString::fromStdString(m_currentExercise.description())); + writer->writeTextElement(SAAB_PLANNED_START_TIME(), toSaabTime(m_currentExercise.beginTime)); + writer->writeTextElement(SAAB_PLANNED_STOP_TIME(), toSaabTime(m_currentExercise.endTime)); + writer->writeTextElement(SAAB_DESIGNATION(), QString::fromStdString(m_currentExercise.name)); + writer->writeTextElement(SAAB_DESCRIPTION(), QString::fromStdString(m_currentExercise.description)); writer->writeTextElement(SAAB_WIND_SPEED(), QStringLiteral("0")); writer->writeTextElement(SAAB_WIND_DIRECTION(), QStringLiteral("0")); writer->writeEmptyElement(SAAB_EVALUATION_PACKAGE_FILE_NAME()); @@ -420,13 +421,13 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Party &party, result = new SaabUnit; - result->symbol = m_mapPartyToForce.value(party.id()).symbolCode; - static_cast(result)->unitSize = m_mapPartyToForce.value(party.id()).echelonCode; - result->designation = QString::fromStdString(party.name()); + result->symbol = m_mapPartyToForce.value(party.id).symbolCode; + static_cast(result)->unitSize = m_mapPartyToForce.value(party.id).echelonCode; + result->designation = QString::fromStdString(party.name); result->trashcan = false; result->isExternalPlayer = true; - result->force = m_mapPartyToForce.value(party.id()).forceCode; - result->guid = QUuid(l, m_currentExercise.id(), w2, static_cast(party.id()), b2, b3, b4, b5, b6, b7, GuidContext::GuidParty).toString(QUuid::WithoutBraces); + result->force = m_mapPartyToForce.value(party.id).forceCode; + result->guid = QUuid(l, m_currentExercise.id, w2, static_cast(party.id), b2, b3, b4, b5, b6, b7, GuidContext::GuidParty).toString(QUuid::WithoutBraces); QList keys = remainingParticipants.keys(); @@ -438,7 +439,7 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Party &party, ParticipantManagement::Participant participant = remainingParticipants.value(key); - if (!(participant.partyId() == party.id() && participant.superiorId() == 0)) + if (!(participant.partyId == party.id && participant.superiorId == 0)) continue; SaabPlayer *player = toSaabPlayer(participant, remainingParticipants); @@ -454,26 +455,26 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Party &party, SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Participant &participant, QMap &remainingParticipants) { - if (participant.isDeleted()) + if (participant.isDeleted) { - DEBUG_LOG(m_logger) << "Participant with id " << participant.id() << " id deleted --> skipping"; + DEBUG_LOG(m_logger) << "Participant with id " << participant.id << " id deleted --> skipping"; return nullptr; } - if (participant.externalId()) + if (participant.externalId) { - DEBUG_LOG(m_logger) << "Particpant with id " << participant.id() << " has external ID set to " << participant.externalId() << " --> not being exported."; + DEBUG_LOG(m_logger) << "Particpant with id " << participant.id << " has external ID set to " << participant.externalId << " --> not being exported."; return nullptr; } SaabPlayer *result; - ParticipantManagement::Type type = m_types.value(participant.typeId()); + ParticipantManagement::Type type = m_types.value(participant.typeId); - if (!m_mapTypeToSaabSymbol.contains(type.id())) + if (!m_mapTypeToSaabSymbol.contains(type.id)) mapType(type); - switch (type.typeClass()) + switch (type.typeClass) { case ParticipantManagement::TypeClass::SupportEntity: result = new SaabOcPlayer; @@ -491,9 +492,9 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Participant &p { result = new SaabUnit; - DEBUG_LOG(m_logger) << "Reading unit with " << participant.inferiorIds().size() << " inferiors"; + DEBUG_LOG(m_logger) << "Reading unit with " << participant.inferiorIds.size() << " inferiors"; - for (int32_t id : participant.inferiorIds()) + for (int32_t id : participant.inferiorIds) { SaabPlayer *player = toSaabPlayer(remainingParticipants.value(id), remainingParticipants); @@ -509,7 +510,7 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Participant &p if (!static_cast(result)->inferiors.size()) { - DEBUG_LOG(m_logger) << "Unit " << participant.id() << " has no inferiors."; + DEBUG_LOG(m_logger) << "Unit " << participant.id << " has no inferiors."; return nullptr; } @@ -519,11 +520,11 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Participant &p case ParticipantManagement::TypeClass::Aircraft: case ParticipantManagement::TypeClass::Unknown: default: - DEBUG_LOG(m_logger) << "Type " << participant.typeId() << " is not supported."; + DEBUG_LOG(m_logger) << "Type " << participant.typeId << " is not supported."; return nullptr; } - QString symbol = m_mapTypeToSaabSymbol.value(type.id()); + QString symbol = m_mapTypeToSaabSymbol.value(type.id); if (typeid(*result) == typeid(SaabUnit)) { @@ -535,22 +536,22 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Participant &p else result->symbol = symbol; - result->designation = QString::fromStdString(participant.designator()); - result->trashcan = participant.isDeleted(); + result->designation = QString::fromStdString(participant.designator); + result->trashcan = participant.isDeleted; result->rank = QStringLiteral("OF1"); result->isExternalPlayer = true; - if (participant.equipmentNumber().has_value()) - result->simulatorId = participant.equipmentNumber().get(); - result->force = m_mapPartyToForce.value(participant.partyId()).forceCode; - result->guid = QUuid(participant.id(), m_currentExercise.id(), w2, static_cast(participant.partyId()), b2, b3, b4, b5, b6, b7, GuidContext::GuidParticipant).toString(QUuid::WithoutBraces); + if (participant.equipmentNumber.has_value()) + result->simulatorId = participant.equipmentNumber.get(); + result->force = m_mapPartyToForce.value(participant.partyId).forceCode; + result->guid = QUuid(participant.id, m_currentExercise.id, w2, static_cast(participant.partyId), b2, b3, b4, b5, b6, b7, GuidContext::GuidParticipant).toString(QUuid::WithoutBraces); return result; } ParticipantManagement::Participant ExportSaab::rootParticipant(const ParticipantManagement::Participant &participant, const QMap &participants) const { - if (participant.superiorId()) - return rootParticipant(participants.value(participant.superiorId()), participants); + if (participant.superiorId) + return rootParticipant(participants.value(participant.superiorId), participants); return participant; } @@ -563,10 +564,10 @@ void ExportSaab::mapType(const ParticipantManagement::Type &type) { using namespace ParticipantManagement; - MapType dialog(ParticipantManagement::trTypeName(type.name()), + MapType dialog(ParticipantManagement::trTypeName(type.name), m_mapEchelons, m_mapSymbols, - type.typeClass() == TypeClass::Unit || type.typeClass() == TypeClass::SupportUnit, + type.typeClass == TypeClass::Unit || type.typeClass == TypeClass::SupportUnit, this); dialog.exec(); @@ -579,19 +580,19 @@ void ExportSaab::mapType(const ParticipantManagement::Type &type) saabTypeStr.append(dialog.echelonCode()); } - m_mapTypeToSaabSymbol.insert(type.id(), saabTypeStr); + m_mapTypeToSaabSymbol.insert(type.id, saabTypeStr); } void ExportSaab::mapPartyToForce(const ParticipantManagement::Party &party) { - MapParty dialog(QString::fromStdString(party.name()), m_mapForces, m_mapEchelons, m_mapSymbols, this); + MapParty dialog(QString::fromStdString(party.name), m_mapForces, m_mapEchelons, m_mapSymbols, this); dialog.exec(); if (dialog.isSkipped()) return; - m_mapPartyToForce.insert(party.id(), { m_mapForces.take(dialog.force()), dialog.echelonCode(), dialog.symbolCode() }); + m_mapPartyToForce.insert(party.id, { m_mapForces.take(dialog.force()), dialog.echelonCode(), dialog.symbolCode() }); } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import.cpp index 6b76b800a..9667ed557 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import.cpp @@ -166,17 +166,16 @@ ParticipantManagement::ParticipantData ImportSaab::createParticipant(SaabPlayer - p.tacticalIdentifier(player->designation.toStdString()); + p.tacticalIdentifier = player->designation.toStdString(); - - p.equipmentNumber(player->simulatorId != INT_MIN ? player->simulatorId : 0); - p.assignState() = ParticipantManagement::ParticipantAssignState::HandoutExcon; + p.equipmentNumber = (player->simulatorId != INT_MIN ? player->simulatorId : 0); + p.assignState = ParticipantManagement::ParticipantAssignState::HandoutExcon; if (player->simulatorId != INT_MIN) - p.externalId(player->simulatorId); + p.externalId = player->simulatorId; - p.symbol(m_mapTypes[player->mappedTypeId].symbol()); - p.typeId(player->mappedTypeId); + p.symbol = m_mapTypes[player->mappedTypeId].symbol; + p.typeId = player->mappedTypeId; return p; } @@ -192,7 +191,7 @@ void ImportSaab::insertParty(SaabUnit *party) { ParticipantManagement::ParticipantData newParty; - newParty.designator(party->designation.toStdString()); + newParty.designator = party->designation.toStdString(); createNode(newParty, m_indexRoot, party); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import_show.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import_show.cpp index 0805d3433..ab4d18a03 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import_show.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import_show.cpp @@ -182,18 +182,3 @@ void ImportSaabShow::slotCustomContextMenuActionTriggered(QAction *ac) } -void SchemaMessageHandler::handleMessage(QtMsgType type, - const QString &description, - const QUrl &identifier, - const QSourceLocation &sourceLocation) -{ - ERROR_LOG(mLogger) << "type: " << type << " desc: " << description; - if (identifier.isValid()) - ERROR_LOG(mLogger) << "identifier: " << identifier.toString(); - if (!sourceLocation.isNull()) - ERROR_LOG(mLogger) << "sourceLocation: " - << sourceLocation.uri().toString() - << " line: " << sourceLocation.line() - << " column: " << sourceLocation.column() - ; -} diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import_show.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import_show.h index e99fcd4da..1f849c27c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import_show.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import_show.h @@ -4,7 +4,6 @@ #pragma once #include -#include #include #include "saab_logging.h" @@ -13,25 +12,6 @@ namespace saab { -class SchemaMessageHandler : public QAbstractMessageHandler -{ - Q_OBJECT -public: - explicit SchemaMessageHandler(QObject *parent = nullptr) - : QAbstractMessageHandler(parent) - , mLogger(getLogger("SchemaMessageHandler")) - {} - ~SchemaMessageHandler() - {} -protected: - void handleMessage(QtMsgType type, - const QString &description, - const QUrl &identifier = QUrl(), - const QSourceLocation &sourceLocation = QSourceLocation()); -private: - LOGGER_T mLogger; -}; - class ImportSaabShow : public NGLDialog { Q_OBJECT diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_mapping_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_mapping_dialog.cpp index b68da9dac..af93bb0eb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_mapping_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_mapping_dialog.cpp @@ -26,16 +26,16 @@ MappingDialog::MappingDialog(QWidget *parent, bool typeClassIsUnit, const QStrin for (const ParticipantManagement::Type &type : std::as_const(m_mapTypes)) { - if (!m_offerDatabaseEntriesWithoutDISType && (type.disEntities().size() == 0)) + if (!m_offerDatabaseEntriesWithoutDISType && (type.disEntities.size() == 0)) { - WARNING_LOG(mLogger) << "Type id " << type.id() << " does not have assigned DIS types! Type cannot be used when importing SAAB data!"; + WARNING_LOG(mLogger) << "Type id " << type.id << " does not have assigned DIS types! Type cannot be used when importing SAAB data!"; continue; } - if (type.isDeleted()) + if (type.isDeleted) continue; - const ParticipantManagement::TypeClass typeClassId = type.typeClass(); + const ParticipantManagement::TypeClass typeClassId = type.typeClass; if (typeClassId == ParticipantManagement::TypeClass::Unknown || typeClassId == ParticipantManagement::TypeClass::Vessel || @@ -57,7 +57,7 @@ MappingDialog::MappingDialog(QWidget *parent, bool typeClassIsUnit, const QStrin } for (const auto &typeclass : setTypeClasses) - mUi->m_ltsComboBox_typeClass->addItem(ParticipantManagement::toString(typeclass), typeclass); + mUi->m_ltsComboBox_typeClass->addItem(ParticipantManagement::toString(typeclass), static_cast(typeclass)); slotClassTypeChanged(); @@ -76,24 +76,24 @@ void MappingDialog::slotClassTypeChanged() { mUi->m_ltsComboBox_type->clear(); - int currentClass = mUi->m_ltsComboBox_typeClass->currentData().toInt(); + ParticipantManagement::TypeClass currentClass = static_cast(mUi->m_ltsComboBox_typeClass->currentData().toInt()); for (const ParticipantManagement::Type &type : std::as_const(m_mapTypes)) { - if(type.isDeleted()) + if(type.isDeleted) continue; - if (type.typeClass() != currentClass) + if (type.typeClass != currentClass) continue; - if (!m_offerDatabaseEntriesWithoutDISType && (type.disEntities().size() == 0)) + if (!m_offerDatabaseEntriesWithoutDISType && (type.disEntities.size() == 0)) { - WARNING_LOG(mLogger) << "Type id " << type.id() << " does not have assigned DIS types! Type cannot be used when importing SAAB data!"; + WARNING_LOG(mLogger) << "Type id " << type.id << " does not have assigned DIS types! Type cannot be used when importing SAAB data!"; continue; } - mUi->m_ltsComboBox_type->addItem(QString::fromStdString(type.name()), type.id()); + mUi->m_ltsComboBox_type->addItem(QString::fromStdString(type.name), type.id); } } @@ -126,6 +126,6 @@ bool MappingDialog::skipAllUnmappedElements() const int32_t MappingDialog::getMappedTypeId() const { int index = mUi->m_ltsComboBox_type->currentData().toInt(); - return m_mapTypes[index].id(); + return m_mapTypes[index].id; } } diff --git a/qt6-after/qt6-migrated-legatus/new_docker_build.sh b/qt6-after/qt6-migrated-legatus/new_docker_build.sh index 288c480b9..efd5b255e 100755 --- a/qt6-after/qt6-migrated-legatus/new_docker_build.sh +++ b/qt6-after/qt6-migrated-legatus/new_docker_build.sh @@ -57,13 +57,15 @@ BUILD_WEBENGINE_PLUGINS: BUILD_XMLPATTERNS_PLUGINS: --xmlpatterns-plugins / --no-xmlpatterns-plugins - Enable/disable the XmlPatterns-based plugins (MSDL, Saab) - when Qt6XmlPatterns is present in the Qt install. Qt - removed the XmlPatterns module in Qt 6.0 ("What's New in - Qt 6.0" / Qt Wiki: removed, not planned to be - re-introduced; no Qt 6 release ships it, no aqt - module), so with a stock Qt 6.10.2 install these - plugins stay disabled (environmental floor). (default: ON) + Enable/disable the MSDL/Saab plugins. They no longer + require Qt XmlPatterns (removed in Qt 6.0, not + re-introduced): their import logic was re-implemented + with Qt6::Xml (QDomDocument) + the existing xmllint + step, and MSDL additionally links XercesC + uses + xsdc++-generated tree classes (needs xsdcxx + + libxerces-c-dev, both in APT_PACKAGES). With the + prerequisites present these build by default. + (default: ON) Build groups: --group1 / --no-group1 Enable/disable DDS core libraries build @@ -311,6 +313,19 @@ APT_PACKAGES=( # uses Poppler types unconditionally, so a green Group 12 build requires it. pkg-config libpoppler-qt6-dev + # MSDL/Saab no longer require Qt XmlPatterns (removed in Qt 6.0): their import + # logic was re-implemented with Qt6::Xml (QDomDocument) + the existing xmllint + # schema-validation step. MSDL additionally links XercesC and uses xsdc++- + # generated tree classes, so it needs libxerces-c-dev (XercesC C++ parser) and + # xsdcxx (the xsdc++ code generator, XSD_GENERATE_TREE). Saab only needs + # Qt6::Xml; both are installed together so the two plugins build from the same + # image. + xsdcxx + libxerces-c-dev + # xmllint (libxml2-utils): the MSDL import validates the incoming document against + # its XSD via an external `xmllint --schema` step (QProcess) - pre-existing in the + # legacy (msdl_import.cpp). Provision it so that runtime schema check can run. + libxml2-utils ) # INTERFACE libraries (header-only) are built automatically as dependencies @@ -654,15 +669,12 @@ RUN pip3 install --break-system-packages --quiet aqtinstall && \ --outputdir ${QT_BASE_DIR} && \ rm -rf /root/.cache/Aqt -# Qt6 XmlPatterns (MSDL/Saab plugins) is intentionally NOT installed: Qt removed -# the XmlPatterns module in Qt 6.0 ("What's New in Qt 6.0" / Qt Wiki: removed and -# not planned to be re-introduced - unlike e.g. Multimedia/WebEngine which -# returned in 6.1/6.2; no Qt 6 release ships it, no aqt module). Mixing an -# out-of-tree libQt6XmlPatterns built against an older Qt with a 6.10 install -# would put two Qt minor versions in one -# process. MSDL/Saab therefore stay disabled with a stock Qt install; to enable -# them, install a Qt-version-matching XmlPatterns (lib + headers + cmake config) -# into ${QT_BASE_DIR}/${QT_VERSION}/${QT_ARCH_DIR} and pass --xmlpatterns-plugins. +# MSDL/Saab plugins: Qt removed the XmlPatterns module in Qt 6.0 (not re- +# introduced), so their import logic was re-implemented with Qt6::Xml +# (QDomDocument) + the existing external xmllint schema-validation step. MSDL +# additionally links XercesC and uses xsdc++-generated tree classes; xsdcxx + +# libxerces-c-dev are installed via APT_PACKAGES above, so the plugins build with +# a stock Qt 6.10.2 install. # Install KDReports from source (apt package not available in Ubuntu 22.04/26.04) # Try apt install first (will fail), then build from KDAB GitHub mirror @@ -1221,10 +1233,11 @@ GROUP11_TARGETS=( # BldInfoGuiPlugin - links BuildingViewerCommon (dtEntity/OSG SDK absent) # BdvViewerGuiPlugin - links BuildingViewerCommon (same floor; CMake skips its # subdirectory when BuildingViewerCommon is not built) -# PpmMSDLGuiPlugin - links Qt6::XmlPatterns; Qt removed the XmlPatterns -# PpmSAABGuiPlugin - module in Qt 6.0 (not re-introduced; no Qt 6 release -# ships it, incl. 6.10.2). With a stock Qt install the -# BUILD_PLUGINS_MSDL/SAAB flags resolve to OFF (see +# PpmMSDLGuiPlugin / - former XmlPatterns floor, now CLOSED: re-implemented without +# PpmSAABGuiPlugin - Qt XmlPatterns (removed in Qt 6.0) using Qt6::Xml (QDomDocument) +# + the existing xmllint step; MSDL also needs xsdcxx + +# libxerces-c-dev (both in APT_PACKAGES). Now in GROUP12 and built +# by default when the prerequisites are present (see # resolve_xmlpatterns) # The Flt*/Smo* targets only exist when BUILD_FILTERMANAGEMENT / # BUILD_PLUGINS_SERVICEMONITOR are ON (script defaults; see the cmake call). @@ -1341,12 +1354,14 @@ GROUP12_TARGETS=( PlanOverlaysGuiPlugin PpmComboBoxGuiPlugin PpmDataPlugin + PpmMSDLGuiPlugin PpmOperationalPlaningGuiPlugin PpmOrgChartGuiPlugin PpmParticipantEditGuiPlugin PpmParticipantInfoGuiPlugin PpmParticipantTemplatesGuiPlugin PpmPartyEditGuiPlugin + PpmSAABGuiPlugin PpmTypeEditGuiPlugin PpmUasGuiPlugin PreDataPlugin @@ -1691,22 +1706,21 @@ if [[ "${BUILD_ARCGIS}" == "ON" ]]; then fi fi -# The MSDL/Saab plugins link Qt6::XmlPatterns. Qt removed the XmlPatterns -# module in Qt 6.0 ("What's New in Qt 6.0" removal table / Qt Wiki: removed and -# not planned to be re-introduced - unlike Multimedia/WebEngine, which returned -# in 6.1/6.2). No Qt 6 release (incl. 6.10.2) ships it and there is no aqt -# module. An out-of-tree libQt6XmlPatterns built against an older Qt would mix -# two Qt minor versions in one process (ABI risk), so with a stock Qt install -# the plugins are gated OFF. If a Qt-version-matching XmlPatterns (lib + -# headers + Qt6XmlPatterns cmake config) is placed into the Qt prefix, they -# enable automatically. +# The MSDL/Saab plugins no longer require Qt XmlPatterns (removed in Qt 6.0, not +# re-introduced). Their import logic was re-implemented with Qt6::Xml +# (QDomDocument) plus the existing external xmllint schema-validation step; MSDL +# additionally links XercesC and uses xsdc++-generated tree classes. So build +# them by default. MSDL needs the xsdcxx code generator + libxerces-c-dev (both +# are in APT_PACKAGES); if they are missing here, keep both plugins OFF and flag +# the gap. (Saab only needs Qt6::Xml, but is gated together to keep the effective +# value a single switch.) resolve_xmlpatterns() { BUILD_XMLPATTERNS_EFFECTIVE="${BUILD_XMLPATTERNS_PLUGINS}" if [[ "${BUILD_XMLPATTERNS_EFFECTIVE}" == "ON" ]]; then - if ls "${QT_BASE_DIR}/${QT_VERSION}/${QT_ARCH_DIR}/lib/libQt6XmlPatterns.so.6" >/dev/null 2>&1; then - log_info "Qt6XmlPatterns present in the Qt install - MSDL/Saab plugins will be built" + if command -v xsdcxx >/dev/null 2>&1 && [ -e /usr/lib/x86_64-linux-gnu/libxerces-c.so ]; then + log_info "xsdcxx + XercesC present - MSDL/Saab plugins will be built (re-implemented without Qt XmlPatterns)" else - log_warn "Qt6XmlPatterns is not present in the Qt install (removed in Qt 6.0, not re-introduced) - keeping BUILD_PLUGINS_MSDL/BUILD_PLUGINS_SAAB OFF (ppm.msdl / ppm.saab stay unbuilt)" + log_warn "xsdcxx / libxerces-c-dev missing - keeping BUILD_PLUGINS_MSDL/BUILD_PLUGINS_SAAB OFF (ppm.msdl / ppm.saab stay unbuilt)" BUILD_XMLPATTERNS_EFFECTIVE=OFF fi fi From d327c66c46c1c62b8ec45e4015364100748ab178 Mon Sep 17 00:00:00 2001 From: berrux_dev Date: Sat, 24 Oct 2026 19:32:52 +0200 Subject: [PATCH 6/6] Close bld/OSG floor: OSG 3.4.1 from source + port osgQt to Qt6 + wire BgViewer dtEntity Migrate BuildingViewer (16 files: DDS members, m_logger inits, QOpenGLWidget); gui:3:bld.info + gui:3:bdv now load --- .../BgViewer/viewerCtrl/buildingmanager.h | 3 +- .../viewerCtrl/viewerinterfaceimpl.cpp | 1 + .../Common/BgViewer/viewerCtrl/viewwidget.cpp | 4 +- .../Common/BgViewer/viewerCtrl/visitors.cpp | 8 +- .../BuildingViewer/Common/CMakeLists.txt | 2 + .../bdv_communication_interface_internal.cpp | 19 +- .../BuildingViewer/Common/bdv_controller.cpp | 4 +- .../Common/bdv_dds_controller.cpp | 327 +++++++++--------- .../Common/bdv_dds_controller.h | 2 +- .../BuildingViewer/Common/bdv_helper.cpp | 3 +- .../BuildingEdit/bdv_building_edit.cpp | 30 +- .../BuildingEdit/bdv_edit_model.cpp | 32 +- .../bdv_thread_video_exporter.cpp | 5 +- .../bdv_topic_replay_interface.cpp | 18 +- .../BuildingViewer/bdv_viewer_data_dialog.cpp | 2 + .../BuildingViewer/bdv_viewer_data_view.cpp | 2 + .../cmake/FindOpenSceneGraph.cmake | 117 +++++++ 17 files changed, 360 insertions(+), 219 deletions(-) create mode 100644 qt6-after/qt6-migrated-legatus/cmake/FindOpenSceneGraph.cmake diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/buildingmanager.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/buildingmanager.h index 69b6490a0..4c3c81001 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/buildingmanager.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/buildingmanager.h @@ -125,7 +125,8 @@ class Shot Shot(const int32_t id, const osg::Vec3d& shooterPos, const osg::Vec3d& targetPos, int buildingIdSrc, int rommNumberSrc, int buildingIdDst, int rommNumberDst, int lineType, const osg::Vec4& color, unsigned int duration_s, unsigned int durationMax_s, double simTimeCreated) - : mId(id), mShooterPos(shooterPos), mTargetPos(targetPos), mBuildingIdSrc(buildingIdSrc), + : m_logger(BuildingViewer::getLogger("Shot")), mId(id), mShooterPos(shooterPos), + mTargetPos(targetPos), mBuildingIdSrc(buildingIdSrc), mRoomNumberSrc(rommNumberSrc), mBuildingIdDst(buildingIdDst), mRoomNumberDst(rommNumberDst), mLineType(lineType), mColor(color), mDuration_s(duration_s), m_DurationMax_s(durationMax_s), mSimTimeCreated(simTimeCreated) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewerinterfaceimpl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewerinterfaceimpl.cpp index 8e7f73749..9a32d47e9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewerinterfaceimpl.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewerinterfaceimpl.cpp @@ -180,6 +180,7 @@ CtrlImpl::CtrlImpl(dtEntity::EntityManager &em, QWidget *parentWidget) , mPaused(false) , mNonRealtimeMode(false) , mFrameRate(30) + , m_logger(BuildingViewer::getLogger("CtrlImpl")) { if (!mEntityManager->GetES(mMapSystem) || !mEntityManager->GetES(mPlayerSystem)) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewwidget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewwidget.cpp index 55dfdb7e6..896f4bad8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewwidget.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewwidget.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include @@ -176,7 +176,7 @@ void ViewWidget::viewModeChanged() bool ViewWidget::isOpenGlWindowExposed() const { - QGLWidget *gl = qobject_cast(m_pView); + QOpenGLWidget *gl = qobject_cast(m_pView); if (!gl || !gl->windowHandle()) return false; return gl->windowHandle()->isExposed(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/visitors.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/visitors.cpp index ed9cc8db5..c4e220c12 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/visitors.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/visitors.cpp @@ -4,7 +4,6 @@ #include #include #include -#include #include namespace VCtrl @@ -87,10 +86,11 @@ void SplitVisitor::apply(osg::Group &node) for (unsigned int i = 0; i < node.getNumDescriptions(); ++i) { QString descr = QString::fromStdString(node.getDescription(i)); - const QVector descprt = descr.splitRef(QLatin1Char(';')); - for (const QStringRef &prt : descprt) + // Qt6: QStringRef removed; split()/splitRef() both return QVector + const QVector descprt = descr.split(QLatin1Char(';')); + for (const QString &prt : descprt) { - const QVector items = prt.split(QLatin1Char('=')); + const QVector items = prt.split(QLatin1Char('=')); if (items.size() == 2 && items[0] == QLatin1String("base_height")) h = items[1].toFloat(); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/CMakeLists.txt index 58629387e..dc2757e5c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/CMakeLists.txt @@ -113,6 +113,7 @@ if(QT6_GUI_AVAILABLE) NGL_TARGET_LINK_LIBRARIES(BuildingViewerCommon PRIVATE Qt6::OpenGL + Qt6::OpenGLWidgets ${OPENGL_LIBRARIES} ${BGVIEWER_DTENTITYOSG_LIBRARY} ${BGVIEWER_DTENTITY_LIBRARY} @@ -126,6 +127,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(BuildingViewerCommon ${CMAKE_CURRENT_SOURCE_DIR}/BgViewer/viewerCtrl ${CMAKE_CURRENT_SOURCE_DIR}/../share ${OSG_INCLUDE_DIR} + ${BGVIEWER_INCLUDE_DIR} ) IF (NOT WIN32) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_communication_interface_internal.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_communication_interface_internal.cpp index ffc061fa1..c93250024 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_communication_interface_internal.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_communication_interface_internal.cpp @@ -3,6 +3,7 @@ #include "bdv_communication_interface_internal.h" #include +#include #include #include #include @@ -29,7 +30,8 @@ static inline std::string createRoomNumberString(int roomNumber) } CommunicationInterfaceInternal::CommunicationInterfaceInternal(VCtrl::ViewerInterface* pviewerInterface) - : m_pviewerInterface(pviewerInterface) + : m_pviewerInterface(pviewerInterface), + m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("BuildingViewer.CommunicationInterfaceInternal")) { assert(m_pviewerInterface); } @@ -203,10 +205,10 @@ void CommunicationInterfaceInternal::setTeamConfiguration(const QMap> 24) & 0xff) / 255.); bdvParty.color.x = (((argb >> 16) & 0xff) / 255.); bdvParty.color.y = (((argb >> 8) & 0xff) / 255.); @@ -256,9 +258,9 @@ void CommunicationInterfaceInternal::systemSetMountingPoint(const Infrastructure { int buildingId = data.buildingId(); const QString& mountingPointName = filename; - double x = data.relPosition().offsetX(); - double y = data.relPosition().offsetY(); - double z = data.relPosition().offsetZ(); + double x = data.relPosition().offsetX; + double y = data.relPosition().offsetY; + double z = data.relPosition().offsetZ; const std::string buildingIdStr = createBuildingIdString(buildingId); @@ -446,7 +448,8 @@ static inline bool isPlayerId(const std::string& playerIdString, int* playerId) const QString playerIdQString(QString::fromStdString(playerIdString)); bool bOk = false; if (playerIdQString.startsWith(QLatin1String(PLAYER_PREFIX))) - *playerId = playerIdQString.midRef(QLatin1String(PLAYER_PREFIX).size()).toInt(&bOk); + // Qt6: QString::midRef removed; mid() returns the same substring by value. + *playerId = playerIdQString.mid(QLatin1String(PLAYER_PREFIX).size()).toInt(&bOk); return bOk; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_controller.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_controller.cpp index 484aa8e8b..c1242a636 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_controller.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_controller.cpp @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -22,7 +23,8 @@ static char* argv_dummy[] = {(char*)"Dummy"}; BgViewerController::BgViewerController(QObject* parent) : QObject(parent), m_mainloop(argc_dummy, argv_dummy, nullptr), m_widgetStolen(false), m_comIfc(nullptr), - m_pBgViewerDDSController(nullptr), m_bgvApp(nullptr), m_tickTimer(new QTimer(this)) + m_pBgViewerDDSController(nullptr), m_bgvApp(nullptr), m_tickTimer(new QTimer(this)), + m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("BuildingViewer.BgViewerController")) { m_tickTimer->setInterval(1000 / 25); connect(m_tickTimer, &QTimer::timeout, this, [this]() { m_mainloop.tick(); }); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.cpp index b47d79683..a37103ec9 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.cpp @@ -322,11 +322,11 @@ void BuildingViewerDdsController::uninitialize() QPointF BuildingViewerDdsController::toRelativePosition(const Core::GeoPosition& geoPos) const { - if (std::isnan(geoPos.lon()) || std::isnan(geoPos.lat()) || qIsNull(geoPos.lon()) || qIsNull(geoPos.lat())) + if (std::isnan(geoPos.lon) || std::isnan(geoPos.lat) || qIsNull(geoPos.lon) || qIsNull(geoPos.lat)) return {}; LtsCoordTrans::UtmCoordinate coord( - LtsCoordTrans::UtmCoordinate::fromGeographic(geoPos.lon(), geoPos.lat(), m_baseCoordinate.zone)); + LtsCoordTrans::UtmCoordinate::fromGeographic(geoPos.lon, geoPos.lat, m_baseCoordinate.zone)); return coord.relativeTo(m_baseCoordinate); } @@ -335,7 +335,7 @@ LtsUtils::QPoint3D BuildingViewerDdsController::toRelative3D(const Core::GeoPosi const auto ret = toRelativePosition(geoPos); if (ret.isNull()) return {}; - return LtsUtils::QPoint3D(ret.x(), ret.y(), geoPos.z()); + return LtsUtils::QPoint3D(ret.x(), ret.y(), geoPos.z); } bool BuildingViewerDdsController::clear() @@ -371,12 +371,12 @@ bool BuildingViewerDdsController::calcBaseCoordinate( if (!bAtLeasOneFound) { bAtLeasOneFound = true; - geoPosition = mse.geoPosition(); + geoPosition = mse.geoPosition; } else { - geoPosition.lat() = std::min(geoPosition.lat(), mse.geoPosition().lat()); - geoPosition.lon() = std::min(geoPosition.lon(), mse.geoPosition().lon()); + geoPosition.lat = std::min(geoPosition.lat, mse.geoPosition.lat); + geoPosition.lon = std::min(geoPosition.lon, mse.geoPosition.lon); } } if (!bAtLeasOneFound) @@ -384,7 +384,7 @@ bool BuildingViewerDdsController::calcBaseCoordinate( WARNING_LOG(m_logger) << "No building available in exercise " << m_exerciseId; return false; } - m_baseCoordinate = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPosition.lon(), geoPosition.lat()); + m_baseCoordinate = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPosition.lon, geoPosition.lat); return true; } @@ -422,11 +422,11 @@ bool BuildingViewerDdsController::writeBuildingDataToXML(const QString& modelPat const auto bi = BuildingInfo::fromJson(ele.toObject()); if (!bi.isValid()) continue; - mse.id(bi.id); - mse.angle(bi.angleDegree); - mse.geoPosition(Core::GeoPosition(bi.position.x(), bi.position.y(), bi.position.z())); - mse.name(bi.name.toStdString()); - mseMap.insert(mse.id(), mse); + mse.id = bi.id; + mse.angle = bi.angleDegree; + mse.geoPosition = Core::GeoPosition(bi.position.x(), bi.position.y(), bi.position.z()); + mse.name = bi.name.toStdString(); + mseMap.insert(mse.id, mse); } } else @@ -435,17 +435,17 @@ bool BuildingViewerDdsController::writeBuildingDataToXML(const QString& modelPat const auto mMap = m_ismDtc->mainStructureElements(); for (const auto& mse : mMap) { - if (mse.modelId() == 0) + if (mse.modelId == 0) continue; if (!m_ismDtc->isElementAssignedToExercise(mse, m_exerciseId)) { DEBUG_LOG(m_logger) - << "Not writing mse with id " << mse.id() + << "Not writing mse with id " << mse.id << " to building xml file since it is not assigned to the current exercise which has id " << m_exerciseId; continue; } - mseMap.insert(mse.id(), mse); + mseMap.insert(mse.id, mse); } } INFO_LOG(m_logger) << getSessionInfo() @@ -460,7 +460,7 @@ bool BuildingViewerDdsController::writeBuildingDataToXML(const QString& modelPat QXmlStreamWriter sw(&f); sw.setAutoFormatting(true); sw.setAutoFormattingIndent(2); - sw.setCodec("UTF-8"); + // Qt6: QXmlStreamWriter::setCodec removed; it writes UTF-8 by default. sw.writeStartDocument(QStringLiteral("1.0"), true); sw.writeStartElement(QStringLiteral("MetaData")); { @@ -478,28 +478,28 @@ bool BuildingViewerDdsController::writeBuildingDataToXML(const QString& modelPat for (const InfrastructureManagement::MainStructureElement& mse : std::as_const(mseMap)) { - m_knownBuildings += mse.id(); + m_knownBuildings += mse.id; sw.writeStartElement(QStringLiteral("Model")); sw.writeAttribute(QStringLiteral("Type"), QStringLiteral("House")); { - const QString name(QString::fromStdString(mse.name())); + const QString name(QString::fromStdString(mse.name)); sw.writeStartElement(QStringLiteral("Description")); sw.writeAttribute(QStringLiteral("Name"), name); sw.writeEndElement(); sw.writeStartElement(QStringLiteral("Feature")); - sw.writeAttribute(QStringLiteral("Id"), BuildingViewer::databaseId2FeatureId(mse.id())); + sw.writeAttribute(QStringLiteral("Id"), BuildingViewer::databaseId2FeatureId(mse.id)); sw.writeEndElement(); sw.writeStartElement(QStringLiteral("Orientation")); - sw.writeAttribute(QStringLiteral("Angle"), QString::number(360 - mse.angle())); + sw.writeAttribute(QStringLiteral("Angle"), QString::number(360 - mse.angle)); sw.writeEndElement(); - const QPointF offset(toRelativePosition(mse.geoPosition())); + const QPointF offset(toRelativePosition(mse.geoPosition)); sw.writeStartElement(QStringLiteral("Position")); sw.writeAttribute(QStringLiteral("X"), QString::number(offset.x(), 'f', 13)); sw.writeAttribute(QStringLiteral("Y"), QString::number(offset.y(), 'f', 13)); - sw.writeAttribute(QStringLiteral("Z"), QString::number(mse.geoPosition().z(), 'f', 13)); + sw.writeAttribute(QStringLiteral("Z"), QString::number(mse.geoPosition.z, 'f', 13)); sw.writeEndElement(); sw.writeStartElement(QStringLiteral("File")); sw.writeAttribute(QStringLiteral("Name"), name + QStringLiteral(".flt")); @@ -552,7 +552,7 @@ void BuildingViewerDdsController::onReplayChanged(const SituationReplay::SitRepl { Q_UNUSED(modType) - switch (srp.state()) + switch (srp.state) { case SituationReplay::SrpState::Stopped: m_connection->setSimuationPace(1.0); @@ -560,7 +560,7 @@ void BuildingViewerDdsController::onReplayChanged(const SituationReplay::SitRepl break; case SituationReplay::SrpState::Started: case SituationReplay::SrpState::Resumed: - m_connection->setSimuationPace(srp.pace()); + m_connection->setSimuationPace(srp.pace); break; case SituationReplay::SrpState::Paused: @@ -629,7 +629,7 @@ void BuildingViewerDdsController::handleMountingPoint(const InfrastructureManage return; } - QVector3D position(mp.relPosition().offsetX(), mp.relPosition().offsetY(), mp.relPosition().offsetZ()); + QVector3D position(mp.relPosition().offsetX, mp.relPosition().offsetY, mp.relPosition().offsetZ); QString strfeatureID = BuildingViewer::databaseId2FeatureId(mp.buildingId()); QString strMountingPointID = strfeatureID + QStringLiteral("_MountingPoint_") + QString::number(mountingPointId); @@ -712,7 +712,7 @@ void BuildingViewerDdsController::setCurrentTrainingAreaMap(const QString& model bool BuildingViewerDdsController::isValidParticipant(const ParticipantManagement::Participant& participant) const { - if (participant.id() == 0) + if (participant.id == 0) { if (m_logger.isDebugEnabled()) DEBUG_LOG(m_logger) << getSessionInfo() @@ -720,32 +720,32 @@ bool BuildingViewerDdsController::isValidParticipant(const ParticipantManagement return false; } - if (participant.isDeleted()) + if (participant.isDeleted) { DEBUG_LOG(m_logger) << getSessionInfo() << "isValidParticipant: Not handling participant with id " - << participant.id() << " since it is marked as 'deleted'"; + << participant.id << " since it is marked as 'deleted'"; return false; } if (m_session == nullptr) return false; - if (!m_session->isVisibleParty(participant.partyId())) + if (!m_session->isVisibleParty(participant.partyId)) { DEBUG_LOG(m_logger) << getSessionInfo() << "isValidParticipant: Not handling participant with id " - << participant.id() << " since it is not visible for party with id " - << participant.partyId(); + << participant.id << " since it is not visible for party with id " + << participant.partyId; return false; } if (!m_ppmDtc) return false; - ParticipantManagement::TypeClass tc = m_ppmDtc->type(participant.typeId()).typeClass(); + ParticipantManagement::TypeClass tc = m_ppmDtc->type(participant.typeId).typeClass; if (tc == ParticipantManagement::TypeClass::SupportUnit || tc == ParticipantManagement::TypeClass::Unit) { DEBUG_LOG(m_logger) << getSessionInfo() << "isValidParticipant: Not handling participant with id " - << participant.id() << " since its type is 'SupportUnit', 'Unit' or 'Structure'"; + << participant.id << " since its type is 'SupportUnit', 'Unit' or 'Structure'"; return false; } @@ -787,7 +787,7 @@ void BuildingViewerDdsController::createParticipants() auto cb = [this, &positionMap, sizeL](const ParticipantManagement::Participant& part) { if (!isValidParticipant(part)) return; - createParticipant(part, positionMap.value(part.id()), sizeL); + createParticipant(part, positionMap.value(part.id), sizeL); }; m_ppmDtc->participants(cb); @@ -826,7 +826,7 @@ void BuildingViewerDdsController::onBoobyTrapChanged(const AreaEffectSimulation: switch (modType) { case DataModification::eModified: - deleteParticipant(990000 + boobyTrap.id()); + deleteParticipant(990000 + boobyTrap.id); Q_FALLTHROUGH(); case DataModification::eAdded: { int sizeL = LtsUtils::OperatorSettings::getInstance() @@ -836,7 +836,7 @@ void BuildingViewerDdsController::onBoobyTrapChanged(const AreaEffectSimulation: break; } case DataModification::eRemoved: { - deleteParticipant(990000 + boobyTrap.id()); + deleteParticipant(990000 + boobyTrap.id); break; } } @@ -851,17 +851,17 @@ void BuildingViewerDdsController::onParticipantChanged(const ParticipantManageme switch (modType) { case DataModification::eModified: - deleteParticipant(participant.id()); + deleteParticipant(participant.id); Q_FALLTHROUGH(); case DataModification::eAdded: { int sizeL = LtsUtils::OperatorSettings::getInstance() ->value(QStringLiteral("BgViewer"), QStringLiteral("PlayerSymbolSize"), 20) .toInt(); - createParticipant(participant, m_ppmDtc->participantPosition(participant.id()), sizeL); + createParticipant(participant, m_ppmDtc->participantPosition(participant.id), sizeL); break; } case DataModification::eRemoved: { - deleteParticipant(participant.id()); + deleteParticipant(participant.id); break; } } @@ -878,8 +878,8 @@ void BuildingViewerDdsController::onDynParticipantChanged(const ParticipantManag case DataModification::eAdded: case DataModification::eModified: if (m_ppmDtc) - createParticipant(m_ppmDtc->participant(data.participantId()), - m_ppmDtc->participantPosition(data.participantId()), sizeL); + createParticipant(m_ppmDtc->participant(data.participantId), + m_ppmDtc->participantPosition(data.participantId), sizeL); break; case DataModification::eRemoved: { break; @@ -890,12 +890,12 @@ void BuildingViewerDdsController::onDynParticipantChanged(const ParticipantManag void BuildingViewerDdsController::onHitLineInfoChanged(const ParticipantManagement::HitLineInfo& hli, DataModification modType) { - DEBUG_LOG(m_logger) << "X 0000 onHitLineInfoChanged id=" << hli.id(); + DEBUG_LOG(m_logger) << "X 0000 onHitLineInfoChanged id=" << hli.id; if (modType == DataModification::eRemoved) { - DEBUG_LOG(m_logger) << "onHitLineInfoChanged removeHit id=" << hli.id(); - m_connection->removeRoomHit(hli.id()); + DEBUG_LOG(m_logger) << "onHitLineInfoChanged removeHit id=" << hli.id; + m_connection->removeRoomHit(hli.id); return; } @@ -903,24 +903,24 @@ void BuildingViewerDdsController::onHitLineInfoChanged(const ParticipantManageme return; m_ppmDtc->waitForHistoricalDataParticipant(); - const ParticipantManagement::Participant& partSrc = m_ppmDtc->participant(hli.originatorParticipantId()); - const ParticipantManagement::Participant& partDst = m_ppmDtc->participant(hli.injuryParticipantId()); - if (partSrc.id() == 0 || partDst.id() == 0) + const ParticipantManagement::Participant& partSrc = m_ppmDtc->participant(hli.originatorParticipantId); + const ParticipantManagement::Participant& partDst = m_ppmDtc->participant(hli.injuryParticipantId); + if (partSrc.id == 0 || partDst.id == 0) { - ERROR_LOG(m_logger) << "no knownn part: " << partSrc.id() << " dst: " << partDst.id(); + ERROR_LOG(m_logger) << "no knownn part: " << partSrc.id << " dst: " << partDst.id; return; } - const QString& strFeatureID = BuildingViewer::databaseId2FeatureId(hli.injuryBuildingId()); + const QString& strFeatureID = BuildingViewer::databaseId2FeatureId(hli.injuryBuildingId); if (!m_viewerInterface->isViewOpen(strFeatureID.toStdString())) { DEBUG_LOG(m_logger) << "building not opened: hli.buildingId()=" << hli; return; } - if (hli.injuryBuildingId() != 0) + if (hli.injuryBuildingId != 0) { - auto itBuildingHit = m_buildingHits.constFind(hli.injuryBuildingId()); + auto itBuildingHit = m_buildingHits.constFind(hli.injuryBuildingId); if (itBuildingHit != m_buildingHits.constEnd()) { const QVector& bHits = itBuildingHit.value(); @@ -929,14 +929,14 @@ void BuildingViewerDdsController::onHitLineInfoChanged(const ParticipantManageme for (const BuildingHit& bh : bHits) { - const bool testFlag = (bh.chargeTypeId == hli.chargeTypeId() && - bh.originatorParticipantId == hli.originatorParticipantId() && - hli.sampleTime() - m_hitlineDuration_ms < bh.sampleTime); + const bool testFlag = (bh.chargeTypeId == hli.chargeTypeId && + bh.originatorParticipantId == hli.originatorParticipantId && + hli.sampleTime - m_hitlineDuration_ms < bh.sampleTime); DEBUG_LOG(m_logger) << "testFlag " << testFlag; - if (bh.chargeTypeId == hli.chargeTypeId() && - bh.originatorParticipantId == hli.originatorParticipantId() && - hli.sampleTime() - m_hitlineDuration_ms < bh.sampleTime) + if (bh.chargeTypeId == hli.chargeTypeId && + bh.originatorParticipantId == hli.originatorParticipantId && + hli.sampleTime - m_hitlineDuration_ms < bh.sampleTime) return; } } @@ -950,32 +950,32 @@ void BuildingViewerDdsController::onHitLineInfoChanged(const ParticipantManageme DEBUG_LOG(m_logger) << "onHitLineInfoChanged createPlayerSymbols"; createPlayerSymbols(partDst, sizeL); - LtsUtils::QPoint3D originatorSrc = toRelative3D(hli.originatorPos()); - LtsUtils::QPoint3D injuryDest = toRelative3D(hli.injuryPos()); + LtsUtils::QPoint3D originatorSrc = toRelative3D(hli.originatorPos); + LtsUtils::QPoint3D injuryDest = toRelative3D(hli.injuryPos); DEBUG_LOG(m_logger) << "onHitLineInfoChanged playerHit" - << " hli.originatorPos() z=" << hli.originatorPos().z() - << " hli.injuryPos() z=" << hli.injuryPos().z() << " Src=" << originatorSrc.x() << "/" + << " hli.originatorPos() z=" << hli.originatorPos.z + << " hli.injuryPos() z=" << hli.injuryPos.z << " Src=" << originatorSrc.x() << "/" << originatorSrc.y() << "/" << originatorSrc.z() << " Dest= " << injuryDest.x() << "/" << injuryDest.y() << "/" << injuryDest.z() - << " hli.originatorBuildingId=" << hli.originatorBuildingId() - << " hli.originatorRoomId=" << hli.originatorRoomId() - << " hli.injuryBuildingId=" << hli.injuryBuildingId() - << " hli.injuryRoomId=" << hli.injuryRoomId(); + << " hli.originatorBuildingId=" << hli.originatorBuildingId + << " hli.originatorRoomId=" << hli.originatorRoomId + << " hli.injuryBuildingId=" << hli.injuryBuildingId + << " hli.injuryRoomId=" << hli.injuryRoomId; DEBUG_LOG(m_logger) << "Before z-correction:" << " Src=" << originatorSrc.x() << "/" << originatorSrc.y() << "/" << originatorSrc.z() << " Dest= " << injuryDest.x() << "/" << injuryDest.y() << "/" << injuryDest.z(); - double zAddOriginator = m_buildingHeight.value(hli.originatorBuildingId(), 0); - double zAddInjury = m_buildingHeight.value(hli.injuryBuildingId(), 0); + double zAddOriginator = m_buildingHeight.value(hli.originatorBuildingId, 0); + double zAddInjury = m_buildingHeight.value(hli.injuryBuildingId, 0); DEBUG_LOG(m_logger) << "z-correction: zAddOriginator=" << zAddOriginator; DEBUG_LOG(m_logger) << "z-correction: zAddInjury=" << zAddInjury; - if (hli.originatorBuildingId() <= 0) + if (hli.originatorBuildingId <= 0) zAddOriginator = zAddInjury; - if (hli.injuryBuildingId() <= 0) + if (hli.injuryBuildingId <= 0) zAddInjury = zAddOriginator; originatorSrc.setZ(originatorSrc.z() + zAddInjury); @@ -988,54 +988,55 @@ void BuildingViewerDdsController::onHitLineInfoChanged(const ParticipantManageme int buildingIdSrc = -1; int roomNumberSrc = -1; { - auto itId2Number = m_roomId2RoomNumber.constFind(hli.originatorBuildingId()); + auto itId2Number = m_roomId2RoomNumber.constFind(hli.originatorBuildingId); if (itId2Number != m_roomId2RoomNumber.constEnd()) { const auto& mapRooms = itId2Number.value(); - const auto itRoom = mapRooms.constFind(hli.originatorRoomId()); + const auto itRoom = mapRooms.constFind(hli.originatorRoomId); if (itRoom != mapRooms.constEnd()) { - buildingIdSrc = hli.originatorBuildingId(); + buildingIdSrc = hli.originatorBuildingId; roomNumberSrc = itRoom.value(); } else WARNING_LOG(m_logger) << "onHitLineInfoChanged: Room id can not be mapped! Building id: " - << hli.injuryBuildingId() << ", originatorRoomId: " << hli.originatorRoomId(); + << hli.injuryBuildingId << ", originatorRoomId: " << hli.originatorRoomId; } } int buildingIdDst = -1; int roomNumberDst = -1; { - auto itId2Number = m_roomId2RoomNumber.constFind(hli.injuryBuildingId()); + auto itId2Number = m_roomId2RoomNumber.constFind(hli.injuryBuildingId); if (itId2Number != m_roomId2RoomNumber.constEnd()) { const auto& mapRooms = itId2Number.value(); - const auto itRoom = mapRooms.constFind(hli.injuryRoomId()); + const auto itRoom = mapRooms.constFind(hli.injuryRoomId); if (itRoom != mapRooms.constEnd()) { - buildingIdDst = hli.injuryBuildingId(); + buildingIdDst = hli.injuryBuildingId; roomNumberDst = itRoom.value(); } else WARNING_LOG(m_logger) << "onHitLineInfoChanged: Room id can not be mapped! Building id: " - << hli.injuryBuildingId() << ", room id: " << hli.injuryRoomId(); + << hli.injuryBuildingId << ", room id: " << hli.injuryRoomId; } } DEBUG_LOG(m_logger) << "After translate buildingId, roomId:" - << " hli.originatorBuildingId=" << hli.originatorBuildingId() << " -> " << buildingIdSrc - << " hli.originatorRoomId=" << hli.originatorRoomId() << " -> " << roomNumberSrc - << " hli.injuryBuildingId=" << hli.injuryBuildingId() << " -> " << buildingIdDst - << " hli.injuryRoomId=" << hli.injuryBuildingId() << " -> " << roomNumberDst - << " hli.sampleTime=" << hli.sampleTime(); + << " hli.originatorBuildingId=" << hli.originatorBuildingId << " -> " << buildingIdSrc + << " hli.originatorRoomId=" << hli.originatorRoomId << " -> " << roomNumberSrc + << " hli.injuryBuildingId=" << hli.injuryBuildingId << " -> " << buildingIdDst + << " hli.injuryRoomId=" << hli.injuryBuildingId << " -> " << roomNumberDst + << " hli.sampleTime=" << hli.sampleTime; int lineType = 2; - m_pdmDtc->chargeType(hli.chargeTypeId()); + m_pdmDtc->chargeType(hli.chargeTypeId); - lineType = m_pdmDtc->getChargeTypeSpecialProperty(hli.chargeTypeId(), 0, 0); + // DDS enums are enum class; lineType is int. + lineType = static_cast(m_pdmDtc->getChargeTypeSpecialProperty(hli.chargeTypeId, 0, 0)); - m_connection->playerHit(hli.id(), partSrc.id(), partDst.id(), originatorSrc, injuryDest, buildingIdSrc, - roomNumberSrc, buildingIdDst, roomNumberDst, lineType, hli.sampleTime()); + m_connection->playerHit(hli.id, partSrc.id, partDst.id, originatorSrc, injuryDest, buildingIdSrc, + roomNumberSrc, buildingIdDst, roomNumberDst, lineType, hli.sampleTime); } void BuildingViewerDdsController::onPartyChanged(const ParticipantManagement::Party& party, DataModification modType) @@ -1046,7 +1047,7 @@ void BuildingViewerDdsController::onPartyChanged(const ParticipantManagement::Pa int sizeL = LtsUtils::OperatorSettings::getInstance() ->value(QStringLiteral("BgViewer"), QStringLiteral("PlayerSymbolSize"), 20) .toInt(); - updatePlayerSymbols(sizeL, party.id()); + updatePlayerSymbols(sizeL, party.id); syncTeams(); } @@ -1063,35 +1064,35 @@ void BuildingViewerDdsController::onPositionChanged(const ParticipantManagement: int buildingID = -1; int roomNumber = -1; - auto itId2Number = m_roomId2RoomNumber.constFind(position.buildingId()); + auto itId2Number = m_roomId2RoomNumber.constFind(position.buildingId); if (itId2Number != m_roomId2RoomNumber.constEnd()) { const auto& mapRooms = itId2Number.value(); - const auto itRoom = mapRooms.constFind(position.roomId()); + const auto itRoom = mapRooms.constFind(position.roomId); if (itRoom != mapRooms.constEnd()) { - buildingID = position.buildingId(); + buildingID = position.buildingId; roomNumber = itRoom.value(); } else { WARNING_LOG(m_logger) << "onPositionChanged: Room id can not be mapped! Building id: " - << position.buildingId() << ", room id: " << position.roomId(); + << position.buildingId << ", room id: " << position.roomId; } } - if ((roomNumber < 0) && (buildingID <= 0) && (position.buildingId() > 0) && - (position.reportingSource() == Core::PositionReportingSource::Ops || - position.reportingSource() == Core::PositionReportingSource::Wls)) + if ((roomNumber < 0) && (buildingID <= 0) && (position.buildingId > 0) && + (position.reportingSource == Core::PositionReportingSource::Ops || + position.reportingSource == Core::PositionReportingSource::Wls)) { - buildingID = position.buildingId(); + buildingID = position.buildingId; } - const int playerId = position.participantId(); + const int playerId = position.participantId; auto it = m_lastPositionTime.find(playerId); if (it == m_lastPositionTime.end()) { - m_lastPositionTime.insert(playerId, position.sampleTime()); + m_lastPositionTime.insert(playerId, position.sampleTime); if (isOutdatedPosition(position)) m_connection->setPlayerVisible(playerId, false); } @@ -1099,7 +1100,7 @@ void BuildingViewerDdsController::onPositionChanged(const ParticipantManagement: { if (isOutdatedPosition(it.value()) && !isOutdatedPosition(position)) m_connection->setPlayerVisible(playerId, true); - it.value() = position.sampleTime(); + it.value() = position.sampleTime; } if (buildingID <= 0 && roomNumber <= 0) @@ -1118,8 +1119,8 @@ void BuildingViewerDdsController::onPositionChanged(const ParticipantManagement: return; } - m_connection->playerPlace(position.participantId(), toRelative3D(position.pos()), buildingID, roomNumber, - position.reportingSource()); + m_connection->playerPlace(position.participantId, toRelative3D(position.pos), buildingID, roomNumber, + position.reportingSource); } void BuildingViewerDdsController::onParticipantGearEventChanged(const ParticipantManagement::ParticipantGearEvent& data, @@ -1129,12 +1130,12 @@ void BuildingViewerDdsController::onParticipantGearEventChanged(const Participan { case DataModification::eAdded: case DataModification::eModified: { - m_participantGearEvents[data.participantId()] = data.sampleTime(); + m_participantGearEvents[data.participantId] = data.sampleTime; break; } case DataModification::eRemoved: { - const int playerId = data.participantId(); + const int playerId = data.participantId; m_participantGearEvents.remove(playerId); m_connection->playerUpdatePlayerSymbol(playerId, buildPlayerSymbolFilePath(playerId, cColorSymbolId)); break; @@ -1158,44 +1159,44 @@ void BuildingViewerDdsController::createParticipant(const ParticipantManagement: createPlayerSymbols(participant, sizeL); - m_connection->playerCreate(participant.id(), participant.partyId(), buildPlayerSymbolFilePath(participant.id()), - toRelative3D(position.pos()), position.buildingId(), - m_roomId2RoomNumber.value(position.buildingId()).value(position.roomId()), - position.reportingSource()); + m_connection->playerCreate(participant.id, participant.partyId, buildPlayerSymbolFilePath(participant.id), + toRelative3D(position.pos), position.buildingId, + m_roomId2RoomNumber.value(position.buildingId).value(position.roomId), + position.reportingSource); const bool isOutdated = isOutdatedPosition(position); - const int participantId = participant.id(); + const int participantId = participant.id; const bool isValid = - (position.buildingId() > 0 && m_roomId2RoomNumber.value(position.buildingId()).value(position.roomId()) > 0); + (position.buildingId > 0 && m_roomId2RoomNumber.value(position.buildingId).value(position.roomId) > 0); m_connection->setPlayerVisible(participantId, (!isOutdated && isValid)); - m_lastPositionTime.insert(participantId, position.sampleTime()); + m_lastPositionTime.insert(participantId, position.sampleTime); } void BuildingViewerDdsController::createBoobyTrap(const AreaEffectSimulation::BoobyTrap& trap, int sizeL) { - if (trap.effectStateId() != AreaEffectSimulation::AesEffectState::EsActivated && - trap.effectStateId() != AreaEffectSimulation::AesEffectState::EsPrepared) + if (trap.effectStateId != AreaEffectSimulation::AesEffectState::EsActivated && + trap.effectStateId != AreaEffectSimulation::AesEffectState::EsPrepared) return; ParticipantManagement::Participant participant; - if (trap.partyId().has_value()) - participant.partyId() = trap.partyId().get(); - participant.designator() = trap.name(); - participant.designator() = trap.name(); - participant.id() = trap.id() + 990000; - participant.sampleTime() = trap.sampleTime(); - participant.symbol() = "AP6D|CMPL|10011500002104000000"; + if (trap.partyId.has_value()) + participant.partyId = trap.partyId.get(); + participant.designator = trap.name; + participant.designator = trap.name; + participant.id = trap.id + 990000; + participant.sampleTime = trap.sampleTime; + participant.symbol = "AP6D|CMPL|10011500002104000000"; createPlayerSymbols(participant, sizeL); Core::GeoPosition pos; - pos.lat() = trap.impactPosition().lat(); - pos.lon() = trap.impactPosition().lon(); + pos.lat = trap.impactPosition.lat; + pos.lon = trap.impactPosition.lon; - DEBUG_LOG(m_logger) << "Try create Booby trap with id " << trap.id() << " internal id " << participant.id(); - DEBUG_LOG(m_logger) << "Try create Booby trap with pos " << pos.lat() << " " << pos.lon(); - m_connection->playerCreate(participant.id(), participant.partyId(), buildPlayerSymbolFilePath(participant.id()), + DEBUG_LOG(m_logger) << "Try create Booby trap with id " << trap.id << " internal id " << participant.id; + DEBUG_LOG(m_logger) << "Try create Booby trap with pos " << pos.lat << " " << pos.lon; + m_connection->playerCreate(participant.id, participant.partyId, buildPlayerSymbolFilePath(participant.id), toRelative3D(pos), -1, -1, Core::PositionReportingSource::External); - m_connection->setPlayerVisible(participant.id(), true); + m_connection->setPlayerVisible(participant.id, true); } void BuildingViewerDdsController::updatePlayerSymbols(const int sizeL, const int forParty) @@ -1207,7 +1208,7 @@ void BuildingViewerDdsController::updatePlayerSymbols(const int sizeL, const int if (!isValidParticipant(participant)) return; - if (forParty == -1 || participant.partyId() == forParty) + if (forParty == -1 || participant.partyId == forParty) createPlayerSymbols(participant, sizeL); }; m_ppmDtc->participants(cb); @@ -1219,9 +1220,9 @@ void BuildingViewerDdsController::createPlayerSymbols(const ParticipantManagemen SymbolInfo symbolinfo; for (int i = 0; i < m_vecFlashColors.size(); ++i) { - Q_ASSERT(participant.id() != 0); - symbolinfo.participantId = participant.id(); - symbolinfo.strPathToSymbolFile = buildPlayerSymbolFilePath(participant.id(), i); + Q_ASSERT(participant.id != 0); + symbolinfo.participantId = participant.id; + symbolinfo.strPathToSymbolFile = buildPlayerSymbolFilePath(participant.id, i); symbolinfo.color = m_vecFlashColors.at(i); symbolinfo.useThisSymbolNow = !symbolinfo.color.isValid(); createSymbolResultWatcher(participant, symbolinfo, sizeL); @@ -1304,7 +1305,7 @@ void BuildingViewerDdsController::reCheckHitLine() for (const auto& hli : hitMap) { - if (hli.sampleTime() < (m_session->partitionTime() - 3000)) + if (hli.sampleTime < (m_session->partitionTime() - 3000)) onBuildingHitLineInfoChanged(hli, DataModification::eAdded); } } @@ -1332,17 +1333,17 @@ void BuildingViewerDdsController::updateBuildingRoomNames( const InfrastructureManagement::MainStructureElement& building) { - const std::vector& vecElements = building.elements(); + const std::vector& vecElements = building.elements; - int32_t buildingDatabaseId = building.id(); + int32_t buildingDatabaseId = building.id; QString featureID = BuildingViewer::databaseId2FeatureId(buildingDatabaseId); for (const auto& se : vecElements) { - if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Building) - m_connection->excSetBuildingDisplayName(featureID, QString::fromStdString(se.displayName())); - if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Room) - m_connection->excSetRoomDisplayName(featureID, QString::number(se.mountingPointId()), - QString::fromStdString(se.displayName())); + if (se.structureElementTypeId == InfrastructureManagement::StructureElementType::Building) + m_connection->excSetBuildingDisplayName(featureID, QString::fromStdString(se.displayName)); + if (se.structureElementTypeId == InfrastructureManagement::StructureElementType::Room) + m_connection->excSetRoomDisplayName(featureID, QString::number(se.mountingPointId), + QString::fromStdString(se.displayName)); } } @@ -1429,25 +1430,25 @@ void BuildingViewerDdsController::onBuildingStateChanged(const Buildings::Buildi return; QMap roomDestructions; - for (const Buildings::RoomState& rs : data.roomStates()) + for (const Buildings::RoomState& rs : data.roomStates) { - roomDestructions.insert(rs.mountingPointId(), rs.damagePercent()); + roomDestructions.insert(rs.mountingPointId, rs.damagePercent); } - m_connection->buildingHit(data.id(), data.id(), data.damagePercent(), roomDestructions); + m_connection->buildingHit(data.id, data.id, data.damagePercent, roomDestructions); } void BuildingViewerDdsController::onBuildingHitLineInfoChanged(const Buildings::BuildingHitLineInfo& hli, DataModification modType) { - int topidId = static_cast(hli.id()); + int topidId = static_cast(hli.id); DEBUG_LOG(m_logger) << "onBuildingHitLineInfoChanged: " << hli; - const QString& strFeatureID = BuildingViewer::databaseId2FeatureId(hli.buildingId()); + const QString& strFeatureID = BuildingViewer::databaseId2FeatureId(hli.buildingId); if (!m_viewerInterface->isViewOpen(strFeatureID.toStdString())) { - DEBUG_LOG(m_logger) << "building not opened: hli.buildingId()=" << hli.buildingId(); + DEBUG_LOG(m_logger) << "building not opened: hli.buildingId()=" << hli.buildingId; return; } @@ -1457,28 +1458,28 @@ void BuildingViewerDdsController::onBuildingHitLineInfoChanged(const Buildings:: if (isRemove) { DEBUG_LOG(m_logger) << "onBuildingHitLineInfoChanged: remove "; - QVector& bhl = m_buildingHits[hli.buildingId()]; + QVector& bhl = m_buildingHits[hli.buildingId]; - auto it = std::find_if(bhl.begin(), bhl.end(), [hli](const BuildingHit& bh) { return (bh.id == hli.id()); }); + auto it = std::find_if(bhl.begin(), bhl.end(), [hli](const BuildingHit& bh) { return (bh.id == hli.id); }); if (it != bhl.end()) { DEBUG_LOG(m_logger) << "bhl.erase(it)"; bhl.erase(it); } - m_connection->removeRoomHit(hli.id()); + m_connection->removeRoomHit(hli.id); return; } else { BuildingHit bh; - bh.id = hli.id(); - bh.sampleTime = hli.sampleTime(); - bh.originatorParticipantId = hli.originatorParticipantId(); - bh.chargeTypeId = hli.chargeTypeId(); + bh.id = hli.id; + bh.sampleTime = hli.sampleTime; + bh.originatorParticipantId = hli.originatorParticipantId; + bh.chargeTypeId = hli.chargeTypeId; bool contains = false; - for (const auto& it : m_buildingHits[hli.buildingId()]) + for (const auto& it : m_buildingHits[hli.buildingId]) { if (it.id == bh.id) contains = true; @@ -1486,13 +1487,13 @@ void BuildingViewerDdsController::onBuildingHitLineInfoChanged(const Buildings:: if (!contains) { - m_buildingHits[hli.buildingId()].push_back(bh); + m_buildingHits[hli.buildingId].push_back(bh); } } int lineType = 2; - m_connection->roomHit(topidId, hli.originatorParticipantId(), hli.buildingId(), hli.hitOnRoomId(), - toRelative3D(hli.originatorPos()), lineType, isRemove ? 0 : hli.sampleTime()); + m_connection->roomHit(topidId, hli.originatorParticipantId, hli.buildingId, hli.hitOnRoomId, + toRelative3D(hli.originatorPos), lineType, isRemove ? 0 : hli.sampleTime); } void BuildingViewerDdsController::onCleanupBuildingHitlines() @@ -1509,33 +1510,33 @@ void BuildingViewerDdsController::onCleanupBuildingHitlines() void BuildingViewerDdsController::onMainStructureElementChanged( const InfrastructureManagement::MainStructureElement& mse, DataModification modType) { - if (!isBuildingKnown(mse.id())) + if (!isBuildingKnown(mse.id)) return; switch (modType) { case DataModification::eAdded: case DataModification::eModified: { - if (mse.modelId() != 0 && m_ismDtc->isElementAssignedToExercise(mse, m_exerciseId)) + if (mse.modelId != 0 && m_ismDtc->isElementAssignedToExercise(mse, m_exerciseId)) { - DEBUG_LOG(m_logger) << "m_buildingHeight.insert id=" << mse.id() << " z=" << mse.geoPosition().z(); - m_buildingHeight.insert(mse.id(), mse.geoPosition().z()); + DEBUG_LOG(m_logger) << "m_buildingHeight.insert id=" << mse.id << " z=" << mse.geoPosition.z; + m_buildingHeight.insert(mse.id, mse.geoPosition.z); QHash roomId2RoomNumber; - for (const InfrastructureManagement::StructureElement& se : mse.elements()) + for (const InfrastructureManagement::StructureElement& se : mse.elements) { - if (se.structureElementTypeId() != InfrastructureManagement::StructureElementType::Room) + if (se.structureElementTypeId != InfrastructureManagement::StructureElementType::Room) continue; - roomId2RoomNumber[se.id()] = se.mountingPointId(); + roomId2RoomNumber[se.id] = se.mountingPointId; } - m_roomId2RoomNumber[mse.id()] = roomId2RoomNumber; + m_roomId2RoomNumber[mse.id] = roomId2RoomNumber; updateBuildingRoomNames(mse); } break; } case DataModification::eRemoved: - m_roomId2RoomNumber.remove(mse.id()); - m_buildingHeight.remove(mse.id()); + m_roomId2RoomNumber.remove(mse.id); + m_buildingHeight.remove(mse.id); break; } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.h index 18871fd41..f059a5929 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.h @@ -89,7 +89,7 @@ class BuildingViewerDdsController : public QObject inline bool isOutdatedPosition(const ParticipantManagement::ParticipantPosition& position) const { - return position.participantId() <= 0 || isOutdatedPosition(position.sampleTime()); + return position.participantId <= 0 || isOutdatedPosition(position.sampleTime); } bool calcBaseCoordinate(const QMap& mseMap); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_helper.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_helper.cpp index f961e4437..7bbdb13b4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_helper.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_helper.cpp @@ -22,7 +22,8 @@ int32_t featureId2DatabaseId(const QString &strFeatureId) if (!strFeatureId.startsWith(gStrFeatureIdPrefix)) return -1; bool isOk = false; - int32_t buildingDatabaseId = strFeatureId.midRef(gStrFeatureIdPrefix.size()).toInt(&isOk); + // Qt6: QString::midRef removed; mid() returns the same substring by value. + int32_t buildingDatabaseId = strFeatureId.mid(gStrFeatureIdPrefix.size()).toInt(&isOk); return isOk ? buildingDatabaseId : -1; } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_building_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_building_edit.cpp index 8654e155e..6d048ac39 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_building_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_building_edit.cpp @@ -4,6 +4,7 @@ #include "bdv_edit_item.h" #include "ui_bdv_building_edit.h" +#include #include #include @@ -16,7 +17,8 @@ namespace BuildingViewer { BuildingEdit::BuildingEdit(QWidget* parent) : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel), - m_requestHelper(new LtsUtils::RequestHelper(this)), m_ui(new Ui::BuildingEdit) + m_requestHelper(new LtsUtils::RequestHelper(this)), m_ui(new Ui::BuildingEdit), + m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("BuildingViewer.BuildingEdit")) { m_ui->setupUi(this); @@ -69,7 +71,7 @@ bool BuildingEdit::init(int32_t buildingDatabaseId, m_bldFtc = bldFtc; InfrastructureManagement::MainStructureElement building = m_ismDtc->mainStructureElement(m_buildingDatabaseId); - m_buildingId = building.id(); + m_buildingId = building.id; buildModel(); m_buildingName = m_model->getBuildingName(); @@ -158,14 +160,14 @@ bool BuildingEdit::apply() { m_requestHelper->addRequest([this, fortifyFactors]() { Buildings::SetFortifyFactorRequest fortifyRequest; - fortifyRequest.buildingId(m_buildingDatabaseId); + fortifyRequest.buildingId = m_buildingDatabaseId; - fortifyRequest.fortifyFactors().reserve(fortifyFactors.size()); + fortifyRequest.fortifyFactors.reserve(fortifyFactors.size()); for (const auto& e : fortifyFactors) { DEBUG_LOG(m_logger) << "push_back= databaseId=" << e.structureElementId() << " fortifyFactor=" << e.fortifyFactor(); - fortifyRequest.fortifyFactors().push_back( + fortifyRequest.fortifyFactors.push_back( Buildings::FortifyFactor(e.structureElementId(), e.fortifyFactor())); } @@ -184,12 +186,12 @@ bool BuildingEdit::apply() for (const auto& treeItem : displayNames) { - for (const auto& room : building.elements()) + for (const auto& room : building.elements) { - if (room.id() == treeItem.structureElementId()) + if (room.id == treeItem.structureElementId()) { auto copy = room; - copy.displayName(treeItem.displayName().toStdString()); + copy.displayName = treeItem.displayName().toStdString(); vecModifiedRooms.push_back(copy); break; } @@ -231,7 +233,7 @@ void BuildingEdit::slotMainStructureElementChanged(const InfrastructureManagemen if (modType == DataModification::eRemoved) return; - if (mse.id() == m_buildingDatabaseId) + if (mse.id == m_buildingDatabaseId) { slotHandleExternalDdsChange(); @@ -243,7 +245,7 @@ void BuildingEdit::slotBuildingStateChanged(const Buildings::BuildingState& stat if (modType == DataModification::eRemoved) return; - if (state.id() == m_buildingDatabaseId) + if (state.id == m_buildingDatabaseId) { slotHandleExternalDdsChange(); @@ -265,11 +267,11 @@ bool BuildingEdit::sendBuildingStateRequest(ProjectDataManagement::Vulnerability buildings.resize(1); Buildings::SetBuildingStatesRequest requestData; - building.buildingId(m_buildingId); - building.roomIds().set(structureElementIds); + building.buildingId = m_buildingId; + building.roomIds.set(structureElementIds); buildings[0] = building; - requestData.buildings(buildings); - requestData.vulnerabilityState(state); + requestData.buildings = buildings; + requestData.vulnerabilityState = state; DEBUG_LOG(m_logger) << Q_FUNC_INFO << "currentData: " << state; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_edit_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_edit_model.cpp index b91028f8b..f5e6832ca 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_edit_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_edit_model.cpp @@ -17,11 +17,13 @@ namespace BuildingViewer BuildingEditModel::BuildingEditModel(QObject* parent, const std::shared_ptr& ismDtc, const std::shared_ptr& bldDtc) - : NGLTreeModel(parent, new NGLTreeItem(QVariant()), , - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()){ + : NGLTreeModel(parent, new NGLTreeItem(QVariant()), { tr("Selected Building"), QStringLiteral("Name (DEBUG)"), QStringLiteral("MountingPointId (DEBUG)"), QStringLiteral("StructureElementId (DEBUG)"), tr("Fortify Factor"), tr("Damage Percent")}), + // m_logger moved out of the NGLTreeModel(...) call (it is a member init); + // getNGLLogger() returns the INGLLogger& the reference member binds to. + m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("BuildingViewer.BuildingEditModel")), m_ismDtc(ismDtc), m_bldDtc(bldDtc), m_buildingName(QString()) { } @@ -125,11 +127,11 @@ bool BuildingEditModel::init(int32_t mseId) int rootId = 0; qint32 mapId = 0; - const std::vector& vecElements = building.elements(); + const std::vector& vecElements = building.elements; for (const auto& se : vecElements) { DEBUG_LOG(m_logger) << "se: " << se; - if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Building) + if (se.structureElementTypeId == InfrastructureManagement::StructureElementType::Building) { BuildingViewer::TreeItem rootItemBuilding(se); rootName = rootItemBuilding.name(); @@ -142,12 +144,12 @@ bool BuildingEditModel::init(int32_t mseId) for (const auto& se : vecElements) { DEBUG_LOG(m_logger) << "se: =" << se; - if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Floor) + if (se.structureElementTypeId == InfrastructureManagement::StructureElementType::Floor) { BuildingViewer::TreeItem itemRoom(se); itemRoom.setSuperior(rootId); - lookupFloorId2TreeId[se.id()] = mapId; + lookupFloorId2TreeId[se.id] = mapId; treemap[mapId++] = itemRoom; } } @@ -158,20 +160,20 @@ bool BuildingEditModel::init(int32_t mseId) auto bs = m_bldDtc->buildingState(mseId); QMap roomStates; - for (const auto& e : bs.roomStates()) - roomStates[e.id()] = e; + for (const auto& e : bs.roomStates) + roomStates[e.id] = e; for (const auto& se : vecElements) { - if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Room) + if (se.structureElementTypeId == InfrastructureManagement::StructureElementType::Room) { double fortifyFactor = 1.0; - qint32 damagePercent = bs.damagePercent(); - if (roomStates.contains(se.id())) + qint32 damagePercent = bs.damagePercent; + if (roomStates.contains(se.id)) { - fortifyFactor = roomStates[se.id()].fortifyFactor(); - damagePercent = roomStates[se.id()].damagePercent(); + fortifyFactor = roomStates[se.id].fortifyFactor; + damagePercent = roomStates[se.id].damagePercent; } BuildingViewer::TreeItem itemRoom(se, fortifyFactor, damagePercent); @@ -179,13 +181,13 @@ bool BuildingEditModel::init(int32_t mseId) try { - int32_t floorID = se.path()[1]; + int32_t floorID = se.path[1]; itemRoom.setSuperior(lookupFloorId2TreeId[floorID]); } catch (const std::out_of_range& e) { WARNING_LOG(m_logger) << "Caught exception while trying to get superior id for building " << rootName - << " with room with mounting point id: " << se.mountingPointId() << ": " + << " with room with mounting point id: " << se.mountingPointId << ": " << e.what(); return false; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_thread_video_exporter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_thread_video_exporter.cpp index 545a0ede9..c9f98a756 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_thread_video_exporter.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_thread_video_exporter.cpp @@ -1,6 +1,7 @@ #include "bdv_thread_video_exporter.h" +#include #include "bdv_replay_handler.h" @@ -11,7 +12,9 @@ namespace BuildingViewer { -VideoExporter::VideoExporter(QObject* parent) : QObject(parent) +VideoExporter::VideoExporter(QObject* parent) + : QObject(parent), + m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("BuildingViewer.VideoExporter")) { DEBUG_LOG(m_logger) << "ThreadVideoExporter has been created"; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_topic_replay_interface.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_topic_replay_interface.cpp index 074d9cef5..5790d270f 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_topic_replay_interface.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_topic_replay_interface.cpp @@ -1,6 +1,7 @@ #include "bdv_topic_replay_interface.h" +#include #include "bdv_replay_handler.h" #include "bdv_thread_video_exporter.h" @@ -26,7 +27,8 @@ namespace BuildingViewer { TopicReplayInterface::TopicReplayInterface(BgViewerController* bgvController, LtsSession::LtsSession* session) - : m_bgvController(bgvController), m_session(session) + : m_bgvController(bgvController), m_session(session), + m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("BuildingViewer.TopicReplayInterface")) { session->getForeignGuiInterface(m_replayIfc); } @@ -240,20 +242,20 @@ bool TopicReplayInterface::exportBuildings(const QVector& buildingIds) cons for (const int buildingId : buildingIds) { const auto mse = ismDtc->mainStructureElement(buildingId); - if (mse.id() != buildingId) + if (mse.id != buildingId) { WARNING_LOG(m_logger) << "Could not find MainStructureElement for building with id " << buildingId << " - skipping"; continue; } - const QString fnIve = QString::fromStdString(mse.name()) + QStringLiteral(".flt.ive"); - const QString fnXml = QString::fromStdString(mse.name()) + QStringLiteral(".flt.xml"); + const QString fnIve = QString::fromStdString(mse.name) + QStringLiteral(".flt.ive"); + const QString fnXml = QString::fromStdString(mse.name) + QStringLiteral(".flt.xml"); if (!copyFile(fnIve, modelPath, outputPath) || !copyFile(fnXml, modelPath, outputPath)) return false; - bi.name = QString::fromStdString(mse.name()); - bi.position = LtsUtils::QPoint3D(mse.geoPosition().lon(), mse.geoPosition().lat(), mse.geoPosition().z()); - bi.angleDegree = mse.angle(); - bi.id = mse.id(); + bi.name = QString::fromStdString(mse.name); + bi.position = LtsUtils::QPoint3D(mse.geoPosition.lon, mse.geoPosition.lat, mse.geoPosition.z); + bi.angleDegree = mse.angle; + bi.id = mse.id; knownBuildings += bi; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_dialog.cpp index a07764a4d..650d38cfb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_dialog.cpp @@ -2,6 +2,7 @@ #include "bdv_viewer_data_dialog.h" +#include #include "ui_bdv_viewer_data_dialog.h" #include @@ -12,6 +13,7 @@ namespace BuildingViewer BgViewerDataViewDialog::BgViewerDataViewDialog(QWidget *parent) : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly) , m_ui(new Ui::BgViewerDataViewDialog) + , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("BuildingViewer.BgViewerDataViewDialog")) { m_ui->setupUi(this); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_view.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_view.cpp index 0deb8a8b2..d72f05525 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_view.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_view.cpp @@ -2,6 +2,7 @@ #include "bdv_viewer_data_view.h" +#include #include "ui_bdv_viewer_data_view.h" #include "bdv_viewer_data_model.h" @@ -15,6 +16,7 @@ BgViewerDataView::BgViewerDataView(QWidget *parent) : QWidget(parent) , m_ui(new Ui::BgViewerDataView) , m_pModel(new BgViewerDataViewModel(this)) + , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("BuildingViewer.BgViewerDataView")) { m_ui->setupUi(this); diff --git a/qt6-after/qt6-migrated-legatus/cmake/FindOpenSceneGraph.cmake b/qt6-after/qt6-migrated-legatus/cmake/FindOpenSceneGraph.cmake new file mode 100644 index 000000000..25a9d740f --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/cmake/FindOpenSceneGraph.cmake @@ -0,0 +1,117 @@ +# FindOpenSceneGraph.cmake +# +# Locate an installed OpenSceneGraph and expose the module variables that the +# Legatus BuildingViewer stack links against: +# OSG_INCLUDE_DIR, OPENSCENEGRAPH_INCLUDE_DIRS +# OPENSCENEGRAPH_LIBRARIES (the OSG component libs that were found) +# OPENTHREADS_LIBRARIES +# OPENSCENEGRAPH_FOUND, OPENSCENEGRAPH_VERSION +# +# NOTE (Qt6-migration port): OSG 3.4.1 ships no FindOpenSceneGraph.cmake and +# installs no OpenSceneGraphConfig.cmake, so this module is supplied to close +# the bld/OSG floor. It finds the 3.4.1 build installed under CMAKE_PREFIX_PATH +# (the component libs live under /lib64) and honours the requested +# components -- including the ported Qt6 osgQt (see the .osg-port notes). +# +# Mirrors the classic OSG Find-module variable names that BuildingViewer/Common +# links: ${OSG_INCLUDE_DIR}, ${OPENSCENEGRAPH_LIBRARIES}, ${OPENTHREADS_LIBRARIES}. + +SET(OSG_SEARCH_PREFIXES ${CMAKE_PREFIX_PATH} /usr/local /usr) + +# Include dir: locate the osg/Version header. +FIND_PATH(OSG_INCLUDE_DIR + NAMES osg/Version + PATHS ${OSG_SEARCH_PREFIXES} + PATH_SUFFIXES include) + +# OpenThreads support library (distinct SONAME: libOpenThreads.so.20 for 3.4.1). +FIND_LIBRARY(OPENTHREADS_LIBRARY + NAMES OpenThreads + PATHS ${OSG_SEARCH_PREFIXES} + PATH_SUFFIXES lib lib64) + +# OSG component libraries. Find each that exists and collect them so +# OPENSCENEGRAPH_LIBRARIES covers the transitive dependency set the BgViewer +# SDK and BuildingViewerCommon link (the SDK's NEEDED entries require +# osg/DB/GA/Qt/Shadow/Sim/Text/Util/Viewer/Particle/Manipulator/Animation). +SET(OSG_COMPONENT_LIBS + osg + osgDB + osgUtil + osgGA + osgText + osgViewer + osgAnimation + osgManipulator + osgParticle + osgShadow + osgSim + osgWidget + osgQt) + +SET(OPENSCENEGRAPH_LIBRARIES "") +FOREACH(_osg_lib ${OSG_COMPONENT_LIBS}) + FIND_LIBRARY(OSG_LIBRARY_${_osg_lib} + NAMES ${_osg_lib} + PATHS ${OSG_SEARCH_PREFIXES} + PATH_SUFFIXES lib lib64) + IF(OSG_LIBRARY_${_osg_lib}) + LIST(APPEND OPENSCENEGRAPH_LIBRARIES ${OSG_LIBRARY_${_osg_lib}}) + SET(OPENSCENEGRAPH_${_osg_lib}_FOUND TRUE) + ELSE() + SET(OPENSCENEGRAPH_${_osg_lib}_FOUND FALSE) + ENDIF() +ENDFOREACH() + +# Core libs are mandatory for the package to count as found. +SET(_osg_core_ok TRUE) +IF(NOT OSG_LIBRARY_osg OR NOT OSG_LIBRARY_osgDB OR NOT OSG_LIBRARY_osgUtil + OR NOT OSG_LIBRARY_osgGA OR NOT OSG_LIBRARY_osgViewer OR NOT OPENTHREADS_LIBRARY) + SET(_osg_core_ok FALSE) +ENDIF() + +# Any requested component that is missing makes the package not found. +FOREACH(_osg_req ${OpenSceneGraph_FIND_COMPONENTS}) + IF(NOT OSG_LIBRARY_${_osg_req}) + SET(_osg_core_ok FALSE) + MESSAGE(STATUS "OpenSceneGraph: required component '${_osg_req}' not found") + ENDIF() +ENDFOREACH() + +# Version string from the installed header's OPENSCENEGRAPH_*_VERSION macros. +IF(OSG_INCLUDE_DIR) + FILE(READ "${OSG_INCLUDE_DIR}/osg/Version" _osg_version_header) + STRING(REGEX MATCH "#define[ \t]+OPENSCENEGRAPH_MAJOR_VERSION[ \t]+[0-9]+" + _osg_m "${_osg_version_header}") + STRING(REGEX MATCH "#define[ \t]+OPENSCENEGRAPH_MINOR_VERSION[ \t]+[0-9]+" + _osg_n "${_osg_version_header}") + STRING(REGEX MATCH "#define[ \t]+OPENSCENEGRAPH_PATCH_VERSION[ \t]+[0-9]+" + _osg_p "${_osg_version_header}") + STRING(REGEX REPLACE "[^0-9]" "" _osg_major "${_osg_m}") + STRING(REGEX REPLACE "[^0-9]" "" _osg_minor "${_osg_n}") + STRING(REGEX REPLACE "[^0-9]" "" _osg_patch "${_osg_p}") + IF(_osg_major AND _osg_minor AND _osg_patch) + SET(OPENSCENEGRAPH_VERSION "${_osg_major}.${_osg_minor}.${_osg_patch}") + ENDIF() +ENDIF() + +IF(OSG_INCLUDE_DIR AND _osg_core_ok) + SET(OPENSCENEGRAPH_FOUND TRUE) + SET(OPENSCENEGRAPH_INCLUDE_DIRS ${OSG_INCLUDE_DIR}) + SET(OPENTHREADS_LIBRARIES ${OPENTHREADS_LIBRARY}) +ELSE() + SET(OPENSCENEGRAPH_FOUND FALSE) +ENDIF() + +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenSceneGraph + FOUND_VAR OPENSCENEGRAPH_FOUND + VERSION_VAR OPENSCENEGRAPH_VERSION + REQUIRED_VARS OPENSCENEGRAPH_INCLUDE_DIRS OPENSCENEGRAPH_LIBRARIES OPENTHREADS_LIBRARIES) + +MARK_AS_ADVANCED( + OSG_INCLUDE_DIR OPENTHREADS_LIBRARY + OSG_LIBRARY_osg OSG_LIBRARY_osgDB OSG_LIBRARY_osgUtil OSG_LIBRARY_osgGA + OSG_LIBRARY_osgText OSG_LIBRARY_osgViewer OSG_LIBRARY_osgAnimation + OSG_LIBRARY_osgManipulator OSG_LIBRARY_osgParticle OSG_LIBRARY_osgShadow + OSG_LIBRARY_osgSim OSG_LIBRARY_osgWidget OSG_LIBRARY_osgQt)