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>
49 lines
1.6 KiB
C++
49 lines
1.6 KiB
C++
/**
|
|
* Send a function topic to TrainingAreabase in a specific exercise
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Christian Ehrlicher, SLSE, 2016-12-13
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "dds_handler.h"
|
|
#include "logger.h"
|
|
#include <QObject>
|
|
#include <QTimer>
|
|
#include <TrainingAreaBase/tab_ftc.h>
|
|
#include <OcSituationServer/oss_ftc.h>
|
|
|
|
namespace Messaging
|
|
{
|
|
class ExerciseHandler final : public QObject,
|
|
public TrainingAreaBase::Interface::Ftc::SendEquipmentMessageReplyHandler,
|
|
public OcSituationServer::Interface::Ftc::SendEquipmentMessageOcReplyHandler
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
ExerciseHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector,
|
|
const int exerciseId);
|
|
|
|
bool init();
|
|
bool sendEquipmentMessage(const TrainingAreaBase::SendEquipmentMessageRequest &request);
|
|
bool sendOcEquipmentMessage(const OcSituationServer::SendEquipmentMessageRequest &request);
|
|
int exerciseId() const;
|
|
Q_SIGNALS:
|
|
void exerciseHandlerIdleTimeout();
|
|
void equipmentMessageReply(int msgId, bool sentSuccessful);
|
|
void equipmentMessageOcReply(int replyId, bool sentSuccessful);
|
|
private:
|
|
void onSendEquipmentMessageReply(const Core::FunctionReplyObject &replyObject) override;
|
|
void onSendEquipmentMessageOcReply(const Core::FunctionReplyObject &replyObject) override;
|
|
private:
|
|
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
|
|
std::shared_ptr<TrainingAreaBase::Interface::Ftc> m_tabFtc;
|
|
std::shared_ptr<OcSituationServer::Interface::Ftc> m_ossFtc;
|
|
int m_exerciseId;
|
|
QTimer *m_idleTimer; //<! timer to delete ExerciseHandler after n seconds when no longer needed
|
|
LOGGER_T m_logger;
|
|
};
|
|
} // namespace Messaging
|