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>
100 lines
4.1 KiB
C++
100 lines
4.1 KiB
C++
/**
|
|
* MainHandler for ProjectDataManagement
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
#include "main_handler.h"
|
|
#include "settings.h"
|
|
#include <QSettings>
|
|
|
|
#include "convert_db_to_dds.h"
|
|
|
|
#include <DDS/DDSConnector/dds_connector.h>
|
|
#include <DDS/Core/pacemaker.h>
|
|
#include <ngldb/db_service_handler.h>
|
|
#include "static_pvsan_import.h"
|
|
|
|
using namespace ProjectDataManagement;
|
|
|
|
MainHandler::MainHandler()
|
|
: m_logger(getLogger("MainHandler"))
|
|
{}
|
|
|
|
MainHandler::~MainHandler()
|
|
{
|
|
m_translation = nullptr;
|
|
m_chargeTypeRename = nullptr;
|
|
m_dbHandler = nullptr;
|
|
m_ddsHandler = 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())
|
|
{
|
|
ERROR_LOG(m_logger) << "Initialisation DdsHandler failed.";
|
|
return false;
|
|
}
|
|
|
|
if(Settings::settings()->settings()->value(QLatin1String("TrainingAreaBase/UsePvSan"), false).toBool())
|
|
{
|
|
DEBUG_LOG(m_logger) << "Has PvSan so do the import";
|
|
PvSanImport(db(), m_logger);
|
|
}
|
|
|
|
// initialize the specific handler
|
|
if (!publishData<Database::PdmBiteComponentText>(db(), m_ddsHandler->dts(), m_logger) ||
|
|
!publishData<Database::PdmBuildingChargeEffect>(db(), m_ddsHandler->dts(), m_logger) ||
|
|
!publishData<Database::PdmCanComponentString>(db(), m_ddsHandler->dts(), m_logger) ||
|
|
!publishData<Database::PdmChargeType>(db(), m_ddsHandler->dts(), m_logger) ||
|
|
!publishData<Database::PdmSanitationMaterial>(db(), m_ddsHandler->dts(), m_logger) ||
|
|
!publishData<Database::PdmFirePurpose>(db(), m_ddsHandler->dts(), m_logger) ||
|
|
!publishData<Database::PdmGearType>(db(), m_ddsHandler->dts(), m_logger) ||
|
|
!publishData<Database::PdmGearTypeChargeType>(db(), m_ddsHandler->dts(), m_logger) ||
|
|
!publishData<Database::PdmIgniterType>(db(), m_ddsHandler->dts(), m_logger) ||
|
|
!publishData<Database::PdmIgniterFunction>(db(), m_ddsHandler->dts(), m_logger) ||
|
|
!publishData<Database::PdmLoadType>(db(), m_ddsHandler->dts(), m_logger) ||
|
|
!publishData<Database::PdmChargeTypeIgniterTypeIgniterFunction>(db(), m_ddsHandler->dts(), m_logger) ||
|
|
!publishData<Database::PdmChargeTypeLoadType>(db(), m_ddsHandler->dts(), m_logger) ||
|
|
!publishData<Database::PdmTargetType> (db(), m_ddsHandler->dts(), m_logger) ||
|
|
!publishData<Database::PdmTargetSubType> (db(), m_ddsHandler->dts(), m_logger) ||
|
|
!publishData<Database::PdmTargetTypeTargetSubType> (db(), m_ddsHandler->dts(), m_logger) ||
|
|
!publishData<Database::PdmLanguage>(db(), m_ddsHandler->dts(), m_logger) ||
|
|
!publishData<Database::PdmLanguageXdu>(db(), m_ddsHandler->dts(), m_logger) ||
|
|
!publishData<Database::PdmNuclearPreset>(db(), m_ddsHandler->dts(), m_logger) ||
|
|
!publishData<Database::PdmRadioGroup>(db(), m_ddsHandler->dts(), m_logger) ||
|
|
!publishData<Database::PdmVulnerabilityKind>(db(), m_ddsHandler->dts(), m_logger) ||
|
|
!publishData<Database::PdmEquipmentSystemEventFilter>(db(), m_ddsHandler->dts(), m_logger) ||
|
|
!publishData<Database::PdmSanitationProcedures>(db(), m_ddsHandler->dts(), m_logger) ||
|
|
!publishData<Database::PdmSanitationInjury>(db(), m_ddsHandler->dts(), m_logger) ||
|
|
!publishData<Database::PdmSanitationInjuryKind>(db(), m_ddsHandler->dts(), m_logger) ||
|
|
!publishData<Database::PdmSanitationInjuryPlace1>(db(), m_ddsHandler->dts(), m_logger) ||
|
|
!publishData<Database::PdmSanitationInjuryPlace2>(db(), m_ddsHandler->dts(), m_logger) ||
|
|
!publishData<Database::PdmEventFilterHgrMineSearch>(db(), m_ddsHandler->dts(), m_logger))
|
|
return false;
|
|
|
|
m_translation = std::make_shared<Translation>(m_ddsHandler, db());
|
|
m_chargeTypeRename = std::make_shared<ChargeTypeRename>(m_ddsHandler, db());
|
|
|
|
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
|
|
return true;
|
|
}
|
|
|
|
std::shared_ptr<DatabaseInterface> MainHandler::db() const
|
|
{
|
|
return m_dbHandler->db();
|
|
}
|