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>
91 lines
2.4 KiB
C++
91 lines
2.4 KiB
C++
/**
|
|
* Initialization for MarkerManagement
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by hjl, SLSE, 2016-04-05
|
|
*/
|
|
|
|
#include "initialization.h"
|
|
#include "handler_marker.h"
|
|
#include "handler_snapshot.h"
|
|
#include "settings.h"
|
|
|
|
#include <DDS/DDSConnector/dds_connector.h>
|
|
#include <ngldb/db_service_handler.h>
|
|
|
|
namespace MarkerManagement
|
|
{
|
|
|
|
|
|
Initialization::Initialization()
|
|
: m_logger(getLogger("Initialization"))
|
|
{
|
|
} // end of ctor()
|
|
//-----------------------------------------------------------------------------
|
|
|
|
Initialization::~Initialization()
|
|
{
|
|
m_handlerMarker = nullptr;
|
|
m_handlerSnapshot = nullptr;
|
|
|
|
m_dbHandler = nullptr;
|
|
m_ddsHandler = nullptr;
|
|
} // end of dtor()
|
|
//-----------------------------------------------------------------------------
|
|
|
|
bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector, const QSqlDatabase &sqlDb)
|
|
{
|
|
INFO_LOG(m_logger) << "--- Start MarkerManagement Initialization.";
|
|
|
|
// initialize DDS
|
|
// for MarkerManagement => exerciseId = partitionId
|
|
m_ddsHandler = std::make_shared<DdsHandler>(ddsConnector);
|
|
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(ddsConnector->getPartitionId(), sqlDb))
|
|
{
|
|
ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
|
|
return false;
|
|
}
|
|
|
|
// read project specific data from database
|
|
// publish project specific data
|
|
// initialize handler
|
|
m_handlerMarker.reset(new HandlerMarker(m_ddsHandler, m_dbHandler->db()));
|
|
m_handlerSnapshot.reset(new HandlerSnapshot(m_ddsHandler, m_dbHandler->db()));
|
|
|
|
INFO_LOG(m_logger) << "MRK Handler initialized.";
|
|
|
|
return true;
|
|
} // end of initialize()
|
|
//-----------------------------------------------------------------------------
|
|
|
|
|
|
bool Initialization::loadFromDatabase()
|
|
{
|
|
if (!m_handlerMarker || !m_handlerMarker->init())
|
|
{
|
|
ERROR_LOG(m_logger) << "Initialisation HandlerMarker failed.";
|
|
return false;
|
|
}
|
|
if (!m_handlerSnapshot || !m_handlerSnapshot->init())
|
|
{
|
|
ERROR_LOG(m_logger) << "Initialisation HandlerSnapshot failed.";
|
|
return false;
|
|
}
|
|
|
|
INFO_LOG(m_logger) << "MRK Handler initialized.";
|
|
return true;
|
|
} // end of loadFromDatabase()
|
|
//-----------------------------------------------------------------------------
|
|
|
|
} // namespace MarkerManagement
|
|
|