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,148 @@
|
||||
/**
|
||||
* MainHandler for ExerciseManagement
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#include "main_handler.h"
|
||||
#include <DBAdministration/exercise_table_generator.h>
|
||||
|
||||
#include "handler_exercise.h"
|
||||
#include "handler_exercise_phase.h"
|
||||
#include "settings.h"
|
||||
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <DDS/Core/pacemaker.h>
|
||||
#include <ngltools/ngltools_filesystem.h>
|
||||
|
||||
namespace ExerciseManagement
|
||||
{
|
||||
|
||||
MainHandler::MainHandler(QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_logger(getLogger("MainHandler"))
|
||||
{}
|
||||
|
||||
MainHandler::~MainHandler()
|
||||
{
|
||||
m_handlerExercisePhases = nullptr;
|
||||
m_handlerExercise = nullptr;
|
||||
m_websocketHandler = nullptr;
|
||||
m_exTblGen = nullptr;
|
||||
m_dbHandler = nullptr;
|
||||
m_ddsHandler = nullptr;
|
||||
}
|
||||
|
||||
bool MainHandler::init(int domainId)
|
||||
{
|
||||
// initialize DDS
|
||||
m_ddsHandler = std::make_shared<DdsHandler>(domainId);
|
||||
if (!m_ddsHandler->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
// initialize database
|
||||
m_dbHandler = std::make_shared<DbHandler>();
|
||||
if (!m_dbHandler->init(0, Settings::settings()))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
// initialize DbAdministration
|
||||
if (!initDbAdminstration())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation dbAdministration failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
//create all global schemas + tables
|
||||
m_exTblGen->executeSql();
|
||||
|
||||
// read project specific data from database
|
||||
// publish project specific data
|
||||
// initialize the specific handler
|
||||
if (!initExerciseHandler())
|
||||
return false;
|
||||
|
||||
if (!initExercisePhaseHandler())
|
||||
return false;
|
||||
|
||||
if (!initWebSocketHandler())
|
||||
return false;
|
||||
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool MainHandler::initDbAdminstration()
|
||||
{
|
||||
// xmlPath
|
||||
const QString xmlPath = NGL::directory(NGL::FileType::ConfigFile, QLatin1String("xml"));
|
||||
m_exTblGen = std::make_shared<DBAdministration::ExerciseTableGenerator>(getLogger("ExerciseTableGenerator"), xmlPath);
|
||||
connect(m_exTblGen.get(), &DBAdministration::ExerciseTableGenerator::aliveSignal,
|
||||
this, &MainHandler::sendKeepAlive);
|
||||
|
||||
DEBUG_LOG(m_logger) << "Initialise DbAdmin ";
|
||||
if (!m_exTblGen->init(m_dbHandler->db()->database(),
|
||||
m_dbHandler->db()->schemaName()))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation dbAdminHandler failed.";
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool MainHandler::initExerciseHandler()
|
||||
{
|
||||
m_handlerExercise.reset(new HandlerExercise(this, m_ddsHandler, m_dbHandler->db(), m_exTblGen));
|
||||
|
||||
DEBUG_LOG(m_logger) << "Initialise ExerciseHandler ";
|
||||
if (!m_handlerExercise->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation ExerciseHandler failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool MainHandler::initExercisePhaseHandler()
|
||||
{
|
||||
m_handlerExercisePhases.reset(new HandlerExercisePhase(this, m_ddsHandler, m_dbHandler->db()));
|
||||
|
||||
DEBUG_LOG(m_logger) << "Initialise ExercisePhaseHandler ";
|
||||
if (!m_handlerExercisePhases->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation ExercisePhaseHandler failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool MainHandler::initWebSocketHandler()
|
||||
{
|
||||
m_websocketHandler = std::make_shared<WebSocketInterface::WebSocketInterfaceHandler>(this);
|
||||
DEBUG_LOG(m_logger) << "Initialise WebSocketInterfaceHandler";
|
||||
if (!m_websocketHandler->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
m_ddsHandler->pacemaker()->addPort(m_websocketHandler->webSocketPort(), Core::PortType::WebSocketServer);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void MainHandler::sendKeepAlive()
|
||||
{
|
||||
m_ddsHandler->pacemaker()->publishState();
|
||||
}
|
||||
|
||||
} // namespace ExerciseManagement
|
||||
Reference in new issue
Block a user