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>
87 lines
2.9 KiB
C++
Executable File
87 lines
2.9 KiB
C++
Executable File
/**
|
|
* @RDE_HEADER@
|
|
* MainDispatcher for AdlerJson Plugin
|
|
* $Id: main_dispatcher.h 62899 2024-05-29 11:08:50Z ewert_j $
|
|
* $HeadURL: svn://slssvn/TDS/branches/product/features/ufom/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/main_dispatcher.h $
|
|
* $Author: ewert_j $
|
|
* Created by Julius Ewert, ESIM, 2024-03-20
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <QObject>
|
|
#include <TrainingAreaBase/tab_plugin_interface.h>
|
|
#include <DDS/Core/function_reply_object.h> // tr_lts
|
|
#include <TrainingAreaBase/dds_handler.h>
|
|
//#include "logger.h"
|
|
#include "ppm_handler.h"
|
|
#include "pdm_handler.h"
|
|
#include "aes_handler.h"
|
|
#include "flm_handler.h"
|
|
#include "asm_handler.h"
|
|
|
|
namespace AdlerJson
|
|
{
|
|
class JsonDispatcher;
|
|
class PpmHandler;
|
|
class PdmHandler;
|
|
class AesHandler;
|
|
class FlmHandler;
|
|
class AsmHandler;
|
|
|
|
class MainDispatcher final : public TrainingAreaBase::Plugin::Interface
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
MainDispatcher( TrainingAreaBase::Plugin::DataProvider *pdp,
|
|
const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb,
|
|
const std::shared_ptr<TrainingAreaBase::TxMixin> &sendToTabCb,
|
|
const std::shared_ptr<TrainingAreaBase::DdsHandler> &ddsHandler,
|
|
NGL::Settings *settings);
|
|
~MainDispatcher();
|
|
|
|
std::shared_ptr<PpmHandler> ppmHandler() const { return m_ppmHandler; }
|
|
std::shared_ptr<PdmHandler> pdmHandler() const { return m_pdmHandler; }
|
|
std::shared_ptr<AesHandler> aesHandler() const { return m_aesHandler; }
|
|
std::shared_ptr<AsmHandler> asmHandler() const { return m_asmHandler; }
|
|
JsonDispatcher* jsonDispatcher() const { return m_adlerDispatcher; }
|
|
std::shared_ptr<TrainingAreaBase::DdsHandler> ddsHandler() const { return m_ddsHandler; }
|
|
|
|
int exerciseId() const { return m_exerciseId; }
|
|
|
|
public slots:
|
|
bool init() override;
|
|
void onWebsocketConnected(quint16 port);
|
|
|
|
public:
|
|
std::shared_ptr<TrainingAreaBase::SendToTab> sendToTab() override;
|
|
bool canSendData () const override;
|
|
void exerciseChanged () override;
|
|
bool isDebugInterface () const override { return false; }
|
|
const char *name () const override { return tr_lts("dds", "ApHlaJson"); }
|
|
|
|
private:
|
|
JsonDispatcher *m_adlerDispatcher;
|
|
|
|
std::shared_ptr<TrainingAreaBase::RecvFromTab> m_recvFromTabCb;
|
|
const std::shared_ptr<TrainingAreaBase::TxMixin> m_sendToTab;
|
|
std::shared_ptr<TrainingAreaBase::SendToTab> m_mainHandlerTx;
|
|
TrainingAreaBase::Plugin::DataProvider *m_pdp;
|
|
|
|
NGL::Settings *m_settings;
|
|
|
|
std::shared_ptr<PpmHandler> m_ppmHandler;
|
|
std::shared_ptr<PdmHandler> m_pdmHandler;
|
|
std::shared_ptr<AesHandler> m_aesHandler;
|
|
std::shared_ptr<FlmHandler> m_flmHandler;
|
|
std::shared_ptr<AsmHandler> m_asmHandler;
|
|
std::shared_ptr<TrainingAreaBase::DdsHandler> m_ddsHandler;
|
|
|
|
int m_domainId;
|
|
int m_exerciseId;
|
|
|
|
NGL::INGLLogger &m_logger;
|
|
};
|
|
} // namespace AdlerJson
|
|
|