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,144 @@
|
||||
/**
|
||||
* Send Participant data to NGS
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Christian Ehrlicher, SLSE, 2017-04-07
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QSet>
|
||||
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm_ftc.h>
|
||||
#include <ProjectDataManagement/pdm_dtc.h>
|
||||
#include <AreaEffectSimulation/aes_dtc.h>
|
||||
#include <Proxies/TrainingAreaBase/tab_dts.h>
|
||||
#include <Proxies/TrainingAreaBase/tab_dtc.h>
|
||||
#include <Proxies/TrainingAreaBase/tab_ftc.h>
|
||||
#include <TacticalStatusStruct.h>
|
||||
#include <ActivateHelmetObservationEnum8.h>
|
||||
#include <ResetPlayerEnum8.h>
|
||||
|
||||
#include <TrainingAreaBase/training_area_telegrams.h>
|
||||
|
||||
#include "ngs_connector.h"
|
||||
|
||||
#include <Common/logger.h>
|
||||
|
||||
namespace LtsUtils {
|
||||
class RequestHelper;
|
||||
}
|
||||
|
||||
namespace HighLevelArchitecture
|
||||
{
|
||||
class NgsHandler;
|
||||
class PpmHandler : public QObject
|
||||
, protected ParticipantManagement::Interface::Ftc::ModifyParticipantDataReplyHandler
|
||||
, protected TrainingAreaBase::Interface::Ftc::DemandInitReplyHandler
|
||||
, protected TrainingAreaBase::Interface::Ftc::DemandBiteReplyHandler
|
||||
, protected TrainingAreaBase::Interface::Ftc::SendParticipantModeReplyHandler
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit PpmHandler(NgsHandler *ngsHandler);
|
||||
~PpmHandler();
|
||||
|
||||
bool init();
|
||||
ParticipantManagement::Role roleForPartyId(int partyId);
|
||||
ProjectDataManagement::ChargeType chargeTypeFromId(int chargeTypeId);
|
||||
ProjectDataManagement::ChargeType chargeTypeFromDisEntity(const std::string &disEntity);
|
||||
ProjectDataManagement::ChargeType chargeTypeFromDisEntity(const QString &disEntity) { return chargeTypeFromDisEntity(disEntity.toStdString()); }
|
||||
int partyIdFromForceIdentifier(rpr2::ForceIdentifierEnum8::ET fi);
|
||||
rpr2::ForceIdentifierEnum8::ET forceIdentifierFromPartyId(int partyId);
|
||||
|
||||
void onModifyParticipantDataReply(const Core::FunctionReplyObject &replyObject) override final;
|
||||
void onDemandInitReply(const Core::FunctionReplyObject &reply) override final;
|
||||
void onSendParticipantModeReply(const Core::FunctionReplyObject &reply) override final;
|
||||
void onDemandBiteReply(const Core::FunctionReplyObject &reply) override final;
|
||||
|
||||
QMap<int, int> externalEquipmentNumbers() const { return m_externalEquipmentNumbers; }
|
||||
|
||||
Q_SIGNALS:
|
||||
void externalEquipmentNumberAdded(int equipNo);
|
||||
void externalEquipmentNumberRemoved(int equipNo);
|
||||
|
||||
private Q_SLOTS:
|
||||
void onTypeChanged(const ParticipantManagement::Type &data, DataModification modType);
|
||||
void onDynamicParticipantDataChanged(const ParticipantManagement::DynamicParticipantData &data, DataModification modType);
|
||||
void onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType);
|
||||
void onParticipantPositionChanged(const ParticipantManagement::ParticipantPosition &data, DataModification modType);
|
||||
void onPartyChanged(const ParticipantManagement::Party &data, DataModification modType);
|
||||
void onParticipantGearEventChanged(const ParticipantManagement::ParticipantGearEvent &data, DataModification modType);
|
||||
void onChargeTypeChanged(const ProjectDataManagement::ChargeType &data, DataModification modType);
|
||||
void onEquipmentBiteChanged(const TrainingAreaBase::EquipmentBite &data, DataModification modType);
|
||||
|
||||
void onSpatialChanged(int eqId, const ParticipantPosition &pos, qint64 simTimeMSecs);
|
||||
bool onMarkingChanged(int eqId, const QString &marking, qint64 simTimeMSecs);
|
||||
void onParticipantHit(const GuezHitStruct &hitStruct);
|
||||
void onParticipantInit(int eqNo, bool resetManipulation, bool resupplyAmmo, bool resetVulnerabilityState);
|
||||
bool onExconInit(int eqNo, rpr2::ResetPlayerEnum8::ET rp, rpr2::ActivateHelmetObservationEnum8::ET aho);
|
||||
bool onBiteReport(const TrainingAreaBase::EquipmentBite &report);
|
||||
bool onBiteRequest(const TrainingAreaBase::DemandBiteRequest &request);
|
||||
void onManipulationChanged(int eqNo, bool playerIsManipulated, qint64 sampleTime);
|
||||
void onParticipantReceivedInit(int eqId, qint64 simTimeMSecs);
|
||||
|
||||
void onWeaponFire(const TrainingAreaBase::EquipmentGearEvent &event);
|
||||
void onIsPartOfChanged(int eqNo, int eqNoHost, qint64 simTimeMSecs);
|
||||
|
||||
void startPublishToNgs();
|
||||
|
||||
public slots:
|
||||
void participantInitRequest(const TrainingAreaBase::TetraIcd::Init &request);
|
||||
void participantBiteRequest(const TrainingAreaBase::TetraIcd::DemandBite &request);
|
||||
|
||||
private:
|
||||
void createParticipant(const ParticipantManagement::Participant &participant);
|
||||
bool createHuman(const ParticipantManagement::Participant &participant);
|
||||
bool createGroundVehicle(const ParticipantManagement::Participant &participant);
|
||||
bool createObserverController(const ParticipantManagement::Participant &participant);
|
||||
bool removeParticipant(const ParticipantManagement::Participant &participant);
|
||||
|
||||
rpr2::TacticalStatusStruct currentTacticalStatus(int participantId) const;
|
||||
|
||||
ParticipantManagement::StateInformation currentParticipantStateInformation(int participantId) const;
|
||||
static ParticipantManagement::StateInformation currentParticipantStateInformation(const ParticipantManagement::DynamicParticipantData &data);
|
||||
std::vector<ParticipantManagement::GearInformation> currentParticipantGearInformation(int participantId) const;
|
||||
std::vector<ParticipantManagement::ManipulationInformation> currentParticipantManipulationInformation(int participantId) const;
|
||||
|
||||
ParticipantPosition getParticipantPosition(int participantId) const;
|
||||
int getEquipmentNo(int participantId) const;
|
||||
int getParticipantIdByExternalId(int externalId) const;
|
||||
rpr2::ForceIdentifierEnum8::ET getRprForceIdentifierFromPpmForceIdentifier(const ParticipantManagement::HlaForceIdentifierEnum &ppmForceIdentifier) const;
|
||||
ParticipantManagement::Type getParticipantType(int typeId);
|
||||
TypeStruct getTypestruct(int typeId);
|
||||
|
||||
private:
|
||||
NgsHandler *m_ngsHandler;
|
||||
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_dtcPpm;
|
||||
std::shared_ptr<ParticipantManagement::Interface::Ftc> m_ftcPpm;
|
||||
std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_dtcPdm;
|
||||
std::shared_ptr<TrainingAreaBase::Interface::Dts> m_dtsTab;
|
||||
std::shared_ptr<TrainingAreaBase::Interface::Dtc> m_dtcTab;
|
||||
std::shared_ptr<TrainingAreaBase::Interface::Ftc> m_ftcTab;
|
||||
std::shared_ptr<AreaEffectSimulation::Interface::Dtc> m_dtcAes;
|
||||
|
||||
QMap<int, ParticipantManagement::Type> m_types; // By typeId
|
||||
QMap<int, ParticipantManagement::DynamicParticipantData> m_dynPartData; // By participantId
|
||||
QMap<int, ParticipantManagement::Participant> m_partData; // By participantId
|
||||
QMap<int, int> m_externalEquipmentNumbers; // participantId, equipmentNumber
|
||||
QMap<int, ParticipantManagement::ParticipantPosition> m_partPosData; // By participantId -- Positions for own Players
|
||||
QMap<int, ParticipantManagement::Party> m_partyData; // By partyId
|
||||
QMap<int, TrainingAreaBase::EquipmentPosition> m_observerPositions; // By equipmentNo -- Only foreign entities
|
||||
QMap<int, int> m_isMountedOn; // By equipmentNo of mounted participant. Value = Host
|
||||
QSet<int> m_createdParticipantIds;
|
||||
LtsUtils::RequestHelper *m_requestHelper;
|
||||
|
||||
QMap<int, ProjectDataManagement::ChargeType> m_chargeTypes;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
} // namespace HighLevelArchitecture
|
||||
Reference in new issue
Block a user