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>
88 lines
2.2 KiB
C++
88 lines
2.2 KiB
C++
/**
|
|
* Handler for the HMI language
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
#include "object_criterium.h"
|
|
#include "object_evaluation_element.h"
|
|
|
|
namespace Evaluations
|
|
{
|
|
|
|
ObjectCriterium::ObjectCriterium(const std::shared_ptr<DdsHandler> &ddsHandler,
|
|
const std::shared_ptr<DatabaseInterface> &db)
|
|
: m_ddsHandler(ddsHandler)
|
|
, m_db(db)
|
|
, m_logger(getLogger("ObjectCriterium"))
|
|
{
|
|
}
|
|
|
|
ObjectCriterium::~ObjectCriterium()
|
|
{
|
|
qDeleteAll(m_elementsMap);
|
|
}
|
|
|
|
Core::FunctionReplyObject ObjectCriterium::createObject(const Database::EvlCriterium &data)
|
|
{
|
|
m_data = data;
|
|
if (m_data.id <= 0)
|
|
{
|
|
if (!m_db->insert(m_data))
|
|
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting EvlCriterium-data into database"));
|
|
}
|
|
|
|
// Publish Data via DTS
|
|
onPublishData();
|
|
|
|
return Core::FunctionReplyObject(m_data.id);
|
|
}
|
|
|
|
Core::FunctionReplyObject ObjectCriterium::updateObject(const Database::EvlCriterium &data)
|
|
{
|
|
if (!m_db->update(data))
|
|
return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating EvlCriterium-data into database"));
|
|
|
|
m_data = data;
|
|
onPublishData();
|
|
|
|
return Core::FunctionReplyObject(m_data.id);
|
|
}
|
|
|
|
Core::FunctionReplyObject ObjectCriterium::removeObject()
|
|
{
|
|
if (!m_db->removeEvlCriterium(m_data.id))
|
|
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "EvlCriterium with id %1 can not be removed")).arg(m_data.id);
|
|
|
|
for (ObjectEvaluationElement *oee : qAsConst(m_elementsMap))
|
|
oee->removeObject();
|
|
qDeleteAll(m_elementsMap);
|
|
m_elementsMap.clear();
|
|
|
|
m_ddsHandler->dts()->removeEvaluationCriteriumByKey(m_data.id);
|
|
return Core::FunctionReplyObject(m_data.id);
|
|
}
|
|
|
|
void ObjectCriterium::onPublishData()
|
|
{
|
|
Evaluations::EvaluationCriterium ddsData;
|
|
|
|
ddsData.id(m_data.id);
|
|
ddsData.name(m_data.name.toStdString());
|
|
ddsData.description(m_data.description.toStdString());
|
|
ddsData.operatorId(m_data.operatorId);
|
|
|
|
INFO_LOG(m_logger) << "Publish EvlCriterium-data to dds (" << m_data.id << ") ...";
|
|
|
|
if (!m_ddsHandler->dts()->publish(ddsData))
|
|
ERROR_LOG(m_logger) << "Error publishing EvlCriterium-data to dds";
|
|
}
|
|
|
|
void ObjectCriterium::addElement(ObjectEvaluationElement *oee)
|
|
{
|
|
m_elementsMap.insert(oee->getId(), oee);
|
|
}
|
|
|
|
} // Namespace Evaluations
|