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,80 @@
|
||||
/**
|
||||
* Send AES data to NGS
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Hannes Baeuerle, SLSE, 2017-05-08
|
||||
*/
|
||||
|
||||
#include "aes_handler.h"
|
||||
#include "ngs_handler.h"
|
||||
#include <Common/participantposition.h>
|
||||
|
||||
#include <AreaEffectSimulation/aes_enums.hpp>
|
||||
#include <AreaEffectSimulation/aes_translation.h>
|
||||
#include <LtsUtilsCore/dds_bitarray.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
#include <EntityTypeStruct.h>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QDateTime>
|
||||
|
||||
using namespace AreaEffectSimulation;
|
||||
namespace HighLevelArchitecture
|
||||
{
|
||||
|
||||
AesHandler::AesHandler(NgsHandler *ngsHandler)
|
||||
: m_ngsHandler(ngsHandler)
|
||||
, m_dtcAes(nullptr)
|
||||
, m_ftcAes(nullptr)
|
||||
, m_dtcPpm(nullptr)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("AesHandler"))
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
|
||||
int64_t AesHandler::externalId(int aesItemId) const
|
||||
{
|
||||
AesItem aesItem;
|
||||
if (!m_dtcAes->aesItemFromId(aesItemId, aesItem))
|
||||
return 0;
|
||||
return aesItem.externalId();
|
||||
}
|
||||
|
||||
bool AesHandler::init()
|
||||
{
|
||||
connect(m_ngsHandler->ngsConnector().get(), &NgsConnector::airSupportImpact,
|
||||
this, &AesHandler::onAirSupportImpact);
|
||||
|
||||
m_dtcAes = AreaEffectSimulation::Interface::Dtc::create(m_ngsHandler->ddsHandler()->ddsConnector());
|
||||
|
||||
m_ftcAes = AreaEffectSimulation::Interface::Ftc::create(m_ngsHandler->ddsHandler()->ddsConnector());
|
||||
m_ftcAes->enableAirSupportImpactModify();
|
||||
|
||||
m_dtcPpm = ParticipantManagement::Interface::Dtc::create(m_ngsHandler->ddsHandler()->ddsConnector());
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void AesHandler::onAirSupportImpactModifyReply(const Core::FunctionReplyObject &reply)
|
||||
{
|
||||
m_requestHelper->requestReply(reply);
|
||||
}
|
||||
|
||||
void AesHandler::onAirSupportImpact(AirSupportImpactModifyRequest asi, int equipmentNumber)
|
||||
{
|
||||
asi.participantId(m_dtcPpm->participantIdByEquipmentNumber(equipmentNumber));
|
||||
|
||||
if (!asi.externalId().is_set())
|
||||
return;
|
||||
|
||||
m_requestHelper->startSingleRequest([this, asi]()
|
||||
{
|
||||
return m_ftcAes->airSupportImpactModifyRequest(asi, this);
|
||||
});
|
||||
}
|
||||
|
||||
} // namespace HighLevelArchitecture
|
||||
Reference in new issue
Block a user