torstenandCopilot
7173785915
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
75 lines
1.9 KiB
C++
75 lines
1.9 KiB
C++
/**
|
|
* IsmHandler for WirelessLocationSystem
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Christian Ehrlicher, SLSE, 2016-04-14
|
|
*/
|
|
|
|
#include "ism_handler.h"
|
|
#include "main_handler.h"
|
|
|
|
namespace WirelessLocationSystem
|
|
{
|
|
IsmHandler::IsmHandler(QObject *parent)
|
|
: QObject(parent)
|
|
, m_logger(getLogger("IsmHandler"))
|
|
{}
|
|
|
|
bool IsmHandler::init(MainHandler *mainHandler)
|
|
{
|
|
if (m_dtcIsm)
|
|
return true;
|
|
|
|
m_dtcIsm = InfrastructureManagement::Interface::Dtc::create(mainHandler->ddsHandler()->ddsConnector());
|
|
connect(m_dtcIsm.get(), &InfrastructureManagement::Interface::Dtc::mainStructureElementChanged,
|
|
this, &IsmHandler::onMainStructureElementChanged);
|
|
|
|
if (!m_dtcIsm->enableMainStructureElement())
|
|
{
|
|
ERROR_LOG(m_logger) << "Can not read data from ISM";
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
void IsmHandler::onMainStructureElementChanged(const InfrastructureManagement::MainStructureElement &data, DataModification modType)
|
|
{
|
|
switch (modType)
|
|
{
|
|
case DataModification::eAdded:
|
|
case DataModification::eModified:
|
|
{
|
|
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())
|
|
{
|
|
if (element.structureElementTypeId() != InfrastructureManagement::StructureElementType::Room)
|
|
continue;
|
|
roomNumber2roomId[element.mountingPointId()] = element.id();
|
|
}
|
|
m_mseId2RoomId[data.id()] = roomNumber2roomId;
|
|
break;
|
|
}
|
|
case DataModification::eRemoved:
|
|
{
|
|
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())
|
|
{
|
|
m_externalWlsId2MseId.erase(it);
|
|
break;
|
|
}
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
} // namespace WirelessLocationSystem
|