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

Migrates EffectShow and AssetManagement to generated rtiddsgen API

Browse Source 
Converts accessor calls to plain member access across esc and asm services.
This commit is contained in:
berrux-dev committed 2026-09-21 02:46:24 +02:00
1 parent a09979afdd
commit bdb2461737
39 files changed
+818 -818
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show.cpp
+67 -67
View File
@@ -90,20 +90,20 @@ void HandlerEffectShow::onExplosionAreaChanged(const AreaEffectSimulation::Explo
break;
case KindOfModification_e::ModifiedData:
updateEffectShowsRelatedToExplosionArea(data);
updateEffectShowOrdersRelatedToAes(data.id());
updateEffectShowOrdersRelatedToAes(data.id);
break;
case KindOfModification_e::Removed:
if(data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved)
removeEffectShowsRelatedToAes(data.id());
if(data.effectStateId == AreaEffectSimulation::AesEffectState::EsRemoved)
removeEffectShowsRelatedToAes(data.id);
break;
case KindOfModification_e::Paused:
updateEffectShowsRelatedToExplosionArea(data);
updateEffectShowOrdersRelatedToAes(data.id());
updateEffectShowOrdersRelatedToAes(data.id);
//pauseEffectShowsRelatedToAes(data.id());
break;
case KindOfModification_e::Continued:
updateEffectShowsRelatedToExplosionArea(data);
updateEffectShowOrdersRelatedToAes(data.id());
updateEffectShowOrdersRelatedToAes(data.id);
//continueEffectShowsRelatedToAes(data.id());
break;
case KindOfModification_e::None:
@@ -124,20 +124,20 @@ void HandlerEffectShow::onExplosionClusterChanged(const AreaEffectSimulation::Ex
break;
case KindOfModification_e::ModifiedData:
updateEffectShowsRelatedToExplosionCluster(data);
updateEffectShowOrdersRelatedToAes(data.id());
updateEffectShowOrdersRelatedToAes(data.id);
break;
case KindOfModification_e::Removed:
if(data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved)
removeEffectShowsRelatedToAes(data.id());
if(data.effectStateId == AreaEffectSimulation::AesEffectState::EsRemoved)
removeEffectShowsRelatedToAes(data.id);
break;
case KindOfModification_e::Paused:
updateEffectShowsRelatedToExplosionCluster(data);
updateEffectShowOrdersRelatedToAes(data.id());
updateEffectShowOrdersRelatedToAes(data.id);
//pauseEffectShowsRelatedToAes(data.id());
break;
case KindOfModification_e::Continued:
updateEffectShowsRelatedToExplosionCluster(data);
updateEffectShowOrdersRelatedToAes(data.id());
updateEffectShowOrdersRelatedToAes(data.id);
//continueEffectShowsRelatedToAes(data.id());
break;
case KindOfModification_e::None:
@@ -159,20 +159,20 @@ void HandlerEffectShow::onEffectClusterChanged(const AreaEffectSimulation::Effec
break;
case KindOfModification_e::ModifiedData:
updateEffectShowsRelatedToEffectCluster(data);
updateEffectShowOrdersRelatedToAes(data.id());
updateEffectShowOrdersRelatedToAes(data.id);
break;
case KindOfModification_e::Removed:
if(data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved)
removeEffectShowsRelatedToAes(data.id());
if(data.effectStateId == AreaEffectSimulation::AesEffectState::EsRemoved)
removeEffectShowsRelatedToAes(data.id);
break;
case KindOfModification_e::Paused:
updateEffectShowsRelatedToEffectCluster(data);
updateEffectShowOrdersRelatedToAes(data.id());
updateEffectShowOrdersRelatedToAes(data.id);
//pauseEffectShowsRelatedToAes(data.id());
break;
case KindOfModification_e::Continued:
updateEffectShowsRelatedToEffectCluster(data);
updateEffectShowOrdersRelatedToAes(data.id());
updateEffectShowOrdersRelatedToAes(data.id);
//continueEffectShowsRelatedToAes(data.id());
break;
case KindOfModification_e::None:
@@ -195,20 +195,20 @@ void HandlerEffectShow::onMineAreaChanged(const AreaEffectSimulation::MineArea &
break;
case KindOfModification_e::ModifiedData:
updateEffectShowsRelatedToMineArea(data);
updateEffectShowOrdersRelatedToAes(data.id());
updateEffectShowOrdersRelatedToAes(data.id);
break;
case KindOfModification_e::Removed:
if(data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved)
removeEffectShowsRelatedToAes(data.id());
if(data.effectStateId == AreaEffectSimulation::AesEffectState::EsRemoved)
removeEffectShowsRelatedToAes(data.id);
break;
case KindOfModification_e::Paused:
updateEffectShowsRelatedToMineArea(data);
updateEffectShowOrdersRelatedToAes(data.id());
updateEffectShowOrdersRelatedToAes(data.id);
// pauseEffectShowsRelatedToAes(data.id());
break;
case KindOfModification_e::Continued:
updateEffectShowsRelatedToMineArea(data);
updateEffectShowOrdersRelatedToAes(data.id());
updateEffectShowOrdersRelatedToAes(data.id);
//continueEffectShowsRelatedToAes(data.id());
break;
case KindOfModification_e::None:
@@ -231,21 +231,21 @@ void HandlerEffectShow::effectShowOrderConfirmationReceived(const ConvertFromTab
// add confirmation data
ifs->updateObject(orderConfirmation);
if (oldId != ifs->getData().orderConfirmation && ifs->getData().orderConfirmation == EffectShowManagement::OrderConfirmation_e::FiringReadiness)
if (oldId != ifs->getData().orderConfirmation && ifs->getData().orderConfirmation == static_cast<int>(EffectShowManagement::OrderConfirmation_e::FiringReadiness))
{
DEBUG_LOG(m_logger) << "effectShowOrderConfirmationReceived Got Fire Readyness, send to aes for " << ifs->getId();
AreaEffectSimulation::SetAesItemEffectorStateRequest req;
req.aesId(ifs->getIdAES());
req.newEffectorState(AreaEffectSimulation::AesEffectorState::EsReadyToFire);
req.participantId(ifs->getData().esmParticipantId);
req.aesId = ifs->getIdAES();
req.newEffectorState = AreaEffectSimulation::AesEffectorState::EsReadyToFire;
req.participantId = ifs->getData().esmParticipantId;
m_mainHandler->dds()->ftcAes()->setAesItemEffectorStateRequest(req, this);
}
switch (orderConfirmation.confirmation.underlying())
switch (orderConfirmation.confirmation)
{
case EffectShowManagement::OrderConfirmation_e_def::DriveOff:
case EffectShowManagement::OrderConfirmation_e_def::FiringReadiness:
case EffectShowManagement::OrderConfirmation_e_def::InterruptExecution:
case EffectShowManagement::OrderConfirmation_e_def::PositionReached:
case EffectShowManagement::OrderConfirmation_e::DriveOff:
case EffectShowManagement::OrderConfirmation_e::FiringReadiness:
case EffectShowManagement::OrderConfirmation_e::InterruptExecution:
case EffectShowManagement::OrderConfirmation_e::PositionReached:
{
triggerMeteoData(ifs); // send meteo data for effect show position
break;
@@ -277,10 +277,10 @@ void HandlerEffectShow::onEffectShowModifyRequest(
const rti::core::SampleIdentity &cookie,
const EffectShow &request)
{
DEBUG_LOG(m_logger) << "onEffectShowModifyRequest: " << request.id();
if (request.id() <= 0)
DEBUG_LOG(m_logger) << "onEffectShowModifyRequest: " << request.id;
if (request.id <= 0)
{
ERROR_LOG(m_logger) << "Illegal Effect Show Id: " << request.id();
ERROR_LOG(m_logger) << "Illegal Effect Show Id: " << request.id;
return;
}
@@ -297,13 +297,13 @@ void HandlerEffectShow::onEffectShowModifyRequest(
//-------------------------------------------------------------------------------
Core::FunctionReplyObject HandlerEffectShow::effectShowModifyRequest(const EffectShow &request)
{
ObjectEffectShow *ifs = m_effectShowObjMap.value(request.id());
ObjectEffectShow *ifs = m_effectShowObjMap.value(request.id);
if (ifs == nullptr)
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "EffectShow with id %1 not found")).arg(request.id());
return Core::FunctionReplyObject(request.id, tr_lts("dds", "EffectShow with id %1 not found")).arg(request.id);
Core::FunctionReplyObject ret;
auto idCurrent = ifs->getData().esmParticipantId;
if ((idCurrent != -1) && (request.esmParticipantId() != idCurrent))
if ((idCurrent != -1) && (request.esmParticipantId != idCurrent))
{
triggerRetractOrder(ifs); // trigger retract order to current effect show actor, if needed
ret = ifs->updateObject(request); // update effect show
@@ -327,24 +327,24 @@ Core::FunctionReplyObject HandlerEffectShow::effectShowModifyRequest(const Effec
void HandlerEffectShow::onEffectShowRemoveRequest(const rti::core::SampleIdentity &cookie,
const Core::RemoveElementRequest &request)
{
DEBUG_LOG(m_logger) << "onEffectShowRemoveRequest: " << request.id();
DEBUG_LOG(m_logger) << "onEffectShowRemoveRequest: " << request.id;
ObjectEffectShow *ifs = m_effectShowObjMap.value(request.id());
ObjectEffectShow *ifs = m_effectShowObjMap.value(request.id);
Core::FunctionReplyObject ret;
if (ifs == nullptr)
{
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "EffectShow id %1 is not valid")).arg(request.id());
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "EffectShow id %1 is not valid")).arg(request.id);
m_mainHandler->dds()->fts()->effectShowRemoveReply(cookie, ret);
return;
}
EffectShowManagement::EffectShow ddsData;
ddsData.id(ifs->getId());
ddsData.id = ifs->getId();
if (m_mainHandler->dds()->topicLockMaster()->isLocked(ddsData, m_mainHandler->exerciseId()))
{
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "EffectShow '%1' is used by another user!")).arg(ifs->getName());
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "EffectShow '%1' is used by another user!")).arg(ifs->getName());
m_mainHandler->dds()->fts()->effectShowRemoveReply(cookie, ret);
return;
}
@@ -431,7 +431,7 @@ QVector<Database::EsmEffectShow> HandlerEffectShow::createEffectShowDbDataRelate
EffectShowExplosionArea effectShowExplosionArea(data, m_mainHandler->handlerPdmData());
if (m_mainHandler->handlerPdmData()->isSmoke(data.chargeStruct()))
if (m_mainHandler->handlerPdmData()->isSmoke(data.chargeStruct))
{
//create exact 1
ret.reserve(1);
@@ -479,13 +479,13 @@ QVector<Database::EsmEffectShow> HandlerEffectShow::createEffectShowDbDataRelate
EffectShowExplosionCluster effectShowExplosionCluster(data, m_mainHandler->handlerPdmData());
QVector<Database::EsmEffectShow> ret;
if (m_mainHandler->handlerPdmData()->isSmoke(data.chargeStruct()))
if (m_mainHandler->handlerPdmData()->isSmoke(data.chargeStruct))
{
//create exact 1
ret.reserve(1);
Database::EsmEffectShow esmEffectShow = effectShowExplosionCluster.getEffectShow(0);
if(data.esmParticipantIds().size() > 0)
esmEffectShow.esmParticipantId = data.esmParticipantIds().at(0); // TODO handle vector
if(data.esmParticipantIds.size() > 0)
esmEffectShow.esmParticipantId = data.esmParticipantIds.at(0); // TODO handle vector
DEBUG_LOG(m_logger) << toString(esmEffectShow);
ret.push_back(std::move(esmEffectShow));
}
@@ -519,8 +519,8 @@ QVector<Database::EsmEffectShow> HandlerEffectShow::createEffectShowDbDataRelate
DEBUG_LOG(m_logger) << toString(esmEffectShow);
// Evlt. nicht bei DM42 (dann ist max > 1)
if(data.esmParticipantIds().size() > 0)
esmEffectShow.esmParticipantId = data.esmParticipantIds().at(0); // TODO handle vector
if(data.esmParticipantIds.size() > 0)
esmEffectShow.esmParticipantId = data.esmParticipantIds.at(0); // TODO handle vector
ret.push_back(std::move(esmEffectShow));
}
}
@@ -532,13 +532,13 @@ QVector<Database::EsmEffectShow> HandlerEffectShow::createEffectShowDbDataRelate
EffectShowEffectCluster effectShowEffectCluster(data, m_mainHandler->handlerPdmData());
QVector<Database::EsmEffectShow> ret;
if (m_mainHandler->handlerPdmData()->isSmoke(data.chargeStruct()))
if (m_mainHandler->handlerPdmData()->isSmoke(data.chargeStruct))
{
//create exact 1
ret.reserve(1);
Database::EsmEffectShow esmEffectShow = effectShowEffectCluster.getEffectShow(0);
if(data.esmParticipantIds().size() > 0)
esmEffectShow.esmParticipantId = data.esmParticipantIds().at(0); // TODO handle vector
if(data.esmParticipantIds.size() > 0)
esmEffectShow.esmParticipantId = data.esmParticipantIds.at(0); // TODO handle vector
DEBUG_LOG(m_logger) << toString(esmEffectShow);
ret.push_back(std::move(esmEffectShow));
}
@@ -572,8 +572,8 @@ QVector<Database::EsmEffectShow> HandlerEffectShow::createEffectShowDbDataRelate
//DEBUG_LOG(m_logger) << toString(esmEffectShow);
// Evlt. nicht bei DM42 (dann ist max > 1)
if(data.esmParticipantIds().size() > (size_t)i)
esmEffectShow.esmParticipantId = data.esmParticipantIds().at(i); // TODO handle vector
if(data.esmParticipantIds.size() > (size_t)i)
esmEffectShow.esmParticipantId = data.esmParticipantIds.at(i); // TODO handle vector
DEBUG_LOG(m_logger) << toString(esmEffectShow);
ret.push_back(std::move(esmEffectShow));
@@ -591,8 +591,8 @@ void HandlerEffectShow::removeEffectShowsRelatedToAes(int idAes, bool retract)
bool remove = false;
if (it.value()->getIdAES() == idAes)
{
if ((it.value()->getData().orderConfirmation != EffectShowManagement::OrderConfirmation_e_def::Execution) &&
(it.value()->getData().orderConfirmation != EffectShowManagement::OrderConfirmation_e_def::OrderCarriedOut))
if ((it.value()->getData().orderConfirmation != static_cast<int>(EffectShowManagement::OrderConfirmation_e::Execution))) &&
(it.value()->getData().orderConfirmation != static_cast<int>(EffectShowManagement::OrderConfirmation_e::OrderCarriedOut))
remove = true;
else
INFO_LOG(m_logger) << "Effect Show: " << it.value()->getId() << " not removed due to EXECUTION / ORDER CARRIED OUT";
@@ -612,7 +612,7 @@ void HandlerEffectShow::updateEffectShowsRelatedToMineArea(const AreaEffectSimul
{
for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap))
{
if (obj->getIdAES() == data.id())
if (obj->getIdAES() == data.id)
{
Database::EsmEffectShow esmEffectShow = obj->getData();
EffectShowMineArea effectShowMineArea(data);
@@ -626,7 +626,7 @@ void HandlerEffectShow::updateEffectShowsRelatedToExplosionArea(const AreaEffect
{
for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap))
{
if (obj->getIdAES() == data.id())
if (obj->getIdAES() == data.id)
{
Database::EsmEffectShow esmEffectShow = obj->getData();
EffectShowExplosionArea effectShowExplosionArea(data, m_mainHandler->handlerPdmData());
@@ -640,7 +640,7 @@ void HandlerEffectShow::updateEffectShowsRelatedToExplosionCluster(const AreaEff
{
for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap))
{
if (obj->getIdAES() == data.id())
if (obj->getIdAES() == data.id)
{
Database::EsmEffectShow esmEffectShow = obj->getData();
EffectShowExplosionCluster effectShowExplosionCluster(data, m_mainHandler->handlerPdmData());
@@ -654,7 +654,7 @@ void HandlerEffectShow::updateEffectShowsRelatedToEffectCluster(const AreaEffect
{
for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap))
{
if (obj->getIdAES() == data.id())
if (obj->getIdAES() == data.id)
{
Database::EsmEffectShow esmEffectShow = obj->getData();
EffectShowEffectCluster effectShowEffectCluster(data, m_mainHandler->handlerPdmData());
@@ -677,22 +677,22 @@ void HandlerEffectShow::modifyEffectShowsRelatedToMineArea(const AreaEffectSimul
{
// even there can currently only be one object we use the same logic as for
// modifyEffectShowsRelatedToExplosionArea for convenience
modifyEffectShows(createEffectShowDbDataRelatedToMineArea(data), data.id());
modifyEffectShows(createEffectShowDbDataRelatedToMineArea(data), data.id);
}
//-------------------------------------------------------------------------------
void HandlerEffectShow::modifyEffectShowsRelatedToExplosionArea(const AreaEffectSimulation::ExplosionArea &data)
{
modifyEffectShows(createEffectShowDbDataRelatedToExplosionArea(data), data.id());
modifyEffectShows(createEffectShowDbDataRelatedToExplosionArea(data), data.id);
}
void HandlerEffectShow::modifyEffectShowsRelatedToExplosionCluster(const AreaEffectSimulation::ExplosionCluster &data)
{
modifyEffectShows(createEffectShowDbDataRelatedToExplosionCluster(data), data.id());
modifyEffectShows(createEffectShowDbDataRelatedToExplosionCluster(data), data.id);
}
void HandlerEffectShow::modifyEffectShowsRelatedToEffectCluster(const AreaEffectSimulation::EffectCluster &data)
{
modifyEffectShows(createEffectShowDbDataRelatedToEffectCluster(data), data.id());
modifyEffectShows(createEffectShowDbDataRelatedToEffectCluster(data), data.id);
}
//-------------------------------------------------------------------------------
@@ -821,7 +821,7 @@ void HandlerEffectShow::triggerRetractOrder(const ObjectEffectShow *ifs)
<< ", actor: " << effectShow.esmParticipantId;
if (effectShow.esmParticipantId == -1)
return; // up to now no actor allocated
if (effectShow.orderConfirmation >= EffectShowManagement::OrderConfirmation_e_def::OrderCarriedOut)
if (effectShow.orderConfirmation >= static_cast<int>(EffectShowManagement::OrderConfirmation_e::OrderCarriedOut))
return; // order obsolete
// trigger retract order
@@ -866,7 +866,7 @@ void HandlerEffectShow::triggerMeteoData(const ObjectEffectShow *ifs)
MeteoDataManagement::MeteoData meteoData;
if (m_mainHandler->handlerMdmData()->getNearestWeather(pos, meteoData))
{
if (!meteoData.windOk() && !meteoData.climateOk())
if (!meteoData.windOk && !meteoData.climateOk)
{
WARNING_LOG(m_logger) << "Found MeteoStation but no weather Data available, try again in 1 minute";
QTimer::singleShot(6000, this, &HandlerEffectShow::onSendMeteoData);
@@ -877,7 +877,7 @@ void HandlerEffectShow::triggerMeteoData(const ObjectEffectShow *ifs)
m_mainHandler->handlerTabData()->meteoData(equipmentNumber, effectShow.esmParticipantId, meteoData);
// meteo data available
qint64 deltaTime = m_mainHandler->dds()->currentPartitionTime() - meteoData.timeStamp();
qint64 deltaTime = m_mainHandler->dds()->currentPartitionTime() - meteoData.timeStamp;
if (deltaTime > (60 * 15 * 1000))
WARNING_LOG(m_logger) << "Age of meteo data=" << (deltaTime / 60000) << "min for vehicle: " << equipmentNumber;
}
@@ -897,8 +897,8 @@ void HandlerEffectShow::onSendMeteoData()
if (effectShow.esmParticipantId == -1)
continue; // no actor allocated
if ((effectShow.orderConfirmation < EffectShowManagement::OrderConfirmation_e_def::DriveOff) ||
(effectShow.orderConfirmation >= EffectShowManagement::OrderConfirmation_e_def::OrderCarriedOut))
if ((effectShow.orderConfirmation < static_cast<int>(EffectShowManagement::OrderConfirmation_e::DriveOff))) ||
(effectShow.orderConfirmation >= static_cast<int>(EffectShowManagement::OrderConfirmation_e::OrderCarriedOut))
continue; // effect show not processed
triggerMeteoData(obj);
@@ -912,7 +912,7 @@ void HandlerEffectShow::onCleanUp()
for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap))
{
const Database::EsmEffectShow &effectShow = obj->getData();
if (effectShow.orderConfirmation == OrderConfirmation_e::OrderCarriedOut || effectShow.startTime <= 0 || effectShow.id <= 0)
if (effectShow.orderConfirmation == static_cast<int>(OrderConfirmation_e::OrderCarriedOut) || effectShow.startTime <= 0 || effectShow.id <= 0)
continue;
DEBUG_LOG(m_logger) << "Effect show with ID " << effectShow.id << " will expire at: " << QDateTime::fromMSecsSinceEpoch(effectShow.startTime + effectShow.duration + CLEANUPTIME).toString() << " current time: " << QDateTime::fromMSecsSinceEpoch(m_mainHandler->dds()->currentPartitionTime()).toString();