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>
67 lines
1.7 KiB
C++
67 lines
1.7 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* ISM Object Sound Area
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Filip Biedziak, NLE, 2020-08-05
|
|
*/
|
|
|
|
#include "object_effect_area.h"
|
|
|
|
|
|
namespace InfrastructureManagement
|
|
{
|
|
|
|
ObjectEffectArea::ObjectEffectArea(MainHandler *mainHandler)
|
|
: Base(mainHandler, getLogger("ObjectEffectArea"))
|
|
{
|
|
}
|
|
|
|
ObjectEffectArea::~ObjectEffectArea()
|
|
{
|
|
}
|
|
|
|
|
|
//-----------------------------------------------------------------------------------------------------------------------------
|
|
Core::FunctionReplyObject ObjectEffectArea::createObject(const EffectArea &data)
|
|
{
|
|
m_data = data;
|
|
m_data.name("Sound Area " + std::to_string(m_data.id()));
|
|
|
|
onPublishData(); // publish data via DDS
|
|
|
|
return Core::FunctionReplyObject(m_data.id());
|
|
}
|
|
|
|
Core::FunctionReplyObject ObjectEffectArea::updateObject(const EffectArea &data)
|
|
{
|
|
m_data = data;
|
|
DEBUG_LOG(m_logger) << "Data changed for Id: " << m_data.id();
|
|
|
|
onPublishData(); // publish data via DTS
|
|
|
|
return Core::FunctionReplyObject(m_data.id());
|
|
}
|
|
|
|
Core::FunctionReplyObject ObjectEffectArea::removeObject()
|
|
{
|
|
if (!dts()->removeEffectAreaByKey(m_data.id()))
|
|
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "EffectArea with id %1 can not be removed from DDS")).arg(m_data.id());
|
|
|
|
return Core::FunctionReplyObject(m_data.id());
|
|
}
|
|
|
|
|
|
//-----------------------------------------------------------------------------------------------------------------------------
|
|
void ObjectEffectArea::onPublishData()
|
|
{
|
|
INFO_LOG(m_logger) << "Publish IsmEffectArea-data to dds (" << m_data.id() << ") ...";
|
|
|
|
if (!dts()->publish(m_data))
|
|
ERROR_LOG(m_logger) << "Error publishing IsmEffectArea-data to dds";
|
|
}
|
|
|
|
} // namespace InfrastructureManagement
|
|
|