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,143 @@
|
||||
/**
|
||||
* Handler for borderline objects
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by hjl, SLSE, 2017-06-14
|
||||
*/
|
||||
|
||||
#include "handler_borderline.h"
|
||||
#include "object_borderline.h"
|
||||
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
HandlerBorderline::HandlerBorderline(MainHandler *mainHandler)
|
||||
: HandlerBaseTmpl<ObjectBorderline>(mainHandler, QStringLiteral("ExplosionArea"), s_areaCount[AesType::AtBorderline], s_areaCountCentral[AesType::AtBorderline])
|
||||
, Interface::Fts::BorderlineModifyRequestHandler(mainHandler->dds()->fts())
|
||||
, Interface::Fts::BorderlineRemoveRequestHandler(mainHandler->dds()->fts())
|
||||
{
|
||||
} // end of ctor()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
HandlerBorderline::~HandlerBorderline()
|
||||
{
|
||||
} // end of dtor()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
bool HandlerBorderline::init()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "--- Start AreaEffectSimulation HandlerBorderline.";
|
||||
|
||||
QVector<Database::AesBorderline> borderlineVec;
|
||||
QVector<Database::AesBorderlineSegment> segmentVec;
|
||||
|
||||
// get all data for borderlines from database
|
||||
if (!m_mainHandler->db()->select(borderlineVec) || !m_mainHandler->db()->select(segmentVec))
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " Error reading data from database!";
|
||||
return false;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "read all data for borderlines from database"
|
||||
<< " aes_borderline.size(): " << borderlineVec.size()
|
||||
<< " aes_Borderline_segment.size(): " << segmentVec.size();
|
||||
|
||||
// contains all segments of an borderline in ascending order
|
||||
QVector<Database::AesBorderlineSegment> dbBorderlineSegments;
|
||||
|
||||
for (const Database::AesBorderline &dbBorderline : qAsConst(borderlineVec))
|
||||
{
|
||||
if (dbBorderline.effectStateId == AesEffectState_def::EsRemoved)
|
||||
continue;
|
||||
|
||||
dbBorderlineSegments.clear();
|
||||
for (const Database::AesBorderlineSegment &segment : qAsConst(segmentVec))
|
||||
{
|
||||
if (segment.borderlineId == dbBorderline.privBorderlineId)
|
||||
dbBorderlineSegments.insert(segment.positionIndex, segment);
|
||||
}
|
||||
|
||||
// create and publish a new object
|
||||
ObjectBorderline *ifs(new ObjectBorderline(m_mainHandler, this));
|
||||
Core::FunctionReplyObject ret = ifs->createObject(dbBorderline,
|
||||
std::vector<Core::GeoPosition2D>(),
|
||||
dbBorderlineSegments);
|
||||
if (ret.error())
|
||||
{
|
||||
delete ifs;
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
return false;
|
||||
}
|
||||
|
||||
m_objectMap.insert(ifs->id(), ifs);
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << " m_borderlineObjMap.size() = " << m_objectMap.size();
|
||||
return true;
|
||||
} // end of init()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
void HandlerBorderline::onBorderlineModifyRequest(const rti::core::SampleIdentity &cookie,
|
||||
const BorderlineModifyRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onBorderlineModifyRequest: " << request;
|
||||
Core::FunctionReplyObject ret = request.id() > 0 ? borderlineModifyRequest(request) : borderlineCreateRequest(request);
|
||||
if (ret.error())
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
m_mainHandler->dds()->fts()->borderlineModifyReply(cookie, ret);
|
||||
}
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
Core::FunctionReplyObject HandlerBorderline::borderlineCreateRequest(const BorderlineModifyRequest &request)
|
||||
{
|
||||
Database::AesBorderline newData;
|
||||
|
||||
newData.name = QString::fromStdString(request.name());
|
||||
newData.operatorId = request.operatorId() > 0 ? request.operatorId() : QVariant();
|
||||
newData.partyId = request.partyId();
|
||||
|
||||
|
||||
ObjectBorderline *ifs(new ObjectBorderline(m_mainHandler, this));
|
||||
Core::FunctionReplyObject ret = ifs->createObject(newData,
|
||||
request.segments(),
|
||||
QVector<Database::AesBorderlineSegment>());
|
||||
if (ret.error())
|
||||
{
|
||||
delete ifs;
|
||||
return ret;
|
||||
}
|
||||
m_objectMap.insert(ifs->id(), ifs);
|
||||
|
||||
return ret;
|
||||
} // end of onBorderlineCreateRequest()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
Core::FunctionReplyObject HandlerBorderline::borderlineModifyRequest(const BorderlineModifyRequest &request)
|
||||
{
|
||||
Core::FunctionReplyObject ret;
|
||||
ObjectBorderline *ifs = getObjectFromMap(m_objectMap, request.id(), ret);
|
||||
if (!ifs)
|
||||
return ret;
|
||||
|
||||
Database::AesBorderline newData;
|
||||
|
||||
newData.name = QString::fromStdString(request.name());
|
||||
newData.operatorId = request.operatorId() > 0 ? request.operatorId() : QVariant();
|
||||
newData.partyId = request.partyId();
|
||||
|
||||
return ifs->updateObject(newData, request.segments());
|
||||
} // end of onBorderlineModifyRequest()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
void HandlerBorderline::onBorderlineRemoveRequest(const rti::core::SampleIdentity &cookie,
|
||||
const Core::RemoveElementRequest &request)
|
||||
{
|
||||
m_mainHandler->dds()->fts()->borderlineRemoveReply(cookie, removeReply(&DatabaseInterface::removeAesBorderline, request));
|
||||
|
||||
} // end of onBorderlineRemoveRequest()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
|
||||
} // Namespace AreaEffectSimulation
|
||||
Reference in new issue
Block a user