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,145 @@
|
||||
/**
|
||||
* Handler for player data
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by hjl, SLSE, 2017-02-20
|
||||
*/
|
||||
#include <QVector>
|
||||
#include "main_handler.h"
|
||||
#include "handler_tab_data.h"
|
||||
#include "handler_order.h"
|
||||
#include "handler_operating_condition.h"
|
||||
#include "esc_convert_from_tab.h"
|
||||
#include "settings.h"
|
||||
|
||||
namespace EffectShowClient
|
||||
{
|
||||
|
||||
//=============================================================================
|
||||
HandlerTabData::HandlerTabData(MainHandler *mainHandler,
|
||||
QObject *parent)
|
||||
|
||||
: QObject(parent)
|
||||
, m_mainHandler(mainHandler)
|
||||
, m_logger(getLogger("HandlerTabData"))
|
||||
{
|
||||
} // end of ctor()
|
||||
//=============================================================================
|
||||
HandlerTabData::~HandlerTabData()
|
||||
{
|
||||
} // end of dtor()
|
||||
//=============================================================================
|
||||
bool HandlerTabData::init()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Begin HandlerTabData";
|
||||
auto dtcTab = m_mainHandler->dds()->dtcTab();
|
||||
connect(dtcTab.get(), &TrainingAreaBase::Interface::Dtc::fireSmokeMarkerDataChanged,
|
||||
this, &HandlerTabData::onFireSmokeMarkerDataChanged);
|
||||
|
||||
|
||||
// Get current data for all Fire Smoke Marker
|
||||
{
|
||||
auto cb = [this](const TrainingAreaBase::FireSmokeMarkerData & fireSmokeMarker)
|
||||
{
|
||||
onFireSmokeMarkerDataChanged(fireSmokeMarker, DataModification::eAdded);
|
||||
};
|
||||
if (!dtcTab->fireSmokeMarkerDatas(cb))
|
||||
return false;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "End HandlerTabData";
|
||||
return true;
|
||||
} // end of init()
|
||||
//=============================================================================
|
||||
void HandlerTabData::orderConfirmation(const ConvertToTab::OrderConfirmation_t &orderConfirmation)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Trigger Sending of Order Confirmation ";
|
||||
TrainingAreaBase::SendFireSmokeMarkerDataRequest out;
|
||||
|
||||
out.payload(ConvertToTab::convertOrderConfirmation(orderConfirmation));
|
||||
m_mainHandler->dds()->ftcTab()->sendFireSmokeMarkerDataRequest(out, this);
|
||||
|
||||
}
|
||||
//=============================================================================
|
||||
void HandlerTabData::vehicleStatus(const ConvertToTab::VehicleStatus_t &vehicleStatus)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Trigger Sending of Vehicle Status ";
|
||||
TrainingAreaBase::SendFireSmokeMarkerDataRequest out;
|
||||
|
||||
out.payload(ConvertToTab::convertVehicleStatus(vehicleStatus));
|
||||
m_mainHandler->dds()->ftcTab()->sendFireSmokeMarkerDataRequest(out, this);
|
||||
}
|
||||
//=============================================================================
|
||||
void HandlerTabData::onSendFireSmokeMarkerDataReply(const Core::FunctionReplyObject &reply)
|
||||
{
|
||||
if (reply.error())
|
||||
ERROR_LOG(m_logger) << "Fire Smoke Marker Data could not be send: " << reply.str();
|
||||
else
|
||||
DEBUG_LOG(m_logger) << "Fire Smoke Marker Data send successfully to TAB!";
|
||||
}
|
||||
//-----------------------------------------------------------------------------
|
||||
void HandlerTabData::onFireSmokeMarkerDataChanged(const TrainingAreaBase::FireSmokeMarkerData &data, DataModification modType)
|
||||
{
|
||||
if (modType == DataModification::eRemoved)
|
||||
return;
|
||||
|
||||
DEBUG_LOG(m_logger) << "Got Fire Smoke Marker " << data.sampleTime();
|
||||
|
||||
switch (ConvertFromTab::isTelegram(data))
|
||||
{
|
||||
case ConvertFromTab::RxTelegram_e::EffectShowOrder:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Got Effect Show Order";
|
||||
m_mainHandler->handlerOrder()->createOrder(ConvertFromTab::convertEffectShowOrder(data));
|
||||
break;
|
||||
}
|
||||
case ConvertFromTab::RxTelegram_e::RelocationOrder:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Got Relocation order ";
|
||||
m_mainHandler->handlerOrder()->createOrder(ConvertFromTab::convertRelocationOrder(data));
|
||||
break;
|
||||
}
|
||||
case ConvertFromTab::RxTelegram_e::EffectShowStop:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Got Effect Show Stop ";
|
||||
emit effectShowStopped(ConvertFromTab::convertEffectShowStop(data));
|
||||
break;
|
||||
}
|
||||
case ConvertFromTab::RxTelegram_e::EffectShowContinue:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Got Effect Show Continue ";
|
||||
emit effectShowContinued(ConvertFromTab::convertEffectShowContinue(data));
|
||||
break;
|
||||
}
|
||||
case ConvertFromTab::RxTelegram_e::OrderRetract:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Got Order Retract ";
|
||||
m_mainHandler->handlerOrder()->removeOrder(ConvertFromTab::convertOrderRetract(data));
|
||||
break;
|
||||
}
|
||||
case ConvertFromTab::RxTelegram_e::StatusRequest:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Got Status Request " ;
|
||||
if (ConvertFromTab::convertStatusRequest(data))
|
||||
{
|
||||
m_mainHandler->handlerOperatingCondition()->sendStatus();
|
||||
}
|
||||
break;
|
||||
}
|
||||
case ConvertFromTab::RxTelegram_e::MeteoData:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Got Meteo Data ";
|
||||
if (!m_mainHandler->dds()->dts()->publish(ConvertFromTab::convertMeteoData(data)))
|
||||
ERROR_LOG(m_logger) << "Error publishing MeteoNearVehicle to dds";
|
||||
break;
|
||||
}
|
||||
case ConvertFromTab::RxTelegram_e::unknown:
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
|
||||
} // namespace EffectShowClient
|
||||
Reference in new issue
Block a user