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>
119 lines
4.0 KiB
C++
119 lines
4.0 KiB
C++
/**
|
|
* NgsHandler for HighLevelArchitecture
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Christian Ehrlicher, SLSE, 2017-04-07
|
|
*/
|
|
|
|
#include "ngs_handler.h"
|
|
#include <Common/logger.h>
|
|
#include "ngs_connector.h"
|
|
#include "socketreader.h"
|
|
#include <Common/settings.h>
|
|
|
|
#include <QCoreApplication>
|
|
#include <QHostInfo>
|
|
|
|
namespace HighLevelArchitecture
|
|
{
|
|
|
|
NgsHandler::NgsHandler(QObject *parent)
|
|
: QObject(parent)
|
|
, m_ddsHandler(nullptr)
|
|
, m_logger(getLogger("NgsHandler"))
|
|
{}
|
|
|
|
NgsHandler::~NgsHandler()
|
|
{
|
|
m_ppmHandler = nullptr;
|
|
m_aesHandler = nullptr;
|
|
m_ngsConnector = nullptr;
|
|
m_ddsHandler = nullptr;
|
|
}
|
|
|
|
bool NgsHandler::init(const std::shared_ptr<DdsHandler> &ddsHandler)
|
|
{
|
|
// initialize DDS
|
|
m_ddsHandler = ddsHandler;
|
|
|
|
QMap<ngs::IObserver::ProtocolType, QString> protToStr;
|
|
protToStr.insert(ngs::IObserver::ProtocolType::DIS, QStringLiteral("DIS"));
|
|
protToStr.insert(ngs::IObserver::ProtocolType::HLA, QStringLiteral("HLA"));
|
|
protToStr.insert(ngs::IObserver::ProtocolType::CORBANOTIFY, QStringLiteral("CORBA"));
|
|
|
|
ngs::IObserver::ProtocolType protocol = Settings::hlaProtocol();
|
|
|
|
INFO_LOG(m_logger) << "Protocol = " << protToStr.value(protocol, QStringLiteral("UNKNOWN"));
|
|
|
|
m_ngsConnector = /* (protocol == ngs::IObserver::ProtocolType::DIS) ?
|
|
std::make_shared<NgsConnectorDis>(Settings::federationName(), this) : */
|
|
std::make_shared<NgsConnector>(Settings::federationName(), this);
|
|
|
|
connect(m_ngsConnector.get(), &NgsConnector::firstTickFinished,
|
|
this, &NgsHandler::onFirstTickFinished, Qt::UniqueConnection);
|
|
|
|
return m_ngsConnector->initialize(protocol, QHostInfo::localHostName().toUpper(), QCoreApplication::applicationDirPath());
|
|
}
|
|
|
|
bool NgsHandler::isConnectedToHla() const
|
|
{
|
|
return m_ngsConnector && m_ngsConnector->canPublishData();
|
|
}
|
|
|
|
void NgsHandler::onFirstTickFinished()
|
|
{
|
|
m_ppmHandler = std::make_shared<PpmHandler>(this);
|
|
m_aesHandler = std::make_shared<AesHandler>(this);
|
|
if (!m_ppmHandler->init())
|
|
ERROR_LOG(m_logger) << "Could not init ppm handler - not able to publish participants to HLA";
|
|
if (!m_aesHandler->init())
|
|
ERROR_LOG(m_logger) << "Could not init ppm handler - not able to publish area effect simulations to HLA";
|
|
|
|
connect(m_ppmHandler.get(), &PpmHandler::externalEquipmentNumberAdded,
|
|
this, &NgsHandler::externalEquipmentNumberAdded);
|
|
connect(m_ppmHandler.get(), &PpmHandler::externalEquipmentNumberRemoved,
|
|
this, &NgsHandler::externalEquipmentNumberRemoved);
|
|
|
|
connect(this, &NgsHandler::participantInitRequest, m_ppmHandler.get(), &PpmHandler::participantInitRequest);
|
|
connect(this, &NgsHandler::participantVulnerabilityStateRequest, m_ppmHandler.get(), &PpmHandler::participantVulnerabilityStateRequest);
|
|
connect(this, &NgsHandler::participantCesHitInformationRequest, m_ppmHandler.get(), &PpmHandler::participantCesHitInformationRequest);
|
|
initSocketReaders();
|
|
}
|
|
|
|
void NgsHandler::initSocketReaders()
|
|
{
|
|
if (!m_socketReaders.isEmpty())
|
|
deInitSocketReaders();
|
|
|
|
for (const Settings::SocketData& sd : Settings::socketDataList())
|
|
{
|
|
SocketReader *sr = new SocketReader();
|
|
if ( sr->init(sd.hostname, sd.port, sd.hlaRequestIdentifier) )
|
|
{
|
|
sr->start();
|
|
connect(sr, &SocketReader::newData, this, &NgsHandler::onNewSocketReaderData);
|
|
m_socketReaders.append(sr);
|
|
INFO_LOG(m_logger) << "SocketReader with ID " << sd.hlaRequestIdentifier << " connected";
|
|
}
|
|
else
|
|
{
|
|
ERROR_LOG(m_logger) << "Could not initialize SocketReader " << sd.hlaRequestIdentifier;
|
|
}
|
|
}
|
|
}
|
|
|
|
void NgsHandler::deInitSocketReaders()
|
|
{
|
|
for (SocketReader *sr : qAsConst(m_socketReaders))
|
|
sr->stopThread(); // calls deleteLater(), therefore we can
|
|
m_socketReaders.clear(); // drop the pointers here
|
|
}
|
|
|
|
void NgsHandler::onNewSocketReaderData(const QByteArray &data, int hlaRequestIdentifier)
|
|
{
|
|
// Todo: Statically sending to to IDT now. Map this by Reader-Instance and RequestIdentifier later?
|
|
m_ngsConnector->sendData(Settings::hlaPlayerIdIDT(), data, hlaRequestIdentifier);
|
|
}
|
|
} // namespace HighLevelArchitecture
|