Qt6 Migration: Complete migration with DDS/RTI support and build validation
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>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,78 @@
|
||||
/**
|
||||
* Handler for the HMI language
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#include "object_injury_model.h"
|
||||
|
||||
namespace WarehouseGuez
|
||||
{
|
||||
|
||||
ObjectInjuryModel::ObjectInjuryModel(MainHandler *mainHandler)
|
||||
: m_mainHandler(mainHandler)
|
||||
, m_logger(getLogger("ObjectInjuryModel"))
|
||||
{
|
||||
}
|
||||
|
||||
Core::FunctionReplyObject ObjectInjuryModel::createObject(const Database::InjuryModelAgdusWh &data)
|
||||
{
|
||||
m_data = data;
|
||||
if (m_data.id <= 0)
|
||||
{
|
||||
m_data.id = 0 - m_data.id;
|
||||
if (!m_mainHandler->db()->insert(m_data))
|
||||
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting InjuryModel-data into database"));
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "New InjuryModel: " << m_data.id;
|
||||
|
||||
// Publish Data via DTS
|
||||
onPublishData();
|
||||
|
||||
return Core::FunctionReplyObject(m_data.id);
|
||||
}
|
||||
|
||||
Core::FunctionReplyObject ObjectInjuryModel::updateObject(const Database::InjuryModelAgdusWh &data)
|
||||
{
|
||||
if (!m_mainHandler->db()->update(data))
|
||||
return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating InjuryModel-data into database"));
|
||||
|
||||
m_data = data;
|
||||
DEBUG_LOG(m_logger) << "Data changed for InjuryModelId: " << m_data.id;
|
||||
|
||||
// Publish Data via DTS
|
||||
onPublishData();
|
||||
|
||||
return Core::FunctionReplyObject(m_data.id);
|
||||
}
|
||||
|
||||
Core::FunctionReplyObject ObjectInjuryModel::removeObject()
|
||||
{
|
||||
if (!m_mainHandler->db()->removeInjuryModelAgdusWh(m_data.id))
|
||||
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "InjuryModelId with id %1 can not be removed")).arg(m_data.id);
|
||||
|
||||
m_mainHandler->dds()->dts()->removeInjuryModelAgdusWhByKey(m_data.id);
|
||||
|
||||
return Core::FunctionReplyObject(m_data.id);
|
||||
}
|
||||
|
||||
void ObjectInjuryModel::onPublishData()
|
||||
{
|
||||
WarehouseGuez::InjuryModelAgdusWh ddsData;
|
||||
|
||||
ddsData.id(m_data.id);
|
||||
ddsData.name(m_data.name.toStdString());
|
||||
ddsData.description(m_data.beschreibung.toStdString());
|
||||
ddsData.version(m_data.version.toStdString());
|
||||
|
||||
INFO_LOG(m_logger) << "Publish InjuryModelAgdusWh-data to dds (" << m_data.id << ") ...";
|
||||
|
||||
if (!m_mainHandler->dds()->dts()->publish(ddsData))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error publishing WhgInjuryModel-data to dds";
|
||||
}
|
||||
}
|
||||
|
||||
} // Namespace WarehouseGuez
|
||||
Reference in new issue
Block a user