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,121 @@
|
||||
/**
|
||||
* Handler for player data
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by gr, SLSE, 2017-02-20
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "dds_handler.h"
|
||||
#include "logger.h"
|
||||
#include "esm_convert_from_tab.h"
|
||||
#include "esm_convert_to_tab.h"
|
||||
#include <TrainingAreaBase/tab_dtc.h>
|
||||
|
||||
// AES-Handling for Mine Fields
|
||||
|
||||
namespace EffectShowManagement
|
||||
{
|
||||
|
||||
class Initialization;
|
||||
/**
|
||||
* @brief Handler for data exchange with the Training Aeria Base (TAB) Proxy.
|
||||
*
|
||||
* (1)Receives the telegrams from the effect show vehicle via Training Area Base proxy.
|
||||
* (2)Sends Telegrams to effect show actor/vehicle via Training Area Base proxy.
|
||||
*/
|
||||
class HandlerTabData : public QObject
|
||||
, protected TrainingAreaBase::Interface::Ftc::SendFireSmokeMarkerDataReplyHandler
|
||||
, protected TrainingAreaBase::Interface::Ftc::AdlerFqFbReplyHandler
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit HandlerTabData(Initialization *mainHandler,
|
||||
QObject *parent = nullptr);
|
||||
|
||||
/**
|
||||
* @brief Receives the relevant telegrams from TAB after service start
|
||||
*/
|
||||
bool init();
|
||||
|
||||
/**
|
||||
* @brief Sends order for effect show vehicle status request to TAB.
|
||||
* @param[in] equipmentNumber Equipment number for request target
|
||||
* @param[in] participantId Effect Show Acter Id allocated to the effect show vehicle
|
||||
*/
|
||||
void effectShowVehicleStatusRequest(int equipmentNumber, int participantId);
|
||||
|
||||
/**
|
||||
* @brief Triggers TAB to send an effect show actor relocation order telegramm to effect show actor.
|
||||
* @param[in] equipmentNumber Equipment number for telegram target
|
||||
* @param[in] participantId Effect Show Acter Id allocated to the effect show vehicle
|
||||
* @param[in] relocationOrder Effect Show Actor Relocation Order telegram data
|
||||
*/
|
||||
void relocationOrder(int equipmentNumber, int participantId, const ConvertToTab::RelocationOrder_t &relocationOrder);
|
||||
|
||||
/**
|
||||
* @brief Triggers TAB to send an effect show stop telegramm to effect show actor.
|
||||
* @param[in] equipmentNumber Equipment number for telegram target
|
||||
* @param[in] participantId Effect Show Acter Id allocated to the effect show vehicle
|
||||
* @param[in] idEffectShow ID of effect show
|
||||
*/
|
||||
void effectShowStop(int equipmentNumber, int participantId, const qint16 &idEffectShow);
|
||||
|
||||
/**
|
||||
* @brief Triggers TAB to send an effect show continue telegramm to effect show actor.
|
||||
* @param[in] equipmentNumber Equipment number for telegram target
|
||||
* @param[in] participantId Effect Show Acter Id allocated to the effect show vehicle
|
||||
* @param[in] effectShowOrder Effect Show Continue telegram data
|
||||
*/
|
||||
void effectShowContinue(int equipmentNumber, int participantId, const ConvertToTab::EffectShowContinue_t &effectShowContinue);
|
||||
|
||||
/**
|
||||
* @brief Triggers TAB to send a effect show order telegramm to effect show actor.
|
||||
* @param[in] equipmentNumber Equipment number for telegram target
|
||||
* @param[in] participantId Effect Show Acter Id allocated to the effect show vehicle
|
||||
* @param[in] effectShowOrder Effect Show Order telegram data
|
||||
*/
|
||||
void effectShowOrder(int equipmentNumber, int participantId, const ConvertToTab::EffectShowOrder_t &effectShowOrder);
|
||||
|
||||
/**
|
||||
* @brief Triggers TAB to send a retract order telegramm to effect show actor.
|
||||
* @param[in] equipmentNumber Equipment number for telegram target
|
||||
* @param[in] participantId Effect Show Acter Id allocated to the effect show vehicle
|
||||
* @param[in] retractOrder Retract Order telegram data
|
||||
*/
|
||||
void retractOrder(int equipmentNumber, int participantId, const ConvertToTab::RetractOrder_t &retractOrder);
|
||||
|
||||
/**
|
||||
* @brief Triggers TAB to send meteo data to effect show actor.
|
||||
* @param[in] equipmentNumber Equipment number for telegram target
|
||||
* @param[in] participantId Effect Show Acter Id allocated to the effect show vehicle
|
||||
* @param[in] meteoData Meteo data
|
||||
*/
|
||||
void meteoData(int equipmentNumber, int participantId, const MeteoDataManagement::MeteoData &meteoData);
|
||||
|
||||
/**
|
||||
* @brief Triggers TAB to send AdlerFqFb to SAA
|
||||
* @param[in] aesId of AeraEffectSimulation
|
||||
*/
|
||||
void sendAdlerFqFb(const int aesId);
|
||||
|
||||
protected:
|
||||
void onSendFireSmokeMarkerDataReply(const Core::FunctionReplyObject &reply) override final;
|
||||
void onAdlerFqFbReply(const Core::FunctionReplyObject &reply) override final;
|
||||
|
||||
private Q_SLOTS:
|
||||
void onFireSmokeMarkerDataChanged(const TrainingAreaBase::FireSmokeMarkerData &data, DataModification modType);
|
||||
|
||||
private:
|
||||
void publishVehicleStatus(const EffectShowManagement::EffectShowVehicleStatus &vehicleStatus);
|
||||
|
||||
private: // attributes
|
||||
Initialization *m_mainHandler;
|
||||
NGL::INGLLogger &m_logger;
|
||||
QMap<int, EffectShowManagement::EffectShowVehicleStatus> m_effectShowVehicleStatus;
|
||||
|
||||
};
|
||||
} // namespace EffectShowManagement
|
||||
|
||||
Reference in new issue
Block a user