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

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
commit 9c1ac7cbef
30 files changed
+376 -247

No files matched your search

@@ -47,6 +47,10 @@ NGL_TARGET_LINK_LIBRARIES(BuildingControlBsm
BuildingControlCommon
svcTabCommon
)
NGL_TARGET_INCLUDE_DIRECTORIES(BuildingControlBsm
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../..
)
NGL_ADD_EXECUTABLE(AAR SV BuildingControlTestBsm bsm_test_main.cpp)
NGL_TARGET_LINK_LIBRARIES(BuildingControlTestBsm
@@ -3,6 +3,7 @@
#include "bsm_api.h"
#include "bsm_socket_handler.h"
#include <TrainingAreaBase/logger.h>
namespace BuildingControlUnit
{
@@ -6,6 +6,7 @@
#include "bsm_telegrams_configuration_setup.h"
#include <QtCore/QTimer>
#include <QtNetwork/QHostAddress>
#include <TrainingAreaBase/logger.h>
static const int s_aliveTimeout = 10;
namespace BuildingControlUnit
@@ -3,6 +3,7 @@
#include "bsm_socket_handler.h"
#include <utility>
#include <TrainingAreaBase/logger.h>
#include "bsm_telegrams_base.h"
#include "bsm_telegrams_bit_timeout_request.h"
#include "bsm_telegrams_chopped_signal_flash.h"
@@ -3,6 +3,7 @@
#include "bsm_telegrams_base.h"
#include "bsm_telegrams_alive.h"
#include <TrainingAreaBase/logger.h>
#include "bsm_telegrams_bit_timeout_report.h"
#include "bsm_telegrams_direct_fire.h"
#include "bsm_telegrams_sw_version_report.h"
@@ -2,7 +2,7 @@
#include "bsm_telegrams_direct_fire.h"
#include "logger.h"
#include <TrainingAreaBase/logger.h>
#include <QStringBuilder>
namespace BuildingControlUnit
@@ -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;
@@ -10,6 +10,8 @@
#include "wls_handler.h"
#include "wls_participant_handler.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <QtCore/QJsonDocument>
@@ -13,6 +13,8 @@
#include <QtCore/QDateTime>
#include <web_socket_handler.h>
#include <NGLLogger/NGLLoggerBootstrap.h>
namespace WirelessLocationSystem
{
@@ -9,6 +9,8 @@
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <LtsUtils/LtsUtilsCore/sfm_bytemessage_converter.h>
#include <NGLLogger/NGLLoggerBootstrap.h>
static constexpr qint64 s_dataCommunicationAliveTimeout = 5 * 1000;
static constexpr int s_maxWlsRetryCount = 3;
@@ -7,6 +7,7 @@
#include "wls_handler.h"
#include <QtCore/QDateTime>
#include <NGLLogger/NGLLoggerBootstrap.h>
namespace WirelessLocationSystem
{