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>
87 lines
2.2 KiB
C++
87 lines
2.2 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* ObjectMap for Trajectory
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
#include "main_handler.h"
|
|
#include "object_trajectory.h"
|
|
|
|
namespace AreaEffectSimulation
|
|
{
|
|
|
|
ObjectTrajectory::ObjectTrajectory(MainHandler *mainHandler/*, QObject *parent*/)
|
|
: m_mainHandler(mainHandler)
|
|
{
|
|
}
|
|
|
|
ObjectTrajectory::~ObjectTrajectory()
|
|
{
|
|
removeTopic();
|
|
}
|
|
|
|
qint64 ObjectTrajectory::partitionTimeMSec() const
|
|
{
|
|
return m_mainHandler->dds()->currentPartitionTimeMSec();
|
|
}
|
|
|
|
bool ObjectTrajectory::createObject(const TrajectoryData &providedData)
|
|
{
|
|
if (!providedData.isIdValid())
|
|
return false;
|
|
m_providedData = providedData;
|
|
publish();
|
|
return true;
|
|
}
|
|
|
|
bool ObjectTrajectory::updateObject(const TrajectoryData &providedData)
|
|
{
|
|
if (!providedData.isIdValid())
|
|
return false;
|
|
if (providedData.id != m_ddsTrajectory.id())
|
|
return false;
|
|
m_providedData = providedData;
|
|
publish();
|
|
return true;
|
|
}
|
|
|
|
bool ObjectTrajectory::publish()
|
|
{
|
|
TrajectoryTimeAware newTrajectory;
|
|
newTrajectory.id(m_providedData.id);
|
|
// // newTrajectory.sampleTime() will be set later
|
|
newTrajectory.index(m_providedData.index );
|
|
// [E01562-259] use originatorId, originatorTypeId (instead of aesItemId, aesTypeId)
|
|
// newTrajectory.aesItemId(m_providedData.aesItemId);
|
|
// newTrajectory.aesTypeId(m_providedData.aesTypeId);
|
|
newTrajectory.trajectoryStartTime(m_providedData.startTime);
|
|
newTrajectory.geometry(m_providedData.geometry);
|
|
newTrajectory.originatorId(m_providedData.originatorId);
|
|
newTrajectory.originatorTypeId(m_providedData.originatorTypeId);
|
|
|
|
if (!hasDdsChanged(newTrajectory))
|
|
return true;
|
|
|
|
m_ddsTrajectory = newTrajectory;
|
|
newTrajectory.sampleTime(partitionTimeMSec()); // publish sampleTime, but do not store
|
|
return m_mainHandler->dds()->dts()->publish(newTrajectory);
|
|
//emit newAiv(newTrajectory);
|
|
}
|
|
|
|
bool ObjectTrajectory::hasDdsChanged(const TrajectoryTimeAware &trajectory)
|
|
{
|
|
return m_ddsTrajectory != trajectory; // vergleich sollte OHNE sampleTime erfolgen
|
|
}
|
|
|
|
bool ObjectTrajectory::removeTopic()
|
|
{
|
|
if (m_ddsTrajectory.id() <= 0)
|
|
return false;
|
|
auto dts = m_mainHandler->dds()->dts();
|
|
return dts->removeTrajectoryTimeAwareByKey(m_ddsTrajectory.id());
|
|
}
|
|
|
|
} // Namespace AreaEffectSimulation
|