lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge feature/lts-viewer-validation-testing-phase into feature/qt6-migration-basis-modules-merge

Browse Source 
Resolves 1 conflict (new_docker_build.sh, union of viewer-only + codification options); folds in fixes for pre-existing defects surfaced by the validation runs (KDReports-qt6 wiring, LtsSession RTI linking, LtsFileDialog/WLS/BSM Qt6/RTI API migration, GROUP4 target list, new --cmake_build_flags option); validated with BUILD_RTI=ON BUILD_GRANTLEE=ON in 3 Docker runs (run 3: build green, 6 base-state first-run CTest failures documented).
This commit is contained in:
berrux-dev committed 2026-09-27 07:33:29 +02:00
2 parents 36f077bce4 c664611b80
commit 9c1ac7cbef
30 files changed
+376 -247
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/ism_handler.cpp
+11 -10
View File
@@ -3,6 +3,7 @@
#include "ism_handler.h"
#include "main_handler.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
namespace WirelessLocationSystem
{
@@ -34,26 +35,26 @@ void IsmHandler::onMainStructureElementChanged(const InfrastructureManagement::M
case DataModification::eAdded:
case DataModification::eModified:
{
m_mainStructureElements[data.id()] = data;
if (data.externalWlsId() != 0)
m_externalWlsId2MseId[data.externalWlsId()] = data.id();
m_mainStructureElements[data.id] = data;
if (data.externalWlsId != 0)
m_externalWlsId2MseId[data.externalWlsId] = data.id;
QMap<int, int> roomNumber2roomId;
for (const auto &element : data.elements())
for (const auto &element : data.elements)
{
if (element.structureElementTypeId() != InfrastructureManagement::StructureElementType::Room)
if (element.structureElementTypeId != InfrastructureManagement::StructureElementType::Room)
continue;
roomNumber2roomId[element.mountingPointId()] = element.id();
roomNumber2roomId[element.mountingPointId] = element.id;
}
m_mseId2RoomId[data.id()] = roomNumber2roomId;
m_mseId2RoomId[data.id] = roomNumber2roomId;
break;
}
case DataModification::eRemoved:
{
m_mainStructureElements.remove(data.id());
m_mseId2RoomId.remove(data.id());
m_mainStructureElements.remove(data.id);
m_mseId2RoomId.remove(data.id);
for (auto it = m_externalWlsId2MseId.begin(); it != m_externalWlsId2MseId.end(); ++it)
{
if (it.value() == data.id())
if (it.value() == data.id)
{
m_externalWlsId2MseId.erase(it);
break;