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>
86 lines
2.5 KiB
C++
86 lines
2.5 KiB
C++
/**
|
|
* Handler for the HMI language
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
#include "object_evaluation_element.h"
|
|
|
|
namespace Evaluations
|
|
{
|
|
|
|
ObjectEvaluationElement::ObjectEvaluationElement(const std::shared_ptr<DdsHandler> &ddsHandler,
|
|
const std::shared_ptr<DatabaseInterface> &db)
|
|
: m_ddsHandler(ddsHandler)
|
|
, m_db(db)
|
|
, m_logger(getLogger("ObjectEvaluationElement"))
|
|
{
|
|
}
|
|
|
|
Core::FunctionReplyObject ObjectEvaluationElement::createObject(const Database::EvlElement &data)
|
|
{
|
|
m_data = data;
|
|
|
|
if (m_data.id <= 0)
|
|
{
|
|
if (!m_db->insert(m_data))
|
|
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting EvlElement-data into database"));
|
|
}
|
|
|
|
// Publish Data via DTS
|
|
onPublishData();
|
|
|
|
return Core::FunctionReplyObject(m_data.id);
|
|
}
|
|
|
|
Core::FunctionReplyObject ObjectEvaluationElement::updateObject(const Database::EvlElement &data)
|
|
{
|
|
if (!m_db->update(data))
|
|
return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating EvlElement-data into database"));
|
|
|
|
m_data = data;
|
|
onPublishData();
|
|
|
|
return Core::FunctionReplyObject(m_data.id);
|
|
}
|
|
|
|
Core::FunctionReplyObject ObjectEvaluationElement::removeObject()
|
|
{
|
|
if (!m_db->removeEvlElement(m_data.id))
|
|
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error removing EvlElement-data into database"));
|
|
|
|
m_ddsHandler->dts()->removeEvaluationElementByKey(m_data.id);
|
|
return Core::FunctionReplyObject(m_data.id);
|
|
}
|
|
|
|
void ObjectEvaluationElement::onPublishData()
|
|
{
|
|
Evaluations::EvaluationElement ddsData;
|
|
|
|
ddsData.id(m_data.id);
|
|
ddsData.criteriumId(m_data.criteriumId);
|
|
ddsData.phaseId(m_data.phaseId);
|
|
ddsData.duration(m_data.duration);
|
|
ddsData.situation(!m_data.situationContent.isNull());
|
|
ddsData.video(!m_data.videoContent.isNull());
|
|
ddsData.audio(!m_data.audioContent.isNull());
|
|
ddsData.note(m_data.note.toStdString());
|
|
ddsData.rating(m_data.rating);
|
|
ddsData.timestamp(m_data.time);
|
|
|
|
if (!m_data.audioContent.isNull())
|
|
ddsData.audioContent(m_data.audioContent.toString().toStdString());
|
|
if (!m_data.videoContent.isNull())
|
|
ddsData.videoContent(m_data.videoContent.toString().toStdString());
|
|
if (!m_data.situationContent.isNull())
|
|
ddsData.situationContent(m_data.situationContent.toString().toStdString());
|
|
|
|
INFO_LOG(m_logger) << "Publish EvlElement-data to dds (" << m_data.id << ") ...";
|
|
|
|
if (!m_ddsHandler->dts()->publish(ddsData))
|
|
ERROR_LOG(m_logger) << "Error publishing EvlEvaluationElement-data to dds";
|
|
}
|
|
|
|
} // Namespace Evaluations
|