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,154 @@
|
||||
/**
|
||||
* MainHandler for AssetManagement
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#include "main_handler.h"
|
||||
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <DDS/Core/pacemaker.h>
|
||||
|
||||
#include <ngldb/db_service_handler.h>
|
||||
#include "settings.h"
|
||||
|
||||
#include <QFileInfo>
|
||||
|
||||
namespace TargetManagement
|
||||
{
|
||||
|
||||
MainHandler::MainHandler(QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_ddsHandler(nullptr)
|
||||
, m_dbHandler(nullptr)
|
||||
, m_logger(getLogger("MainHandler"))
|
||||
{}
|
||||
|
||||
MainHandler::~MainHandler()
|
||||
{
|
||||
m_handlerTargetConfig.reset();
|
||||
|
||||
// Land400 :
|
||||
m_shootbackController.reset();
|
||||
m_elevationMap.reset();
|
||||
m_handlerTargetAreaAssignment.reset();
|
||||
m_handlerShootbackArea.reset();
|
||||
m_handlerShootbackTarget.reset();
|
||||
// : Land400
|
||||
|
||||
m_ddsHandler.reset();
|
||||
m_dbHandler.reset();
|
||||
}
|
||||
|
||||
bool MainHandler::init(int domainId, int exerciseId)
|
||||
{
|
||||
INFO_LOG(m_logger) << "MainHandler::init";
|
||||
|
||||
// initialize database
|
||||
m_dbHandler = std::make_shared<DbHandler>();
|
||||
if (!m_dbHandler->init(exerciseId, Settings::settings()))
|
||||
return false;
|
||||
|
||||
// initialize DDS
|
||||
m_ddsHandler = std::make_shared<DdsHandler>(domainId, exerciseId);
|
||||
if (!m_ddsHandler->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
|
||||
return false;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "Initialisation ddsHandler succesful.";
|
||||
|
||||
NOTICE_LOG(m_logger) << "setNewState Core::RunningState::Starting ";
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Starting);
|
||||
|
||||
// initialize handlerTargetConfig
|
||||
m_handlerTargetConfig = std::make_shared<HandlerTargetConfig>(m_ddsHandler, this);
|
||||
|
||||
if (!m_handlerTargetConfig->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation HandlerTargetConfig failed.";
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (TargetManagement::Settings::useL400Targets())
|
||||
{
|
||||
//
|
||||
// L400: ElevationMap, ShootbackArea, ShootbackTarget ..
|
||||
// use srtm_38_02.tif for Bremen, until general solution is provided:
|
||||
// loading ElevationMap (async):
|
||||
//
|
||||
// use srtm_38_02.tif for Bremen, until general solution is provided:
|
||||
|
||||
QString elevationFileAbs(QLatin1String("/usr/share/arcgis/resources/elevation/srtm_38_02.tif")); // srtm_38_02.tif -> Bremen
|
||||
QFileInfo fi(elevationFileAbs);
|
||||
if (!fi.exists(elevationFileAbs))
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << ", elevationFile '" << elevationFileAbs << "' doesn't exists";
|
||||
return false;
|
||||
}
|
||||
|
||||
m_elevationMap = std::make_shared<SituationMap::ElevationMap>(fi);
|
||||
m_elevationMap->waitForInitialization(); // needs some seconds:
|
||||
|
||||
|
||||
//
|
||||
// initialize handlerShootbackArea
|
||||
m_handlerShootbackArea = std::make_shared<HandlerShootbackArea>(this);
|
||||
|
||||
if (!m_handlerShootbackArea->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation HandlerShootbackArea failed.";
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
|
||||
return false;
|
||||
}
|
||||
|
||||
// initialize handlerShootbackTarget
|
||||
m_handlerShootbackTarget = std::make_shared<HandlerShootbackTarget>(this);
|
||||
|
||||
if (!m_handlerShootbackTarget->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation HandlerShootbackTarget failed.";
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
|
||||
return false;
|
||||
}
|
||||
|
||||
// initialize handlerTargetAreaAssignment
|
||||
m_handlerTargetAreaAssignment = std::make_shared<HandlerTargetAreaAssignment>(this);
|
||||
|
||||
if (!m_handlerTargetAreaAssignment->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation HandlerTargetAreaAssignment failed.";
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
|
||||
return false;
|
||||
}
|
||||
|
||||
// shootbackController
|
||||
m_shootbackController = std::make_shared<ShootbackController>(this);
|
||||
bool initLos = m_shootbackController->initLOS(m_elevationMap.get());
|
||||
bool initDds = m_shootbackController->initDds(m_handlerShootbackArea,
|
||||
m_handlerShootbackTarget,
|
||||
m_handlerTargetAreaAssignment);
|
||||
|
||||
if (!(initLos && initDds))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation ShootbackController failed.";
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
NOTICE_LOG(m_logger) << "setNewState Core::RunningState::Running ";
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
|
||||
return true;
|
||||
}
|
||||
|
||||
std::shared_ptr<DatabaseInterface> MainHandler::db() const
|
||||
{
|
||||
return m_dbHandler->db();
|
||||
}
|
||||
|
||||
|
||||
} // namespace TargetManagement
|
||||
Reference in new issue
Block a user