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

Complete Qt6/rtiddsgen migration of residual Lts service sources

Browse Source
This commit is contained in:
berrux-dev committed 2026-09-25 20:23:37 +02:00
1 parent e748e82c84
commit a410019553
86 files changed
+1235 -1128
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_smoke.cpp
+42 -42
View File
@@ -57,30 +57,30 @@ void HandlerFiringSmoke::setFiringClearanceDuration()
qint64 pre = m_firingSmokeEntity.firingClearanceTime.get();
qint64 post = pre;
pre -= PRE_START_TIME;
post += m_firingSmokeEntity.duration() + POST_END_TIME;
m_firingSmokeEntity.firingClearanceTime().set(pre);
m_firingSmokeEntity.endOfFiringClearanceTime().set(post);
post += m_firingSmokeEntity.duration + POST_END_TIME;
m_firingSmokeEntity.firingClearanceTime.set(pre);
m_firingSmokeEntity.endOfFiringClearanceTime.set(post);
}
else
m_firingSmokeEntity.endOfFiringClearanceTime().reset();
m_firingSmokeEntity.endOfFiringClearanceTime.reset();
m_mainHandler->dds()->dts()->publish(m_firingSmokeEntity);
}
//-----------------------------------------------------------------------------
void HandlerFiringSmoke::onStartHandlerFiring(const Database::EscOrder &escOrder)
{
m_firingSmokeEntity.idEffectShow(escOrder.idOrder);
m_firingSmokeEntity.lengthOfFogZone(escOrder.areaWidth);
m_firingSmokeEntity.duration(escOrder.duration * 1000);
m_firingSmokeEntity.idOrder(escOrder.id);
m_firingSmokeEntity.idEffectShow = escOrder.idOrder;
m_firingSmokeEntity.lengthOfFogZone = escOrder.areaWidth;
m_firingSmokeEntity.duration = escOrder.duration * 1000;
m_firingSmokeEntity.idOrder = escOrder.id;
if (escOrder.startTime > 0)
m_firingSmokeEntity.firingClearanceTime().set(escOrder.startTime);
m_firingSmokeEntity.firingClearanceTime.set(escOrder.startTime);
else
m_firingSmokeEntity.firingClearanceTime().reset();
m_firingSmokeEntity.firingClearanceTime.reset();
if (m_firingSmokeEntity.lengthOfFogZone() <= 0 ||
m_firingSmokeEntity.duration() <= 0)
if (m_firingSmokeEntity.lengthOfFogZone <= 0 ||
m_firingSmokeEntity.duration <= 0)
{
WARNING_LOG(m_logger) << "Won't start Smoke ";
DEBUG_LOG(m_logger) << "areaWidth: " << escOrder.areaWidth
@@ -95,57 +95,57 @@ void HandlerFiringSmoke::onEndHandlerFiring(const Database::EscOrder &escOrder)
{
Q_UNUSED(escOrder)
m_firingSmokeEntity.remainingDistance(0);
m_firingSmokeEntity.remainingTime(0);
m_firingSmokeEntity.carriedOutEnabled(false);
m_firingSmokeEntity.directionOfFogZone(0);
m_firingSmokeEntity.endOfFiringClearanceTime().reset();
m_firingSmokeEntity.idOrder(0);
m_firingSmokeEntity.idEffectShow(0);
m_firingSmokeEntity.firingClearanceTime().reset();
m_firingSmokeEntity.remainingDistance = 0;
m_firingSmokeEntity.remainingTime = 0;
m_firingSmokeEntity.carriedOutEnabled = false;
m_firingSmokeEntity.directionOfFogZone = 0;
m_firingSmokeEntity.endOfFiringClearanceTime.reset();
m_firingSmokeEntity.idOrder = 0;
m_firingSmokeEntity.idEffectShow = 0;
m_firingSmokeEntity.firingClearanceTime.reset();
m_mainHandler->dds()->dts()->publish(m_firingSmokeEntity);
}
//-----------------------------------------------------------------------------
void HandlerFiringSmoke::onEffectShowStopped(qint16 idEffectShow)
{
if (idEffectShow != m_firingSmokeEntity.idEffectShow())
if (idEffectShow != m_firingSmokeEntity.idEffectShow)
{
ERROR_LOG(m_logger) << "EffectShow IDs not consistent: " << idEffectShow << " / " << m_firingSmokeEntity.idEffectShow();
ERROR_LOG(m_logger) << "EffectShow IDs not consistent: " << idEffectShow << " / " << m_firingSmokeEntity.idEffectShow;
return;
}
}
//-----------------------------------------------------------------------------
void HandlerFiringSmoke::onEffectShowContinued(const ConvertFromTab::EffectShowContinue_t &effectShowContinue)
{
if (effectShowContinue.idEffectShow != m_firingSmokeEntity.idEffectShow())
if (effectShowContinue.idEffectShow != m_firingSmokeEntity.idEffectShow)
{
ERROR_LOG(m_logger) << "EffectShow IDs not consistent: " << effectShowContinue.idEffectShow << " / " << m_firingSmokeEntity.idEffectShow();
ERROR_LOG(m_logger) << "EffectShow IDs not consistent: " << effectShowContinue.idEffectShow << " / " << m_firingSmokeEntity.idEffectShow;
return;
}
}
//-----------------------------------------------------------------------------
void HandlerFiringSmoke::onSafetyConfirmation(const SafetyConfirmation_e &safetyConfirmation)
{
m_firingSmokeEntity.safetyConfirmation(safetyConfirmation);
m_firingSmokeEntity.safetyConfirmation = safetyConfirmation;
m_mainHandler->dds()->dts()->publish(m_firingSmokeEntity);
}
//-----------------------------------------------------------------------------
void HandlerFiringSmoke::onStatusSmokeFiring(const StatusSmokeFiring_t &statusSmokeFiring)
{
m_firingSmokeEntity.remainingDistance(statusSmokeFiring.remainingDistance_m);
m_firingSmokeEntity.remainingTime(statusSmokeFiring.remainingTime_s);
m_firingSmokeEntity.carriedOutEnabled(statusSmokeFiring.remainingTime_s <= 0);
m_firingSmokeEntity.remainingDistance = statusSmokeFiring.remainingDistance_m;
m_firingSmokeEntity.remainingTime = statusSmokeFiring.remainingTime_s;
m_firingSmokeEntity.carriedOutEnabled = statusSmokeFiring.remainingTime_s <= 0;
m_mainHandler->dds()->dts()->publish(m_firingSmokeEntity);
}
void HandlerFiringSmoke::setSmoking()
{
if (m_firingSmokeEntity.idOrder() > 0) //send new order change into execution
if (m_firingSmokeEntity.idOrder > 0) //send new order change into execution
{
m_mainHandler->handlerOrder()->updateOrderWithId(m_firingSmokeEntity.idOrder(), QStringLiteral(""), EffectShowManagement::OrderConfirmation_e::Execution);
m_mainHandler->handlerOrder()->updateOrderWithId(m_firingSmokeEntity.idOrder, QStringLiteral(""), EffectShowManagement::OrderConfirmation_e::Execution);
}
}
@@ -157,25 +157,25 @@ void HandlerFiringSmoke::onManuallySmokeRequest(const rti::core::SampleIdentity
DEBUG_LOG(m_logger) << "onManuallySmokeRequest";
//override order!
if (m_firingSmokeEntity.idOrder() == 0)
if (m_firingSmokeEntity.idOrder == 0)
{
m_firingSmokeEntity.firingClearanceTime().reset();
m_firingSmokeEntity.endOfFiringClearanceTime().reset();
m_firingSmokeEntity.carriedOutEnabled(false);
m_firingSmokeEntity.firingClearanceTime.reset();
m_firingSmokeEntity.endOfFiringClearanceTime.reset();
m_firingSmokeEntity.carriedOutEnabled = false;
}
m_firingSmokeEntity.lengthOfFogZone(request.lengthOfFogZone());
m_firingSmokeEntity.directionOfFogZone(request.directionOfFogZone());
m_firingSmokeEntity.remainingDistance(request.lengthOfFogZone());
m_firingSmokeEntity.duration(m_mainHandler->handlerVehicle()->burningTimeSmokeCartridge_s());
m_firingSmokeEntity.remainingTime(m_firingSmokeEntity.duration());
m_firingSmokeEntity.lengthOfFogZone = request.lengthOfFogZone;
m_firingSmokeEntity.directionOfFogZone = request.directionOfFogZone;
m_firingSmokeEntity.remainingDistance = request.lengthOfFogZone;
m_firingSmokeEntity.duration = m_mainHandler->handlerVehicle()->burningTimeSmokeCartridge_s();
m_firingSmokeEntity.remainingTime = m_firingSmokeEntity.duration;
m_mainHandler->dds()->fts()->manuallySmokeReply(cookie, Core::FunctionReplyObject());
if (!request.pbAbort() && !request.pbCarriedOut())
m_mainHandler->handlerVehicle()->setSmokeParameter(request.lengthOfFogZone(), request.directionOfFogZone());
if (!request.pbAbort && !request.pbCarriedOut)
m_mainHandler->handlerVehicle()->setSmokeParameter(request.lengthOfFogZone, request.directionOfFogZone);
if (request.pbAbort())
if (request.pbAbort)
m_mainHandler->handlerVehicle()->effectShowControl(EffectShowControl_e::Abort);
}