lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrates AreaEffectSimulation to generated rtiddsgen API

Browse Source 
Converts accessor calls to plain member access across aes service and plugin.
This commit is contained in:
berrux-dev committed 2026-09-21 02:45:07 +02:00
1 parent e8d07af320
commit 472f537313
102 files changed
+3307 -3313
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_danger_area.cpp
+25 -25
View File
@@ -87,21 +87,21 @@ Core::FunctionReplyObject HandlerDangerArea::dangerAreaCreateRequest(const Dange
{
Database::AesDangerArea newData;
if (request.id() < 0) // is the id given as negative? set id -> used by OC-Laptop
newData.id = request.id();
newData.name = QString::fromStdString(request.name());
newData.effectStart = request.effectStart().is_set() && request.effectStart().get() > 0 ? QDateTime::fromMSecsSinceEpoch(request.effectStart().get()) : QDateTime();
newData.chargeTypeId = request.chargeTypeId();
newData.effectDuration = request.effectDuration();
newData.partyId = request.partyId().is_set() ? request.partyId().get() : 0;
newData.participantId = request.participantId().is_set() ? request.participantId().get() : 0;
newData.associatedAesId = request.associatedAesId().is_set() ? request.associatedAesId().get() : 0;
if (request.id < 0) // is the id given as negative? set id -> used by OC-Laptop
newData.id = request.id;
newData.name = QString::fromStdString(request.name);
newData.effectStart = request.effectStart.is_set() && request.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(request.effectStart.get()) : QDateTime();
newData.chargeTypeId = request.chargeTypeId;
newData.effectDuration = request.effectDuration;
newData.partyId = request.partyId.is_set() ? request.partyId.get() : 0;
newData.participantId = request.participantId.is_set() ? request.participantId.get() : 0;
newData.associatedAesId = request.associatedAesId.is_set() ? request.associatedAesId.get() : 0;
ObjectDangerArea *ifs(new ObjectDangerArea(m_mainHandler, this));
Core::FunctionReplyObject ret = ifs->createObject(newData,
request.segments(),
request.segments,
QVector<Database::AesDangerSegment>());
if (ret.error())
{
@@ -117,10 +117,10 @@ Core::FunctionReplyObject HandlerDangerArea::dangerAreaCreateRequest(const Dange
bool HandlerDangerArea::dangerAreaRemoveRequest(const Core::RemoveElementRequest request)
{
DEBUG_LOG(m_logger) << "onDangerAreaRemoveRequest dangerArea id: " << request.id();
DEBUG_LOG(m_logger) << "onDangerAreaRemoveRequest dangerArea id: " << request.id;
Core::FunctionReplyObject ret;
const rti::core::SampleIdentity cookie;
ObjectDangerArea *ifs = getObjectFromMap(m_dangerAreaObjMap, request.id(), ret);
ObjectDangerArea *ifs = getObjectFromMap(m_dangerAreaObjMap, request.id, ret);
if (!ifs)
{
return m_mainHandler->dds()->fts()->dangerAreaRemoveReply(cookie, ret);
@@ -151,25 +151,25 @@ bool HandlerDangerArea::getDangerAreaByAssociatedAesId(const int &id, Database:
Core::FunctionReplyObject HandlerDangerArea::dangerAreaModifyRequest(const DangerAreaModifyRequest &request)
{
Core::FunctionReplyObject ret;
if (request.id() == 0 || ((request.id() < 0) && !getObjectFromMap(m_dangerAreaObjMap, std::abs(request.id()), ret)))
if (request.id == 0 || ((request.id < 0) && !getObjectFromMap(m_dangerAreaObjMap, std::abs(request.id), ret)))
return dangerAreaCreateRequest(request);
ObjectDangerArea *ifs = getObjectFromMap(m_dangerAreaObjMap, std::abs(request.id()), ret);
ObjectDangerArea *ifs = getObjectFromMap(m_dangerAreaObjMap, std::abs(request.id), ret);
if (!ifs)
return ret;
Database::AesDangerArea newData(ifs->data());
if (request.id() < 0) // is the id given as negative? set id -> used by OC-Laptop
newData.id = request.id();
newData.name = QString::fromStdString(request.name());
newData.effectStart = request.effectStart().is_set() && request.effectStart().get() > 0 ? QDateTime::fromMSecsSinceEpoch(request.effectStart().get()) : QDateTime();
newData.chargeTypeId = request.chargeTypeId();
newData.effectDuration = request.effectDuration();
newData.partyId = request.partyId().is_set() ? request.partyId().get() : 0;
newData.participantId = request.participantId().is_set() ? request.participantId().get() : 0;
newData.associatedAesId = request.associatedAesId().is_set() ? request.associatedAesId().get() : 0;
if (request.id < 0) // is the id given as negative? set id -> used by OC-Laptop
newData.id = request.id;
newData.name = QString::fromStdString(request.name);
newData.effectStart = request.effectStart.is_set() && request.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(request.effectStart.get()) : QDateTime();
newData.chargeTypeId = request.chargeTypeId;
newData.effectDuration = request.effectDuration;
newData.partyId = request.partyId.is_set() ? request.partyId.get() : 0;
newData.participantId = request.participantId.is_set() ? request.participantId.get() : 0;
newData.associatedAesId = request.associatedAesId.is_set() ? request.associatedAesId.get() : 0;
return ifs->updateObject(newData, request.segments());
return ifs->updateObject(newData, request.segments);
}
void HandlerDangerArea::onDangerAreaRemoveRequest(const rti::core::SampleIdentity &cookie,
@@ -177,7 +177,7 @@ void HandlerDangerArea::onDangerAreaRemoveRequest(const rti::core::SampleIdentit
{
DEBUG_LOG(m_logger) << "onDangerAreaRemoveRequest" << request;
Core::FunctionReplyObject ret;
ObjectDangerArea *ifs = getObjectFromMap(m_dangerAreaObjMap, request.id(), ret);
ObjectDangerArea *ifs = getObjectFromMap(m_dangerAreaObjMap, request.id, ret);
if (!ifs)
{
m_mainHandler->dds()->fts()->dangerAreaRemoveReply(cookie, ret);