Files
qt-migration-legatus/qt5-before/dlbo/Lts/Services/AreaEffectSimulation/Utils/ddsdbconvert.cpp
T
torstenandCopilot 7173785915 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>
2026-09-15 18:20:26 +00:00

160 lines
6.2 KiB
C++

/**
* @RDE_HEADER@
* Wandelt DDS-Strukturen in Database-Strukturen
* $Id$
* $HeadURL$
* $Author$
*/
#include "ddsdbconvert.h"
#include <aes.hpp>
namespace AreaEffectSimulation
{
namespace DdsDbConvert
{
Database::AesNContamination nContamination(const AreaEffectSimulation::NContamination &src)
{
Database::AesNContamination dst;
dst.id = src.id();
dst.chargeTypeId = src.chargeStruct().chargeTypeId();
dst.effectStateId = src.effectStateId();
dst.partyId = src.partyId().is_set() ? src.partyId().get() : 0;
dst.participantId = src.participantId().is_set() ? src.participantId().get() : 0;
dst.effectDuration = src.effectDuration();
dst.effectStart = src.effectStart().is_set() ? QDateTime::fromMSecsSinceEpoch(src.effectStart().get()) : QDateTime();
dst.name = QString::fromStdString(src.name());
dst.impactPosition.rx() = src.impactPosition().lon();
dst.impactPosition.ry() = src.impactPosition().lat();
dst.borderLengthInner = src.borderLengthInner();
dst.borderLengthOuter = src.borderLengthOuter();
dst.impactRadius = src.impactRadius();
dst.spanAngle = src.spanAngle();
dst.rotationAngle = src.rotationAngle();
dst.detonationValue = src.detonationValue();
// dst.priv_entityId;
// dst.privNContaminationId;
return dst;
}
Database::AesBCContamination bcContamination(const BCContamination &src)
{
Database::AesBCContamination dst;
dst.id = src.id();
dst.effectStateId = src.effectStateId();
dst.partyId = src.partyId().is_set() ? src.partyId().get() : 0;
dst.participantId = src.participantId().is_set() ? src.participantId().get() : 0;
dst.effectDuration = src.effectDuration();
dst.effectStart = src.effectStart().is_set() ? QDateTime::fromMSecsSinceEpoch(src.effectStart().get()) : QDateTime();
dst.name = QString::fromStdString(src.name());
dst.impactPosition.rx() = src.impactPosition().lon();
dst.impactPosition.ry() = src.impactPosition().lat();
dst.impactRadius = src.impactRadius();
dst.chargeTypeId = src.chargeStruct().chargeTypeId();
dst.windSpeed = src.windSpeed();
dst.weatherTimestamp = QDateTime::fromMSecsSinceEpoch(src.weatherTimestamp());
dst.propagationDirection = src.propagationDirection();
dst.weatherPosition = dst.impactPosition; // initial, is not used during update therefore it's ok here
dst.upperOffset = src.upperOffset();
dst.lowerOffset = src.lowerOffset();
// dst.expansionFactor;
// dst.isDynamicWeather;
// dst.priv_entityId;
// dst.privBCContaminationId;
return dst;
}
Database::AesExplosionArea explosionArea(const ExplosionArea &src)
{
Database::AesExplosionArea dst;
dst.id = src.id();
dst.effectStateId = src.effectStateId();
dst.partyId = src.partyId().is_set() ? src.partyId().get() : 0;
dst.participantId = src.participantId().is_set() ? src.participantId().get() : 0;
dst.effectDuration = src.effectDuration();
dst.effectStart = src.effectStart().is_set() && src.effectStart().get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart().get()) : QDateTime();
dst.name = QString::fromStdString(src.name());
dst.impactPosition.rx() = src.area().cornerBottomLeft().lon();
dst.impactPosition.ry() = src.area().cornerBottomLeft().lat();
dst.impactLength = src.area().height();
dst.impactWidth = src.area().width();
dst.rotationAngle = src.area().rotation();
dst.chargeTypeId = src.chargeStruct().chargeTypeId();
dst.cannonCount = src.cannonCount();
dst.cannonRounds = src.cannonRounds();
dst.originalEffectStart = src.originalEffectStart() > 0 ? QDateTime::fromMSecsSinceEpoch(src.originalEffectStart()) : QDateTime();
dst.originalEffectDuration = src.originalEffectDuration();
dst.remainExplosionNumber = src.remainExplosionNumber();
// dst.firePurpose;
// dst.fireRequestTime;
// dst.priv_entityId;
// dst.priv_explosionId;
// dst.privExplosionAreaId;
return dst;
}
Database::AesExplosionSingle explosionSingle(const ExplosionSingle &src)
{
Database::AesExplosionSingle dst;
dst.id = src.id();
dst.effectStateId = src.effectStateId();
dst.partyId = src.partyId().is_set() ? src.partyId().get() : 0;
dst.participantId = src.participantId().is_set() ? src.participantId().get() : 0;
dst.effectDuration = src.effectDuration();
dst.effectStart = src.effectStart().is_set() && src.effectStart().get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart().get()) : QDateTime();
dst.name = QString::fromStdString(src.name());
dst.impactPosition.rx() = src.impactPosition().lon();
dst.impactPosition.ry() = src.impactPosition().lat();
dst.chargeTypeId = src.chargeStruct().chargeTypeId();
// dst.priv_entityId;
// dst.priv_explosionId;
// dst.privExplosionSingleId;
return dst;
}
Database::AesMineArea mineArea(const MineArea &src)
{
Database::AesMineArea dst;
dst.id = src.id();
dst.name = QString::fromStdString(src.name());
dst.effectStart = src.effectStart().is_set() && src.effectStart().get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart().get()) : QDateTime();
dst.effectDuration = src.effectDuration();
dst.partyId = src.partyId().is_set() ? src.partyId().get() : 0;
dst.chargeTypeId = src.chargeStruct().chargeTypeId();
dst.participantId = src.participantId().is_set() ? src.participantId().get() : 0;
dst.density = src.density();
dst.width = src.width();
dst.layingProcedureTypeId = src.layingProcedureType();
dst.isLaidHidden = src.isLaidHidden();
dst.effectStateId = src.effectStateId();
dst.isCenterLine = src.isCenterLine();
// qint32 priv_entityId;
// qint32 priv_mineId;
// qint32 privMineAreaId;
return dst;
}
QVector<Database::AesMineAreaSegment> mineAreaSegments(const MineArea &src)
{
const std::vector<AreaEffectSimulation::MineSegment> &segments = src.segments();
QVector<Database::AesMineAreaSegment> dbSegments;
dbSegments.reserve(segments.size());
for (size_t i = 0; i < segments.size(); ++i)
{
Database::AesMineAreaSegment newSegment;
newSegment.elementNumber = i;
newSegment.mineAreaId = src.id(); // Todo: korrekt?
newSegment.id = 0;
newSegment.startPosition = QPointF(segments[i].positionStart().lon(), segments[i].positionStart().lat());
newSegment.endPosition = QPointF(segments[i].positionEnd().lon(), segments[i].positionEnd().lat());
dbSegments << newSegment;
}
return dbSegments;
}
} // namespace DdsDbConvert
} // namespace AreaEffectSimulation