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>
111 lines
3.4 KiB
C++
Executable File
111 lines
3.4 KiB
C++
Executable File
/**
|
|
* @RDE_HEADER@
|
|
* MainDispatcher for AdlerJson Plugin
|
|
* $Id: main_dispatcher.cpp 62899 2024-05-29 11:08:50Z ewert_j $
|
|
* $HeadURL: svn://slssvn/TDS/branches/product/features/ufom/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/main_dispatcher.cpp $
|
|
* $Author: ewert_j $
|
|
* Created by Julius Ewert, ESIM, 2024-03-20
|
|
*/
|
|
|
|
#include "main_dispatcher.h"
|
|
#include "TrainingAreaBase/dds_handler.h"
|
|
#include "json_dispatcher.h"
|
|
//#include "json_handler_tx.h"
|
|
#include <nglsettings/nglsettings_settings.h>
|
|
#include <DDS/Core/pacemaker.h>
|
|
#include <QTimer>
|
|
|
|
namespace AdlerJson
|
|
{
|
|
MainDispatcher::MainDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
|
|
const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb,
|
|
const std::shared_ptr<TrainingAreaBase::TxMixin> &sendToTab,
|
|
const std::shared_ptr<TrainingAreaBase::DdsHandler> &ddsHandler,
|
|
NGL::Settings *settings)
|
|
: m_adlerDispatcher(nullptr)
|
|
, m_recvFromTabCb(recvFromTabCb)
|
|
, m_sendToTab(sendToTab)
|
|
, m_mainHandlerTx(nullptr)
|
|
, m_pdp(pdp)
|
|
, m_settings(settings)
|
|
, m_ddsHandler(static_cast<std::shared_ptr<TrainingAreaBase::DdsHandler>>(ddsHandler))
|
|
, m_domainId(pdp->domainId())
|
|
, m_exerciseId(pdp->exerciseId())
|
|
, m_logger(getLogger("MainDispatcher"))
|
|
{
|
|
INFO_LOG(m_logger) << "Plugin AdlerJson started";
|
|
}
|
|
|
|
MainDispatcher::~MainDispatcher()
|
|
{
|
|
m_mainHandlerTx = nullptr;
|
|
m_recvFromTabCb = nullptr;
|
|
m_ddsHandler = nullptr;
|
|
m_ppmHandler = nullptr;
|
|
m_pdmHandler = nullptr;
|
|
m_aesHandler = nullptr;
|
|
m_flmHandler = nullptr;
|
|
m_asmHandler = nullptr;
|
|
delete m_adlerDispatcher;
|
|
}
|
|
|
|
bool MainDispatcher::init()
|
|
{
|
|
m_pdmHandler = std::make_shared<PdmHandler>(this);
|
|
m_pdmHandler->init(this);
|
|
|
|
m_asmHandler = std::make_shared<AsmHandler>(this);
|
|
m_asmHandler->init(this);
|
|
|
|
m_flmHandler = std::make_shared<FlmHandler>(this);
|
|
m_flmHandler->init(this);
|
|
|
|
m_ppmHandler = std::make_shared<PpmHandler>(this);
|
|
m_ppmHandler->init(this);
|
|
|
|
m_aesHandler = std::make_shared<AesHandler>(m_ddsHandler->ftsTab(), this);
|
|
m_aesHandler->init(this);
|
|
|
|
m_ddsHandler->dtsTab()->enableEquipmentGearChargeState();
|
|
|
|
m_adlerDispatcher = new JsonDispatcher(m_pdp
|
|
, m_recvFromTabCb
|
|
, m_sendToTab
|
|
, m_settings
|
|
, m_ddsHandler
|
|
, m_flmHandler
|
|
, this);
|
|
m_mainHandlerTx = m_adlerDispatcher->sendToTab();
|
|
m_adlerDispatcher->init();
|
|
|
|
connect(m_adlerDispatcher, &JsonDispatcher::websocketConnected, this, &MainDispatcher::onWebsocketConnected);
|
|
|
|
m_adlerDispatcher->connectWebsocket();
|
|
|
|
return true;
|
|
}
|
|
void MainDispatcher::onWebsocketConnected(quint16 port)
|
|
{
|
|
ERROR_LOG(m_logger) << "ApAdler started, Domain Id: " << QString::number(port);
|
|
m_ddsHandler->pacemaker()->addPort(port, Core::PortType::WebSocketAdlerServer);
|
|
|
|
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
|
|
}
|
|
|
|
std::shared_ptr<TrainingAreaBase::SendToTab> MainDispatcher::sendToTab()
|
|
{
|
|
return std::static_pointer_cast<TrainingAreaBase::SendToTab>(m_mainHandlerTx);
|
|
}
|
|
|
|
bool MainDispatcher::canSendData() const
|
|
{
|
|
return m_adlerDispatcher->canSendData();
|
|
}
|
|
|
|
void MainDispatcher::exerciseChanged()
|
|
{
|
|
m_adlerDispatcher->exerciseChanged();
|
|
}
|
|
|
|
} // namespace AdlerJson
|