torstenandCopilot
7173785915
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>
54 lines
1.7 KiB
C++
54 lines
1.7 KiB
C++
/**
|
|
* Get information about (O/C) participants to be able to send/receive messages for them
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Christian Ehrlicher, SLSE, 2016-12-13
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "dds_handler.h"
|
|
#include "logger.h"
|
|
|
|
#include <QObject>
|
|
#include <QHash>
|
|
#include <ParticipantManagement/ppm_dtc.h>
|
|
#include <OcSituationServer/oss_dtc.h>
|
|
#include <TrainingAreaBase/tab.hpp>
|
|
#include <DDS/DDSConnector/dds_connector.h>
|
|
|
|
namespace Messaging
|
|
{
|
|
class ExerciseHandler;
|
|
class ExercisesHandler final : public QObject
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit ExercisesHandler(const std::shared_ptr<DdsHandler> &ddsHandler);
|
|
~ExercisesHandler();
|
|
|
|
bool init();
|
|
bool sendEquipmentMessage(const TrainingAreaBase::SendEquipmentMessageRequest &request);
|
|
bool sendOcEquipmentMessage(const OcSituationServer::SendEquipmentMessageRequest &request);
|
|
int findEquipmentNumber(int participantId, int exerciseId);
|
|
Q_SIGNALS:
|
|
void messageFromTrainingArea(const TrainingAreaBase::EquipmentMessage &data);
|
|
|
|
private Q_SLOTS:
|
|
void onEquipmentExerciseMappingChanged(const ParticipantManagement::EquipmentExerciseMapping &data, DataModification modType);
|
|
void onEquipmentMessageChanged(const TrainingAreaBase::EquipmentMessage &data, const DataModification modType);
|
|
void onExerciseHandlerIdleTimeout();
|
|
private:
|
|
ExerciseHandler *exerciseHandlerForExerciseId(int exerciseId);
|
|
private:
|
|
std::shared_ptr<DdsHandler> m_ddsHandler;
|
|
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
|
|
QHash<int, ExerciseHandler *> m_exerciseHandler;
|
|
// QHash< QPair<exerciseId,ParticipantId>, equipmentNumber>
|
|
QHash<QPair<int,int>, int> m_participant2EquipNumber;
|
|
QHash<int, int> m_equipNo2ExerciseId;
|
|
LOGGER_T m_logger;
|
|
};
|
|
} // namespace Messaging
|