Adds immediate migration results

This commit is contained in:
torsten committed 2026-08-18 22:12:24 +02:00
1 parent ba4121728b
commit 6a2a0667ab
2395 files changed
+357322 -2524

No files matched your search

@@ -1,4 +1,5 @@
#include "buildingmanager.h"
#include <utility>
#include "iconcomponent.h"
#include "modelsplittercomponent.h"
@@ -284,7 +285,7 @@ void BuildingManager::updateShotDuration(unsigned int newDuration_s)
QMutexLocker locker(&m_mutexShots);
for (Building *building : qAsConst(mBuildings))
for (Building *building : std::as_const(mBuildings))
{
for (Shot *pShot : building->mShots)
@@ -2688,7 +2689,7 @@ void BuildingManager::createRoomNames(dtEntity::EntityId buildingid, Building& b
const QPointF qpfCenter(posX.x(), posX.y());
QPointF nearestVertex;
qreal distance = 999999999;
for (const QPointF &vertex : qAsConst(roomObb.mPoly))
for (const QPointF &vertex : std::as_const(roomObb.mPoly))
{
qreal dis = (vertex-qpfCenter).manhattanLength();
@@ -6,7 +6,13 @@
# Created by Mike Wille, SLSE, 2017-08-17
#
FIND_PACKAGE(BgViewer REQUIRED)
FIND_PACKAGE(BgViewer)
IF (BgViewer_FOUND)
SET(BgViewer_FOUND TRUE)
ELSE()
MESSAGE(WARNING "BgViewer not found; skipping BuildingViewerCommon")
RETURN()
ENDIF()
SET(_ver 3.4.1)
IF (WIN32)
SET(_ver 3.4.0)
@@ -90,7 +96,7 @@ INSTALL_SHARED_FILES(BuildingViewerCommon_SRCS
NGL_ADD_LIBRARY2(WS BuildingViewerCommon SHARED ${BuildingViewerCommon_SRCS})
NGL_TARGET_LINK_LIBRARIES(BuildingViewerCommon
PRIVATE
Qt5::OpenGL
Qt6::OpenGL
${OPENGL_LIBRARIES}
${BGVIEWER_DTENTITYOSG_LIBRARY}
${BGVIEWER_DTENTITY_LIBRARY}
@@ -131,9 +137,9 @@ NGL_TARGET_LINK_LIBRARIES(BuildingViewerCommon
ngltools
LtsPluginManager
PUBLIC
Qt5::Core
Qt5::Gui
Qt5::Widgets
Qt6::Core
Qt6::Gui
Qt6::Widgets
AsbDataPluginInterface
AvmDataPluginInterface
BldDataPluginInterface
@@ -1,6 +1,7 @@
#include "bdv_communication_interface_internal.h"
#include <utility>
#include <QTimer>
#include <cassert>
#include <ParticipantManagement/ppm_translation.h>
@@ -446,7 +447,7 @@ void CommunicationInterfaceInternal::extHideMountingPointAsset(const QString &st
void CommunicationInterfaceInternal::clearCameras()
{
for (const DeviceInfo &di : qAsConst(m_deviceMap))
for (const DeviceInfo &di : std::as_const(m_deviceMap))
{
if (!di.deviceName.startsWith(QLatin1String("Camera")))
continue;
@@ -2,6 +2,7 @@
#include "bdv_controller.h"
#include <utility>
#include "bdv_dds_controller.h"
#include "bdv_bgviewer_widget_container.h"
@@ -170,7 +171,7 @@ QString BgViewerController::buildingModelPath()
directoriesToSearch += QStringLiteral("/opt");
#endif
for (const QString &d : qAsConst(directoriesToSearch))
for (const QString &d : std::as_const(directoriesToSearch))
{
const QDir dir(d + QStringLiteral("/BuildingModels/StaticMeshes/"));
if (dir.exists() && dir.isReadable())
@@ -2,6 +2,7 @@
#include "bdv_dds_controller.h"
#include <utility>
#include <Plugins/InfrastructureManagement/Shared/ism_mounting_point.h>
#include <InfrastructureManagement/ism_dtc.h>
@@ -477,7 +478,7 @@ bool BuildingViewerDdsController::writeBuildingDataToXML(const QString &modelPat
sw.writeStartElement(QStringLiteral("Tag"));
sw.writeStartElement(QStringLiteral("Group"));
for (const InfrastructureManagement::MainStructureElement &mse : qAsConst(mseMap))
for (const InfrastructureManagement::MainStructureElement &mse : std::as_const(mseMap))
{
m_knownBuildings += mse.id();
@@ -532,7 +533,7 @@ void BuildingViewerDdsController::clearAssets()
{
INFO_LOG(m_logger) << "clearAssets: Removing " << m_knownAssetsInBgViewer.size() << " assets";
for (const auto &strUniqueAsset : qAsConst(m_knownAssetsInBgViewer))
for (const auto &strUniqueAsset : std::as_const(m_knownAssetsInBgViewer))
m_connection->extHideMountingPointAsset(strUniqueAsset);
m_mountingPointId2AssetType.clear();
@@ -691,7 +692,7 @@ void BuildingViewerDdsController::setCurrentTrainingAreaMap(const QString &model
directoriesToSearch += QStringLiteral("/opt");
#endif
for (const QString &d : qAsConst(directoriesToSearch))
for (const QString &d : std::as_const(directoriesToSearch))
{
const QDir dir(d + QStringLiteral("/BuildingModels/StaticMeshes/"));
if (dir.exists() && dir.isReadable())
@@ -2,6 +2,7 @@
#include "bdv_edit_model.h"
#include <utility>
#include <Common/logger.h>
#include <Services/InfrastructureManagement/ism.hpp>
#include <QtCore/QDebug>
@@ -250,7 +251,7 @@ bool BuildingEditModel::init(int32_t mseId)
QModelIndex BuildingEditModel::modelIndexByMountingPointId(int mountingPointId) const
{
for(const QPersistentModelIndex &mi : qAsConst(m_mapModelIndices))
for(const QPersistentModelIndex &mi : std::as_const(m_mapModelIndices))
{
if (privateData(mi)->data().value<TreeItem>().mountingPointId() == mountingPointId)
return mi;
@@ -68,9 +68,9 @@ NGL_TARGET_LINK_LIBRARIES(BdvViewerGuiPlugin
LtsWidgets
NGLLogger
nglwidgets
Qt5::Core
Qt5::Widgets
Qt5::Xml
Qt6::Core
Qt6::Widgets
Qt6::Xml
TopicEditorBase
LtsUtilsGuiDds
LtsUtilsSettings
@@ -2,6 +2,7 @@
#include "bdv_thread_video_exporter.h"
#include <utility>
#include "bdv_replay_handler.h"
#include <QElapsedTimer>
@@ -28,7 +29,7 @@ void VideoExporter::sendAliveSignals()
{
DEBUG_LOG(m_logger) << "sendAliveSignals() called";
for (auto &e : qAsConst(m_vecVideosToExport))
for (auto &e : std::as_const(m_vecVideosToExport))
emit e.m_pExportNotifier->stillAlive();
DEBUG_LOG(m_logger) << "\tSignals emitted, mutex unlocked";
@@ -2,6 +2,7 @@
#include "bdv_topic_replay_interface.h"
#include <utility>
#include "bdv_viewer_gui_plugin.h"
#include "bdv_thread_video_exporter.h"
#include "bdv_replay_handler.h"
@@ -123,7 +124,7 @@ bool TopicReplayInterface::exportTopic(const QJsonObject &attributes,
(m_startTimeSec + m_durationSec) * 1000);
QJsonArray arr;
for (const SituationReplayTime &rt : qAsConst(m_sitReplayTimes))
for (const SituationReplayTime &rt : std::as_const(m_sitReplayTimes))
{
if (m_startTimeSec > rt.topicEnd_s)
continue;
@@ -184,7 +185,7 @@ bool TopicReplayInterface::exportTopic(const QJsonObject &attributes,
QVector<QSharedPointer<ReplayHandler>> vecReplayHandler;
vecReplayHandler.reserve(m_sitReplayTimes.size());
for (const SituationReplayTime &srt : qAsConst(m_sitReplayTimes))
for (const SituationReplayTime &srt : std::as_const(m_sitReplayTimes))
vecReplayHandler.push_back(QSharedPointer<ReplayHandler>(new ReplayHandler(m_startTimeSec, m_startTimeSec + m_durationSec, srt)));
VideoInformation info(pExportNotifier, folderPath, attributes, vecReplayHandler, record_duration_s);
@@ -280,7 +281,7 @@ bool TopicReplayInterface::exportBuildings(const QVector<int> &buildingIds) cons
});
knownBuildings.erase(std::unique(knownBuildings.begin(), knownBuildings.end()), knownBuildings.end());
QJsonArray arrOut;
for (const auto &b : qAsConst(knownBuildings))
for (const auto &b : std::as_const(knownBuildings))
arrOut += b.toJson();
f.resize(0);