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,80 @@
|
||||
/**
|
||||
* Handler for player data
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by gr, SLSE, 2017-02-20
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "initialization.h"
|
||||
#include "logger.h"
|
||||
#include <QMap>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
|
||||
// Participand Management-Handling for Effect Show Actors
|
||||
|
||||
namespace EffectShowManagement
|
||||
{
|
||||
/**
|
||||
* @brief Handler for the provision of effect show actor data.
|
||||
*
|
||||
* (1)Receives participant data from Participant Management service.\n
|
||||
* (2)Retrieves the effect show actor information from participant data.\n
|
||||
*/
|
||||
class HandlerPpmData : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit HandlerPpmData(Initialization *mainHandler,
|
||||
QObject *parent = nullptr);
|
||||
|
||||
/**
|
||||
* @brief Connects to Participant Management service in order to access Participant data.
|
||||
*/
|
||||
bool init();
|
||||
|
||||
/**
|
||||
* @brief ID, name and equipment number of effect show actor
|
||||
*/
|
||||
struct Participant_t
|
||||
{
|
||||
Participant_t() = default;
|
||||
explicit Participant_t(const ParticipantManagement::Participant &data)
|
||||
: id(data.id())
|
||||
, equipmentNumber(data.equipmentNumber().is_set() ? data.equipmentNumber().get() : 0)
|
||||
, name(QString::fromStdString(data.name()))
|
||||
{}
|
||||
|
||||
int id = -1;
|
||||
int equipmentNumber = 0;
|
||||
QString name;
|
||||
};
|
||||
|
||||
/**
|
||||
* @brief Returns ID, name and equipment number of the effect show actor. (-1, if not available).
|
||||
* @param[in] equipmentNum Equipment number
|
||||
* @return ID, name and equipment number of the effect show actor.
|
||||
*/
|
||||
Participant_t getIdAndNameOfEffectShowActor(int equipmentNum) const;
|
||||
|
||||
/**
|
||||
* @brief Returns the equipment number of the allocated effect show actor. (-1, if not available).
|
||||
* @param[in] id ID of effect show actor
|
||||
* @return Equipment number of the allocated effect show actor.
|
||||
*/
|
||||
int getEquipmentNumber(int id) const;
|
||||
|
||||
|
||||
private Q_SLOTS:
|
||||
void onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType);
|
||||
|
||||
private:
|
||||
QMap<int, Participant_t> m_participant; // key = ID
|
||||
|
||||
Initialization *m_mainHandler;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
} // namespace EffectShowManagement
|
||||
|
||||
Reference in new issue
Block a user