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.3 KiB
Plaintext
88 lines
2.3 KiB
Plaintext
/**
|
|
* @RDE_HEADER@
|
|
* Template for 'real' structures including insert/update/delete functions for db
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
{% autoescape off %}
|
|
// filename: {{ namespace_abbr }}_db_structs.h
|
|
#pragma once
|
|
|
|
#include <QDateTime>
|
|
#include <QJsonArray>
|
|
#include <QJsonObject>
|
|
#include <QJsonValue>
|
|
#include <QPointF>
|
|
#include <QString>
|
|
#include <QVariant>
|
|
#include <QVector>
|
|
{% if need_point3d %}
|
|
#include <LtsUtilsCore/qpoint3d.h>
|
|
{% endif %}
|
|
{% if need_pgarray %}
|
|
#include <LtsUtilsCore/pgarray.h>
|
|
{% endif %}
|
|
|
|
#include <{{ include_prefix }}/{{ namespace_abbr }}_export.h>
|
|
#include <{{ include_prefix }}/{{ namespace_abbr }}_enums.hpp>
|
|
|
|
{% for ext_service in ext_services.member %}
|
|
#include <{{ ext_service.baseFilePath }}.hpp>
|
|
{% endfor %}
|
|
|
|
namespace {{ namespace }}
|
|
{
|
|
namespace Database
|
|
{
|
|
{% for cpp_struct in cpp_structs %}
|
|
// {{ cpp_struct.name }}
|
|
struct {{ cpp_struct.name }}
|
|
{
|
|
{% for m in cpp_struct.cppMember %}{{ m.cppType }} {{ m.cppMemberName }}{% if m.cppDefault %} = {{ m.cppDefault }}{% endif %};
|
|
{% endfor %}
|
|
};{% endfor %}
|
|
|
|
{% for data_struct in data_structs %}
|
|
// read only struct {{ data_struct.name }}
|
|
struct {{ data_struct.name }}
|
|
{
|
|
{% for m in data_struct.cppMember %}{{ m.cppType }} {{ m.cppMemberName }}{% if m.cppDefault %} = {{ m.cppDefault }}{% endif %};
|
|
{% endfor %}
|
|
};{% endfor %}
|
|
|
|
// converting DbStructs to/from JSON
|
|
template<typename T>
|
|
T fromJson(const QJsonValue &value);
|
|
{% for cpp_struct in cpp_structs %}
|
|
// {{ cpp_struct.name }}
|
|
template <> {{ namespace_abbr_upper }}_{{ library_target }}_EXPORT {{ cpp_struct.name }} fromJson(const QJsonValue &value);
|
|
{{ namespace_abbr_upper }}_{{ library_target }}_EXPORT QJsonObject toJson(const {{ cpp_struct.name }} &element);{% endfor %}
|
|
|
|
// vector of database struct to/from JSON-array
|
|
template<typename T>
|
|
QJsonArray toJson(const QVector<T> &dataVec)
|
|
{
|
|
QJsonArray arr;
|
|
for (const T &data : dataVec)
|
|
arr.append(QJsonValue(toJson(data)));
|
|
|
|
return arr;
|
|
}
|
|
|
|
template<typename T>
|
|
std::vector<T> fromJson(const QJsonArray &arr)
|
|
{
|
|
std::vector<T> dataVec;
|
|
dataVec.reserve(arr.size());
|
|
for (const QJsonValue &val : arr)
|
|
dataVec.push_back(fromJson<T>(val));
|
|
|
|
return dataVec;
|
|
}
|
|
};// namespace Database
|
|
|
|
} // namespace {{ namespace }}
|
|
{% endautoescape %}
|