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>
50 lines
1.4 KiB
C++
50 lines
1.4 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* The DataManager class handles data to be send to the websocket
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Philipp Dassow, SLST, 2017-12-05
|
|
*/
|
|
#include "data_manager.h"
|
|
#include "Messages/reply_message.h"
|
|
#include "main_handler.h"
|
|
#include "json_keys.h"
|
|
#include <ngldb/nsqlquery.h>
|
|
|
|
namespace TrainingAreaBase
|
|
{
|
|
namespace WebSocketInterface
|
|
{
|
|
|
|
static int s_requestId = 1;
|
|
//---------------------------------------------------------------------------------------------------------
|
|
DataManager::DataManager(MainHandler *mainHandler)
|
|
: LtsWebSocket::DataManagerBaseDl<DatabaseInterface>(mainHandler->db(), getLogger("DataManager"))
|
|
, m_mainHandler(mainHandler)
|
|
|
|
{}
|
|
//---------------------------------------------------------------------------------------------------------
|
|
|
|
LtsWebSocket::ReplyMessage* DataManager::sendBiteRequest(const QString &uuid, int equipNo)
|
|
{
|
|
DemandBiteRequest request;
|
|
request.equipmentNumbers().push_back(equipNo);
|
|
request.withSelfTest(true);
|
|
request.requestId(s_requestId++);
|
|
|
|
rti::core::SampleIdentity sampleIdentity;
|
|
m_mainHandler->ftsHandler()->onDemandBiteRequest(sampleIdentity, request);
|
|
|
|
|
|
Messages::OkMessage::OkData data;
|
|
|
|
data.messageType = JsonKeys::OK();
|
|
data.info = QStringLiteral("BiteRequest sent");
|
|
data.uuid = uuid;
|
|
|
|
return new Messages::OkMessage(data);
|
|
}
|
|
} // namespace WebSocketInterface
|
|
} // namespace TrainingAreaBase
|