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>
53 lines
1.6 KiB
C++
53 lines
1.6 KiB
C++
#pragma once
|
|
|
|
#include <QObject>
|
|
#include "aes_fts.h"
|
|
|
|
#include "logger.h"
|
|
#include <QHash>
|
|
|
|
namespace AreaEffectSimulation
|
|
{
|
|
class ObjectChargeEffect;
|
|
class MainHandler;
|
|
class HandlerTrajectory;
|
|
class TrajectoryData;
|
|
|
|
class HandlerChargeEffect
|
|
: public QObject
|
|
, public Interface::Fts::ChargeEffectModifyRequestHandler
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
explicit HandlerChargeEffect(MainHandler *mainhandler, QObject *parent = nullptr);
|
|
~HandlerChargeEffect();
|
|
bool init();
|
|
|
|
void onChargeEffectModifyRequest(const rti::core::SampleIdentity &cookie, const ChargeEffectModifyRequest &request);
|
|
Core::FunctionReplyObject createChargeEffect(const ChargeEffectModifyRequest &request);
|
|
static TrajectoryData trajectoryData(int chargeEffectId, const TrajectoryTimeAware &trajectoryTimeAware, int trajObjId = -1);
|
|
|
|
const ObjectChargeEffect *getChargeEffectById(int chargeEffectId);
|
|
|
|
Q_SIGNALS:
|
|
void chargeEffectActive(const int id);
|
|
void chargeEffectExpired(const int id);
|
|
|
|
private Q_SLOTS:
|
|
void onChargeEffectFinished(qint32 chargeEffectId);
|
|
void onChargeEffectStateChanged(const int id, AesEffectState newState);
|
|
|
|
private: // methods
|
|
Core::FunctionReplyObject updateChargeEffect(const ChargeEffectModifyRequest &request);
|
|
|
|
private: // attributes
|
|
MainHandler *m_mainHandler {nullptr};
|
|
QHash<qint32, ObjectChargeEffect*> m_chargeEffects;
|
|
QHash<qint32, qint32> m_trajObjIds; // <chartgeEffectId, trajectoryObjId>
|
|
HandlerTrajectory *m_trajectoryHandler{nullptr};
|
|
|
|
LOGGER_T m_logger;
|
|
}; // class HandlerChargeEffect
|
|
} // namespace AreaEffectSimulation
|