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,79 @@
|
||||
/**
|
||||
* Handler for infrastructure data
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by hjl, SLSE, 2016-07-22
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "dds_handler.h"
|
||||
#include "logger.h"
|
||||
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
namespace VideoOverlayManagement
|
||||
{
|
||||
|
||||
class HandlerInfrastructureData : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit HandlerInfrastructureData(const std::shared_ptr<DdsHandler> &ddsHandler, QObject *parent = nullptr);
|
||||
|
||||
~HandlerInfrastructureData();
|
||||
|
||||
/**
|
||||
* Initialize the handler to manage information from infrastructure management
|
||||
*/
|
||||
bool init(int exerciseId);
|
||||
|
||||
/**
|
||||
* Check if there is a camera in the room
|
||||
* @param[in] roomId Id of the room to get information about camera availability
|
||||
* @returns true if camera is available, otherwise false
|
||||
*/
|
||||
bool isCameraAvailable(int roomId) const;
|
||||
|
||||
/**
|
||||
* Returns the streamname of the camera for the given roomId
|
||||
* @param[in] roomId Id of the room to get the streamname for this camera
|
||||
* @returns returns the streamname if camera is available, otherwise string is empty
|
||||
*/
|
||||
QString getStreamNameFromRoomId(int roomId) const;
|
||||
|
||||
|
||||
Q_SIGNALS:
|
||||
|
||||
private Q_SLOTS:
|
||||
/**
|
||||
* Handle the signals from 'InfrastructureManagement'
|
||||
*/
|
||||
void onAssetChanged(const InfrastructureManagement::InstrumentationAsset &data, DataModification modType);
|
||||
|
||||
private: // methoden
|
||||
/**
|
||||
* Returns the room id for the given assetId
|
||||
* @param[in] assetId Id of the asset to get the room id for
|
||||
* @returns returns the room id if available, otherwise -1
|
||||
*/
|
||||
int getRoomIdFromAssetId(int assetId) const;
|
||||
|
||||
private: // attributes
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler; ///< Pointer to VOM DDS handler
|
||||
std::shared_ptr<InfrastructureManagement::Interface::Dtc> m_dtc; ///< Pointer to DTC InfrastructureManagement interface object
|
||||
|
||||
QMap<int, int> m_assetId2RoomIdMap; ///< optional nur noetig bei subscribe for AssetChanged
|
||||
|
||||
QMap<int, QString> m_roomId2CameraNameMap; ///< Reference map roomId to camera name(roomId, cameraName) Condition: per room one camera!
|
||||
int m_exerciseId;
|
||||
|
||||
NGL::INGLLogger &m_logger; ///< Interface to the Logging-Facility
|
||||
|
||||
};
|
||||
} // namespace VideoOverlayManagement
|
||||
|
||||
Reference in new issue
Block a user