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_charge_effect.cpp
+18 -18
View File
@@ -86,18 +86,18 @@ void HandlerChargeEffect::onChargeEffectModifyRequest(const rti::core::SampleIde
return;
}
if (request.id() == 0) // create
if (request.id == 0) // create
{
m_mainHandler->dds()->fts()->chargeEffectModifyReply(cookie, createChargeEffect(request));
return;
}
if (request.id() < 0) // create with id
if (request.id < 0) // create with id
{
ChargeEffectModifyRequest requestWithPositiveId = request;
requestWithPositiveId.id(qAbs(request.id()));
requestWithPositiveId.id = qAbs(request.id);
m_mainHandler->dds()->fts()->chargeEffectModifyReply(cookie, createChargeEffect(requestWithPositiveId));
@@ -165,12 +165,12 @@ Core::FunctionReplyObject HandlerChargeEffect::createChargeEffect(const ChargeEf
// Create ChargeAdministration Entry for reports
DEBUG_LOG(m_logger) << "newChargeEffect id: " << newChargeEffect->id();
DEBUG_LOG(m_logger) << "request.originatorTypeId: " << request.originatorTypeId();
if (request.originatorTypeId() == ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation)
DEBUG_LOG(m_logger) << "request.originatorTypeId: " << request.originatorTypeId;
if (request.originatorTypeId == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation)
{
int amount = 1;
int partyId = m_mainHandler->effectClusterHandler()->getPartyId(request.originatorId());
m_mainHandler->chargeAdministrationHandler()->consumeCharge(request.chargeTypeId(), partyId, amount);
int partyId = m_mainHandler->effectClusterHandler()->getPartyId(request.originatorId);
m_mainHandler->chargeAdministrationHandler()->consumeCharge(request.chargeTypeId, partyId, amount);
}
// create
@@ -180,9 +180,9 @@ Core::FunctionReplyObject HandlerChargeEffect::createChargeEffect(const ChargeEf
newChargeEffect->init();
// create trajectory
if (request.trajectoryTimeAware().is_set())
if (request.trajectoryTimeAware.is_set())
{
int trajId = m_trajectoryHandler->create(trajectoryData(newChargeEffect->id(), request.trajectoryTimeAware().get()));
int trajId = m_trajectoryHandler->create(trajectoryData(newChargeEffect->id(), request.trajectoryTimeAware.get()));
if (trajId < 0)
ERROR_LOG(m_logger) << " Couldn't create trajectory for chargeEffect id: " << newChargeEffect->id();
else
@@ -204,14 +204,14 @@ TrajectoryData HandlerChargeEffect::trajectoryData(int chargeEffectId, // act as
{
TrajectoryData td;
td.id = trajObjId;
td.index = trajectoryTimeAware.index();
td.startTime = trajectoryTimeAware.trajectoryStartTime();
td.geometry = trajectoryTimeAware.geometry();
td.index = trajectoryTimeAware.index;
td.startTime = trajectoryTimeAware.trajectoryStartTime;
td.geometry = trajectoryTimeAware.geometry;
// [E01562-259] use originatorId, originatorTypeId (instead of aesItemId, aesTypeId)
// td.aesItemId = trajectoryTimeAware.aesItemId(); // charge effect's parent
// td.aesTypeId = trajectoryTimeAware.aesTypeId();
td.originatorId = chargeEffectId;
td.originatorTypeId = ProjectDataManagement::StateChangeOriginator::ChargeEffect;
td.originatorTypeId = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ChargeEffect;
return td;
}
@@ -227,7 +227,7 @@ const ObjectChargeEffect *HandlerChargeEffect::getChargeEffectById(int chargeEff
Core::FunctionReplyObject HandlerChargeEffect::updateChargeEffect(const ChargeEffectModifyRequest &request)
{
Core::FunctionReplyObject reply(request.id());
Core::FunctionReplyObject reply(request.id);
if (!m_mainHandler)
{
reply.setStr("Not possible to update ChargeEffect --> No MainHandler present.");
@@ -237,7 +237,7 @@ Core::FunctionReplyObject HandlerChargeEffect::updateChargeEffect(const ChargeEf
return reply;
}
if (!m_chargeEffects.contains(request.id()))
if (!m_chargeEffects.contains(request.id))
{
reply.setStr("Not possible to update ChargeEffect --> Got invalid id.");
@@ -247,12 +247,12 @@ Core::FunctionReplyObject HandlerChargeEffect::updateChargeEffect(const ChargeEf
return reply;
}
ObjectChargeEffect *chargeEffetObj = m_chargeEffects[request.id()];
ObjectChargeEffect *chargeEffetObj = m_chargeEffects[request.id];
reply = chargeEffetObj->update(request);
// update trajectory
if (!reply.error() && request.trajectoryTimeAware().is_set()
&& m_trajectoryHandler->update(trajectoryData(chargeEffetObj->id(), request.trajectoryTimeAware().get(), m_trajObjIds.value(chargeEffetObj->id(), -1))))
if (!reply.error() && request.trajectoryTimeAware.is_set()
&& m_trajectoryHandler->update(trajectoryData(chargeEffetObj->id(), request.trajectoryTimeAware.get(), m_trajObjIds.value(chargeEffetObj->id(), -1))))
{
// update failed should the trajectory be created again?
reply.setStr("Not possible to update ChargeEffect --> Got invalid trajectory id.");