Qt6 Migration: Complete migration with DDS/RTI support and build validation
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>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,124 @@
|
||||
/**
|
||||
* MainHandler for HighLevelArchitecture
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Christian Ehrlicher, SLSE, 2017-04-07
|
||||
*/
|
||||
|
||||
#include "main_handler.h"
|
||||
#include "ngs_handler.h"
|
||||
#include "web_socket_handler.h"
|
||||
#include "Common/identifierstruct.h"
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QTimer>
|
||||
#include <Common/settings.h>
|
||||
#include <Common/logger.h>
|
||||
#include <DDS/Core/pacemaker.h>
|
||||
|
||||
namespace HighLevelArchitecture
|
||||
{
|
||||
|
||||
MainHandler::MainHandler(QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_exerciseId(0)
|
||||
, m_logger(getLogger("MainHandler"))
|
||||
{}
|
||||
|
||||
MainHandler::~MainHandler()
|
||||
{
|
||||
m_ngsHandler = nullptr;
|
||||
m_ddsHandler = nullptr;
|
||||
}
|
||||
|
||||
bool MainHandler::init(int domainId, int exerciseId)
|
||||
{
|
||||
m_exerciseId = exerciseId;
|
||||
IdentifierStruct::setOwnSiteId(exerciseId);
|
||||
// initialize DDS
|
||||
m_ddsHandler = std::make_shared<DdsHandler>(domainId, exerciseId);
|
||||
if (!m_ddsHandler->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not init DDS handler";
|
||||
return false;
|
||||
}
|
||||
connect(m_ddsHandler.get(), &DdsHandler::exerciseHlaStateChanged,
|
||||
this, &MainHandler::onExerciseHlaStateChanged);
|
||||
|
||||
onExerciseHlaStateChanged(m_ddsHandler->hlaIsActive());
|
||||
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool MainHandler::isConnectedToHla() const
|
||||
{
|
||||
return m_ngsHandler && m_ngsHandler->isConnectedToHla();
|
||||
}
|
||||
|
||||
void MainHandler::onExerciseHlaStateChanged(bool bHlaEnabled)
|
||||
{
|
||||
NOTICE_LOG(m_logger) << "HLA State Changed: HLA is now " << (bHlaEnabled ? "EN" : "DIS") << "ABLED in this exercise";
|
||||
|
||||
if (bHlaEnabled)
|
||||
{
|
||||
if (m_ngsHandler && m_wsHandler)
|
||||
return;
|
||||
|
||||
if (!m_wsHandler)
|
||||
{
|
||||
m_wsHandler = std::make_shared<WebSocketHandler>(m_exerciseId, this);
|
||||
if (!m_wsHandler->init(Settings::webSocketListenPort()))
|
||||
{
|
||||
m_wsHandler = nullptr;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (!m_ngsHandler)
|
||||
{
|
||||
m_ngsHandler = std::make_shared<NgsHandler>();
|
||||
connect(m_ngsHandler.get(), &NgsHandler::ngsHandlerReady,
|
||||
m_wsHandler.get(), &WebSocketHandler::sendHlaConnectionState, Qt::UniqueConnection);
|
||||
if (!m_ngsHandler->init(m_ddsHandler))
|
||||
{
|
||||
m_ngsHandler = nullptr;
|
||||
NOTICE_LOG(m_logger) << "Could not init ngs - stopping application";
|
||||
QCoreApplication::quit();
|
||||
return;
|
||||
}
|
||||
}
|
||||
connect(m_ngsHandler.get(), &NgsHandler::externalEquipmentNumberAdded,
|
||||
m_wsHandler.get(), &WebSocketHandler::onExternalEquipmentNumberAdded, Qt::UniqueConnection);
|
||||
connect(m_ngsHandler.get(), &NgsHandler::externalEquipmentNumberRemoved,
|
||||
m_wsHandler.get(), &WebSocketHandler::onExternalEquipmentNumberRemoved, Qt::UniqueConnection);
|
||||
|
||||
|
||||
connect(m_wsHandler.get(), &WebSocketHandler::initRequest,
|
||||
m_ngsHandler.get(), &NgsHandler::participantInitRequest, Qt::UniqueConnection);
|
||||
connect(m_wsHandler.get(), &WebSocketHandler::biteRequest,
|
||||
m_ngsHandler.get(), &NgsHandler::participantBiteRequest, Qt::UniqueConnection);
|
||||
NOTICE_LOG(m_logger) << "onExerciseHlaStateChanged - created new ngsHandler";
|
||||
connect(m_ngsHandler.get(), &NgsHandler::firstTickFinished, this, [this](){m_wsHandler->sendHlaConnectionState();});
|
||||
}
|
||||
else
|
||||
{
|
||||
if (m_ngsHandler)
|
||||
NOTICE_LOG(m_logger) << "onExerciseHlaStateChanged - deleting ngsHandler";
|
||||
m_ngsHandler = nullptr;
|
||||
|
||||
if (m_wsHandler)
|
||||
{
|
||||
m_wsHandler->sendHlaConnectionState();
|
||||
auto copy = m_wsHandler;
|
||||
QTimer::singleShot(2000, this, [copy]
|
||||
{
|
||||
copy->deleteLater();
|
||||
});
|
||||
}
|
||||
m_wsHandler = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace HighLevelArchitecture
|
||||
Reference in new issue
Block a user