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,83 @@
|
||||
/**
|
||||
* Send a function topic to TrainingAreabase in a specific exercise
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Christian Ehrlicher, SLSE, 2016-12-13
|
||||
*/
|
||||
|
||||
|
||||
#include "exercise_handler.h"
|
||||
|
||||
namespace Messaging
|
||||
{
|
||||
|
||||
ExerciseHandler::ExerciseHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector, const int exerciseId)
|
||||
: m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(ddsConnector->getDomainId(), IDL::PartitionType::Exercise, exerciseId))
|
||||
, m_exerciseId(exerciseId)
|
||||
, m_idleTimer(new QTimer(this))
|
||||
, m_logger(getLogger("ExerciseHandler"))
|
||||
{
|
||||
connect(m_idleTimer, &QTimer::timeout,
|
||||
this, &ExerciseHandler::exerciseHandlerIdleTimeout);
|
||||
m_idleTimer->setSingleShot(true);
|
||||
m_idleTimer->setInterval(60 * 60 * 1000); // 1h
|
||||
}
|
||||
|
||||
bool ExerciseHandler::init()
|
||||
{
|
||||
m_ddsConnector->initPublisherSubscriber();
|
||||
DEBUG_LOG(m_logger) << "ExerciseHandler::init m_ddsConnector=" << m_ddsConnector
|
||||
<< " m_exerciseId=" << m_exerciseId;
|
||||
m_tabFtc = TrainingAreaBase::Interface::Ftc::create(m_ddsConnector);
|
||||
bool retVal = m_tabFtc->enableSendEquipmentMessage();
|
||||
if (!retVal)
|
||||
return false;
|
||||
|
||||
m_ossFtc = OcSituationServer::Interface::Ftc::create(m_ddsConnector);
|
||||
retVal = m_ossFtc->enableSendEquipmentMessageOc();
|
||||
|
||||
return retVal;
|
||||
}
|
||||
|
||||
bool ExerciseHandler::sendEquipmentMessage(const TrainingAreaBase::SendEquipmentMessageRequest &request)
|
||||
{
|
||||
if (!m_tabFtc)
|
||||
return false;
|
||||
DEBUG_LOG(m_logger) << "ExerciseHandler::sendEquipmentMessage: " << request;
|
||||
m_idleTimer->stop();
|
||||
return m_tabFtc->sendEquipmentMessageRequest(request, this);
|
||||
}
|
||||
|
||||
bool ExerciseHandler::sendOcEquipmentMessage(const OcSituationServer::SendEquipmentMessageRequest &request)
|
||||
{
|
||||
if (!m_ossFtc)
|
||||
return false;
|
||||
DEBUG_LOG(m_logger) << "ExerciseHandler::sendOcEquipmentMessage: "<< request;
|
||||
m_idleTimer->stop();
|
||||
return m_ossFtc->sendEquipmentMessageOcRequest(request, this);
|
||||
}
|
||||
|
||||
int ExerciseHandler::exerciseId() const
|
||||
{
|
||||
return m_exerciseId;
|
||||
}
|
||||
|
||||
void ExerciseHandler::onSendEquipmentMessageReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
DEBUG_LOG(m_logger)<<"ExerciseHandler::onSendEquipmentMessageReply";
|
||||
m_idleTimer->start();
|
||||
if (replyObject.error())
|
||||
ERROR_LOG(m_logger) << replyObject();
|
||||
emit equipmentMessageReply(replyObject.id(), !replyObject.error());
|
||||
}
|
||||
|
||||
void ExerciseHandler::onSendEquipmentMessageOcReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
DEBUG_LOG(m_logger)<<"ExerciseHandler::onSendEquipmentMessageOcReply";
|
||||
m_idleTimer->start();
|
||||
if (replyObject.error())
|
||||
ERROR_LOG(m_logger) << replyObject();
|
||||
emit equipmentMessageOcReply(replyObject.id(), !replyObject.error());
|
||||
}
|
||||
} // namespace Messaging
|
||||
Reference in new issue
Block a user