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>
67 lines
2.5 KiB
C++
67 lines
2.5 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* The DataManager class takes strucure element data from the HandlerStructureElement,
|
|
* offers an interface to get and set structure data
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Philipp Dassow, SLST, 2017-12-05
|
|
*/
|
|
#include "data_manager.h"
|
|
#include "Messages/reply_message.h"
|
|
#include "main_handler.h"
|
|
|
|
namespace ParticipantManagement
|
|
{
|
|
namespace WebSocketInterface
|
|
{
|
|
//---------------------------------------------------------------------------------------------------------
|
|
DataManager::DataManager(int exerciseId, const std::shared_ptr<DatabaseInterface> &dbInterface, const std::shared_ptr<ParticipantManagement::Interface::Dtc> &dtc)
|
|
: LtsWebSocket::DataManagerBaseDl<DatabaseInterface>(dbInterface, getLogger(QStringLiteral("DataManager")))
|
|
, m_exerciseId(exerciseId)
|
|
, m_ppmDtc(dtc)
|
|
{}
|
|
//---------------------------------------------------------------------------------------------------------
|
|
|
|
LtsWebSocket::ReplyMessage *DataManager::equipmentTypeBaseData(const QString &uuid) const
|
|
{
|
|
return toBaseDataMessageFromDb<Database::PpmEquipmentType, Messages::EquipmentTypeBaseData>(uuid);
|
|
}
|
|
|
|
LtsWebSocket::ReplyMessage *DataManager::typeBaseData(const QString &uuid) const
|
|
{
|
|
return toBaseDataMessageFromDb<Database::PpmType, Messages::TypeBaseData>(uuid);
|
|
}
|
|
|
|
LtsWebSocket::ReplyMessage *DataManager::partyBaseData(const QString &uuid) const
|
|
{
|
|
return toBaseDataMessageFromDb<Database::PpmParty, Messages::PartyBaseData>(uuid);
|
|
}
|
|
|
|
LtsWebSocket::ReplyMessage *DataManager::participantBaseData(const QString &uuid) const
|
|
{
|
|
return toBaseDataMessageFromDb<Database::PpmParticipant, Messages::ParticipantBaseData>(uuid);
|
|
}
|
|
|
|
LtsWebSocket::ReplyMessage *DataManager::ocPositionData(int equipmentNr, const QString &uuid) const
|
|
{
|
|
if (!m_ppmDtc->isParticipantPositionEnabled() || !m_ppmDtc->isParticipantEnabled())
|
|
{
|
|
m_ppmDtc->enableParticipantPosition();
|
|
m_ppmDtc->enableParticipant();
|
|
}
|
|
ParticipantPosition pos = m_ppmDtc->participantPosition(m_ppmDtc->participantIdByEquipmentNumber(equipmentNr));
|
|
QJsonObject obj;
|
|
obj[QStringLiteral("participantId")] = pos.participantId();
|
|
obj[QStringLiteral("lat")] = pos.pos().lat();
|
|
obj[QStringLiteral("lon")] = pos.pos().lon();
|
|
obj[QStringLiteral("height")] = pos.pos().z();
|
|
obj[QStringLiteral("roomId")] = pos.roomId();
|
|
obj[QStringLiteral("buildingId")] = pos.buildingId();
|
|
|
|
return new ParticipantManagement::WebSocketInterface::Messages::OcPositionData(obj, uuid);
|
|
}
|
|
|
|
} // namespace WebSocketInterface
|
|
} // namespace ParticipantManagement
|