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>
82 lines
2.5 KiB
C++
82 lines
2.5 KiB
C++
#include "object_emergency_call.h"
|
|
#include "logger.h"
|
|
#include "initialization.h"
|
|
|
|
namespace AlarmManagement{
|
|
|
|
ObjectEmergencyCall::ObjectEmergencyCall(Initialization *mainHandler, QObject *parent)
|
|
: QObject(parent)
|
|
, m_mainHandler(mainHandler)
|
|
, m_logger(getLogger("ObjectEmergencyCall"))
|
|
{
|
|
}
|
|
|
|
ObjectEmergencyCall::~ObjectEmergencyCall()
|
|
{
|
|
if (m_data.id > 0)
|
|
m_mainHandler->dds()->dtsAlm()->removeAlarmConfigByKey(m_data.id);
|
|
}
|
|
|
|
Core::FunctionReplyObject ObjectEmergencyCall::createObject(const Database::AlmEmergencyCall &data)
|
|
{
|
|
m_data = data;
|
|
if (m_data.id <= 0)
|
|
{
|
|
if (!m_mainHandler->db()->insert(m_data))
|
|
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting Order into database."));
|
|
WARNING_LOG(m_logger) << "New EmergencyCall created Id: " << m_data.id;
|
|
}
|
|
// Publish Data via DTS
|
|
onPublishData();
|
|
|
|
return Core::FunctionReplyObject(m_data.id);
|
|
}
|
|
|
|
Core::FunctionReplyObject ObjectEmergencyCall::updateObject(const Database::AlmEmergencyCall &data)
|
|
{
|
|
if (data.id <= 0)
|
|
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Object not valid/blocked"));
|
|
m_data = data;
|
|
|
|
if (!m_mainHandler->db()->update(m_data))
|
|
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error updating EmergencyCall into database"));
|
|
|
|
DEBUG_LOG(m_logger) << "Data changed for Changed Id: " << m_data.id;
|
|
|
|
// Publish Data via DTS
|
|
onPublishData();
|
|
|
|
return Core::FunctionReplyObject(m_data.id);
|
|
}
|
|
|
|
Core::FunctionReplyObject ObjectEmergencyCall::removeObject()
|
|
{
|
|
if (!m_mainHandler->db()->removeAlmEmergencyCall(m_data.id))
|
|
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "AlmEmergencyCall %1 can not be removed")).arg(m_data.id);
|
|
|
|
return Core::FunctionReplyObject(m_data.id);
|
|
}
|
|
|
|
|
|
void ObjectEmergencyCall::onPublishData()
|
|
{
|
|
AlarmManagement::AlmEmergencyCall ddsData;
|
|
ddsData.id(m_data.id);
|
|
ddsData.sampleTime(m_data.sampleTime);
|
|
ddsData.incomingTime(m_data.incomingTime);
|
|
ddsData.name(m_data.name.toStdString());
|
|
ddsData.issi(m_data.issi);
|
|
ddsData.position(Core::GeoPosition2D(m_data.position.x(), m_data.position.y()));
|
|
ddsData.expired(m_data.expired);
|
|
ddsData.deleted(m_data.deleted);
|
|
ddsData.operatorId(m_data.operatorId);
|
|
ddsData.comment(m_data.comment.toStdString());
|
|
|
|
INFO_LOG(m_logger) << "Publish AlmEmergencyCall-data to dds (" << m_data.id << ") ...";
|
|
|
|
if (!m_mainHandler->dds()->dtsAlm()->publish(ddsData))
|
|
ERROR_LOG(m_logger) << "Error publishing AlmEmergencyCall-data to dds";
|
|
}
|
|
|
|
}// namespace AlarmManagement
|