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>
65 lines
1.8 KiB
C++
65 lines
1.8 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* ObjectMap for Trajectory
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
#pragma once
|
|
|
|
#include "aes.hpp"
|
|
|
|
namespace AreaEffectSimulation
|
|
{
|
|
|
|
// forward declaation
|
|
class MainHandler;
|
|
|
|
class TrajectoryData
|
|
{
|
|
public:
|
|
bool isIdValid() const { return isIdValid(id); }
|
|
static bool isIdValid(int id) { return id > 0; }
|
|
|
|
int id = -1;
|
|
int index = -1; // useful for explosionCluster
|
|
|
|
// [E01562-259] use originatorId, originatorTypeId (instead of aesItemId, aesTypeId)
|
|
// int aesItemId = -1;
|
|
// AesType aesTypeId = AesType::inner_enum::AtUnknown;
|
|
int originatorId = -1;
|
|
ProjectDataManagement::StateChangeOriginator originatorTypeId = ProjectDataManagement::StateChangeOriginator::Unknown;
|
|
qint64 startTime = 0;
|
|
std::vector<Core::GeoPositionRelativeTime> geometry;
|
|
|
|
};
|
|
|
|
|
|
class ObjectTrajectory final
|
|
{
|
|
public:
|
|
explicit ObjectTrajectory(MainHandler *mainHandler);
|
|
~ObjectTrajectory();
|
|
|
|
bool createObject(const TrajectoryData &providedData);
|
|
bool updateObject(const TrajectoryData &providedData);
|
|
|
|
int id() const { return m_providedData.id; }
|
|
int originatorId() const { return m_providedData.originatorId; } // charge effect Id
|
|
ProjectDataManagement::StateChangeOriginator originatorTypeId() const { return m_providedData.originatorTypeId; }
|
|
|
|
bool publish();
|
|
bool removeTopic();
|
|
|
|
protected:
|
|
qint64 partitionTimeMSec() const;
|
|
bool hasDdsChanged(const TrajectoryTimeAware& trajectory);
|
|
|
|
private:
|
|
MainHandler *m_mainHandler{nullptr};
|
|
TrajectoryData m_providedData; // in
|
|
TrajectoryTimeAware m_ddsTrajectory; // out
|
|
};
|
|
|
|
} // Namespace AreaEffectSimulation
|