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,144 @@
|
||||
/**
|
||||
* MainHandler for ExerciseManagement
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#include "main_handler.h"
|
||||
|
||||
#include "handler_access_control_level.h"
|
||||
#include "handler_operator.h"
|
||||
#include "handler_group.h"
|
||||
#include "handler_locked_topics.h"
|
||||
#include "handler_active_apps.h"
|
||||
#include "settings.h"
|
||||
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <DDS/Core/pacemaker.h>
|
||||
#include <ngldb/db_service_handler.h>
|
||||
|
||||
namespace OperatorManagement
|
||||
{
|
||||
|
||||
MainHandler::MainHandler()
|
||||
: m_logger(getLogger("MainHandler"))
|
||||
{}
|
||||
|
||||
MainHandler::~MainHandler()
|
||||
{
|
||||
// destruction in reverse order:
|
||||
m_handlerActiveApps = nullptr;
|
||||
m_handlerLockedTopics = nullptr;
|
||||
m_handlerWebSocket = nullptr;
|
||||
m_handlerOperator = nullptr;
|
||||
m_handlerGroup = nullptr;
|
||||
m_handlerAcl = nullptr;
|
||||
|
||||
// Finally 'serving' objects:
|
||||
m_ddsHandler = nullptr;
|
||||
m_dbHandler = nullptr;
|
||||
}
|
||||
|
||||
|
||||
bool MainHandler::init(int domainId)
|
||||
{
|
||||
// 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 DDS
|
||||
m_ddsHandler = std::make_shared<DdsHandler>(domainId);
|
||||
if (!m_ddsHandler->init())
|
||||
return false;
|
||||
|
||||
// read project specific data from database
|
||||
// publish project specific data
|
||||
// initialize the specific handler
|
||||
if (!initAclHandler())
|
||||
return false;
|
||||
|
||||
{
|
||||
DDSConnector::CoherentSet cs(m_ddsHandler->ddsConnector());
|
||||
if (!initOperatorHandler())
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!initGroupHandler())
|
||||
return false;
|
||||
|
||||
if (!initWebSocketHandler())
|
||||
return false;
|
||||
|
||||
if (!initLockedTopicsHandler())
|
||||
return false;
|
||||
|
||||
if (!initActiveApps())
|
||||
return false;
|
||||
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool MainHandler::initAclHandler()
|
||||
{
|
||||
m_handlerAcl = std::make_shared<HandlerAccessControlLevel>(this);
|
||||
|
||||
return m_handlerAcl->init();
|
||||
}
|
||||
|
||||
bool MainHandler::initOperatorHandler()
|
||||
{
|
||||
m_handlerOperator = std::make_shared<HandlerOperator>(this);
|
||||
|
||||
return m_handlerOperator->init();
|
||||
}
|
||||
|
||||
bool MainHandler::initGroupHandler()
|
||||
{
|
||||
m_handlerGroup = std::make_shared<HandlerGroup>(this);
|
||||
|
||||
return m_handlerGroup->init();
|
||||
}
|
||||
|
||||
bool MainHandler::initLockedTopicsHandler()
|
||||
{
|
||||
m_handlerLockedTopics = std::make_shared<HandlerLockedTopics>(*this);
|
||||
|
||||
return m_handlerLockedTopics->init();
|
||||
}
|
||||
|
||||
bool MainHandler::initWebSocketHandler()
|
||||
{
|
||||
// WebSocketServer
|
||||
m_handlerWebSocket = std::make_shared<WebSocketInterface::WebSocketInterfaceHandler>(this);
|
||||
DEBUG_LOG(m_logger) << "Reset WebSocketInterfaceHandler succesful.";
|
||||
if (!m_handlerWebSocket->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler failed.";
|
||||
return false;
|
||||
}
|
||||
m_ddsHandler->pacemaker()->addPort(m_handlerWebSocket->serverWebSocketPort(), Core::PortType::WebSocketServer);
|
||||
DEBUG_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler succesful.";
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool MainHandler::initActiveApps()
|
||||
{
|
||||
m_handlerActiveApps = std::make_shared<HandlerActiveApps>(this);
|
||||
|
||||
return m_handlerActiveApps->init();
|
||||
}
|
||||
|
||||
std::shared_ptr<DatabaseInterface> MainHandler::db() const
|
||||
{
|
||||
return m_dbHandler->db();
|
||||
}
|
||||
|
||||
} // namespace OperatorManagement
|
||||
Reference in new issue
Block a user