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>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,109 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Handler for all Effect Cluster
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Patric Karwat, ESZS, 2026-01-13
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QMap>
|
||||
|
||||
#include "aes_db.h"
|
||||
#include "handler_base.h"
|
||||
#include "object_effect_cluster.h"
|
||||
|
||||
#include <QCoreApplication> // qAddPostRoutine
|
||||
#include <QObject>
|
||||
|
||||
// TAB
|
||||
#include <TrainingAreaBase/tab_dts.h>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
class ObjectEffectCluster;
|
||||
class HandlerEffectCluster final
|
||||
: public HandlerBaseTmpl<ObjectEffectCluster>
|
||||
, protected Interface::Fts::EffectClusterModifyRequestHandler
|
||||
, protected Interface::Fts::EffectClusterModifyActorRequestHandler
|
||||
, protected Interface::Fts::EffectClusterSingleEffectOnlyModifyRequestHandler
|
||||
, protected Interface::Fts::EffectClusterOcModifyRequestHandler
|
||||
, protected Interface::Fts::EffectClusterRemoveRequestHandler
|
||||
, protected Interface::Fts::EffectClusterPauseResumeRequestHandler
|
||||
, protected Interface::Fts::EffectClusterFireHaltRequestHandler
|
||||
// , protected Interface::Fts::TargetPositionsModifyRequestHandler
|
||||
, protected Interface::Fts::TrajectoryAdlerModifyRequestHandler
|
||||
, protected Interface::Fts::EffectClusterReleaseReceivedRequestHandler
|
||||
, protected Interface::Fts::AcknowledgeExternalAesItemRequestHandler
|
||||
, protected Interface::Fts::SetAesItemEffectorStateRequestHandler
|
||||
, protected TrainingAreaBase::Interface::Ftc::AdlerFqFbReplyHandler
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit HandlerEffectCluster(MainHandler *mainHandler);
|
||||
~HandlerEffectCluster() = default;
|
||||
|
||||
Core::FunctionReplyObject effectClusterModifyRequest(const rti::core::SampleIdentity &cookie, const EffectClusterModifyRequest &request);
|
||||
void recountActiveAreas() override;
|
||||
|
||||
bool init();
|
||||
int getPartyId(int aesItemId) { return m_objectMap.value(aesItemId)->data().partyId; };
|
||||
const ObjectEffectCluster *getEffectClusterObj(int id);
|
||||
|
||||
protected:
|
||||
void onAdlerFqFbReply(const Core::FunctionReplyObject &replyObject) override;
|
||||
|
||||
private:
|
||||
// EffectClusterModifyRequestHandler
|
||||
Core::FunctionReplyObject effectClusterCreateRequest(const EffectClusterModifyRequest &request);
|
||||
void onEffectClusterModifyRequest(const rti::core::SampleIdentity &cookie, const EffectClusterModifyRequest &request) override;
|
||||
|
||||
// EffectClusterModifyActorRequestHandler
|
||||
void onEffectClusterModifyActorRequest(const rti::core::SampleIdentity &cookie, const EffectClusterModifyActorRequest &request) override;
|
||||
|
||||
// EffectClusterSingleEffectOnlyModifyRequestHandler
|
||||
void onEffectClusterSingleEffectOnlyModifyRequest(const rti::core::SampleIdentity &cookie, const EffectClusterSingleEffectOnlyRequest &request) override;
|
||||
|
||||
// EffectClusterOcModifyRequestHandler
|
||||
void onEffectClusterOcModifyRequest(const rti::core::SampleIdentity &cookie, const EffectClusterOcModifyRequest &request) override;
|
||||
|
||||
// EffectClusterRemoveRequestHandler
|
||||
void onEffectClusterRemoveRequest(const rti::core::SampleIdentity &cookie, const Core::RemoveElementRequest &request) override;
|
||||
// EffectClusterPauseResumeRequestHandler
|
||||
void onEffectClusterPauseResumeRequest(const rti::core::SampleIdentity &cookie, const EffectClusterPauseResumeRequest &request) override;
|
||||
void onEffectClusterFireHaltRequest(const rti::core::SampleIdentity &cookie, const EffectClusterFireHaltRequest &request) override;
|
||||
// EffectClusterReleaseReceivedRequestHandler
|
||||
void onEffectClusterReleaseReceivedRequest(const rti::core::SampleIdentity &cookie, const EffectClusterReleaseReceivedRequest &request) override;
|
||||
|
||||
// AcknowledgeExternalAesItemRequestHandler
|
||||
void onAcknowledgeExternalAesItemRequest(const rti::core::SampleIdentity &cookie, const AcknowledgeExternalAesItemRequest &request) override;
|
||||
|
||||
// AcknowledgeExternalAesItemRequestHandler
|
||||
void onSetAesItemEffectorStateRequest(const rti::core::SampleIdentity &cookie, const SetAesItemEffectorStateRequest &request) override;
|
||||
|
||||
/*! \name For laserGuided ammo like vulcano */
|
||||
/*
|
||||
virtual void onTargetPositionsModifyRequest(const rti::core::SampleIdentity &cookie,
|
||||
const TargetPositionsModifyRequest &request) override;
|
||||
//@}
|
||||
*/
|
||||
virtual void onTrajectoryAdlerModifyRequest(const rti::core::SampleIdentity &cookie, const TrajectoryAdlerModifyRequest &request) override;
|
||||
|
||||
// next FireCommand
|
||||
void onFireCommandReceived(const TrainingAreaBase::EX_Fire &fireCommand, DataModification modtype);
|
||||
// Fire Hold, Fire Hold Referenced and continue
|
||||
void onFireHoldReceived(const TrainingAreaBase::EX_CeaseFiring &ceaseFire, DataModification modType);
|
||||
|
||||
// Dummy for testing
|
||||
// void onPlaningDataReceived(const TrainingAreaBase::ExAwesPlanning &planning, DataModification modType);
|
||||
|
||||
int totalAreasCentral() const override;
|
||||
int totalAreas() const override { return 0; }
|
||||
|
||||
private:
|
||||
// we need to store a lookupMap for the FireReference to the actual object Id.
|
||||
QMap<QString, int> m_referenceToClusterId;
|
||||
};
|
||||
} // namespace AreaEffectSimulation
|
||||
Reference in new issue
Block a user