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>
146 lines
3.2 KiB
C++
146 lines
3.2 KiB
C++
/**
|
|
* Handler for all trajectories
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Norbert Thoden, ESVG, 2026-01-28
|
|
*/
|
|
|
|
#include "handler_trajectory.h"
|
|
#include "object_trajectory.h"
|
|
|
|
#include <QMap>
|
|
|
|
namespace AreaEffectSimulation
|
|
{
|
|
|
|
static int s_idCounter = 0; /// id counter for creating trajectories:
|
|
|
|
class HandlerTrajectory::Private
|
|
{
|
|
public:
|
|
Private() = default;
|
|
~Private() = default;
|
|
|
|
MainHandler *m_mainHandler{nullptr};
|
|
QMap<int, ObjectTrajectory*> m_objectMap;
|
|
}; // class HandlerTrajectory::Private
|
|
//-----------------------------------------------------------------------------
|
|
|
|
|
|
HandlerTrajectory::HandlerTrajectory(MainHandler *mainHandler)
|
|
: d(new Private)
|
|
, m_logger(getLogger("HandlerTrajectory"))
|
|
{
|
|
d->m_mainHandler = mainHandler;
|
|
}
|
|
|
|
HandlerTrajectory::~HandlerTrajectory()
|
|
{
|
|
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
|
delete d;
|
|
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
|
}
|
|
|
|
int HandlerTrajectory::create(const TrajectoryData &providedData)
|
|
{
|
|
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
|
int newId = -1;
|
|
|
|
auto *ifs = new ObjectTrajectory(d->m_mainHandler);
|
|
if (!ifs)
|
|
{
|
|
ERROR_LOG(m_logger)<<" couldn't create ObjectTrajectory!";
|
|
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
|
return -1;
|
|
}
|
|
|
|
newId = ++s_idCounter;
|
|
// avoid copying providedData.
|
|
// cast const away to be able to update the id:
|
|
TrajectoryData *PROVIDED_DATA = const_cast<TrajectoryData*>(&providedData);
|
|
PROVIDED_DATA->id = newId;
|
|
|
|
if (ifs->createObject(providedData))
|
|
{
|
|
d->m_objectMap.insert(providedData.id, ifs);
|
|
ifs->publish();
|
|
}
|
|
|
|
TRACE_LOG(m_logger) << LOGFUNCTION << " END, newId = " << newId;
|
|
return newId;
|
|
}
|
|
|
|
bool HandlerTrajectory::update(const TrajectoryData &providedData)
|
|
{
|
|
TRACE_LOG(m_logger) << LOGFUNCTION << " START, id = " << providedData.id;
|
|
bool success = false;
|
|
if (!providedData.isIdValid())
|
|
{
|
|
TRACE_LOG(m_logger) << LOGFUNCTION << " END ";
|
|
return false;
|
|
}
|
|
|
|
auto *ifs = d->m_objectMap[providedData.id];
|
|
if (ifs && ifs->updateObject(providedData))
|
|
{
|
|
ifs->publish();
|
|
success = true;
|
|
}
|
|
|
|
TRACE_LOG(m_logger) << LOGFUNCTION << " END, success = " << success;
|
|
return success;
|
|
}
|
|
|
|
bool HandlerTrajectory::remove(const int trajId)
|
|
{
|
|
TRACE_LOG(m_logger) << LOGFUNCTION << " START, id = " << trajId;
|
|
|
|
if (trajId <= 0)
|
|
{
|
|
ERROR_LOG(m_logger) << " remove topic: got Invalid trajectory Id: "<<trajId;
|
|
TRACE_LOG(m_logger) << LOGFUNCTION << " END ";
|
|
return false;
|
|
}
|
|
|
|
auto *ifs = d->m_objectMap[trajId];
|
|
if (!ifs->removeTopic())
|
|
{
|
|
ERROR_LOG(m_logger) << "failed to remove trajectory with id " << trajId;
|
|
return false;
|
|
}
|
|
|
|
d->m_objectMap.remove(trajId);
|
|
delete ifs;
|
|
ifs = nullptr;
|
|
|
|
TRACE_LOG(m_logger) << LOGFUNCTION << " END ";
|
|
return true;
|
|
}
|
|
|
|
int HandlerTrajectory::createUpdate(const TrajectoryData &providedData)
|
|
{
|
|
TRACE_LOG(m_logger) << LOGFUNCTION << " START, id = " << providedData.id;
|
|
|
|
int ret = -1;
|
|
|
|
if (providedData.isIdValid())
|
|
{
|
|
if (update(providedData))
|
|
ret = providedData.id;
|
|
} else {
|
|
ret = create(providedData);
|
|
}
|
|
TRACE_LOG(m_logger) << LOGFUNCTION << " END, id ret " << ret;
|
|
|
|
return ret;
|
|
}
|
|
|
|
int HandlerTrajectory::count() const
|
|
{
|
|
return d->m_objectMap.size();
|
|
}
|
|
|
|
|
|
} // Namespace AreaEffectSimulation
|