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,68 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* The DataManager class handles data to be send to the websocket
|
||||
* 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 "object_exercise.h"
|
||||
|
||||
namespace ExerciseManagement
|
||||
{
|
||||
namespace WebSocketInterface
|
||||
{
|
||||
//---------------------------------------------------------------------------------------------------------
|
||||
DataManager::DataManager(const std::shared_ptr<DatabaseInterface> &dbInterface, const std::shared_ptr<HandlerExercise> &exHandler)
|
||||
: LtsWebSocket::DataManagerBaseDl<DatabaseInterface>(dbInterface, getLogger("DataManager"))
|
||||
, m_exerciseHandler(exHandler)
|
||||
{}
|
||||
|
||||
LtsWebSocket::ReplyMessage *DataManager::exercisePhaseBaseData(const QString &uuid) const
|
||||
{
|
||||
return toBaseDataMessageFromDb<Database::ExmExercisePhase, Messages::ExercisePhaseBaseData>(uuid);
|
||||
}
|
||||
|
||||
LtsWebSocket::ReplyMessage *DataManager::exerciseStateChangeBaseData(const QString &uuid) const
|
||||
{
|
||||
return toBaseDataMessageFromDb<Database::ExmExerciseStateChange, Messages::ExerciseStateChangeBaseData>(uuid);
|
||||
}
|
||||
|
||||
LtsWebSocket::ReplyMessage *DataManager::exerciseBaseData(const QString &uuid) const
|
||||
{
|
||||
return toBaseDataMessageFromDb<Database::ExmExercise, Messages::ExerciseBaseData>(uuid);
|
||||
}
|
||||
|
||||
LtsWebSocket::ReplyMessage *DataManager::exerciseInformation(const QString &uuid) const
|
||||
{
|
||||
using namespace Messages;
|
||||
|
||||
ExerciseInformationMessage::ExInformation exInfo;
|
||||
QVector<ExerciseInformationMessage::ExInformation> data;
|
||||
const auto &exerciseMap = m_exerciseHandler->getExerciseMap();
|
||||
data.reserve(exerciseMap.size());
|
||||
for (const ObjectExercise *ex : exerciseMap)
|
||||
{
|
||||
const auto &exData = ex->data();
|
||||
|
||||
exInfo.exerciseId = exData.id;
|
||||
exInfo.name = exData.name;
|
||||
exInfo.beginTime = exData.beginTime.toMSecsSinceEpoch();
|
||||
exInfo.endTime = exData.endTime.toMSecsSinceEpoch();
|
||||
exInfo.startTime = exData.startTime.toMSecsSinceEpoch();
|
||||
exInfo.stopTime = exData.stopTime.toMSecsSinceEpoch();
|
||||
exInfo.timeZone = exData.defaultTimeZone;
|
||||
exInfo.status = exData.exerciseStateId.underlying();
|
||||
exInfo.description = exData.description;
|
||||
|
||||
data.append(exInfo);
|
||||
}
|
||||
|
||||
return new ExerciseInformationMessage(data, uuid);
|
||||
}
|
||||
|
||||
} // namespace WebSocketInterface
|
||||
} // namespace ExerciseManagement
|
||||
Reference in new issue
Block a user