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

Adds immediate migration results in progress

Browse Source
This commit is contained in:
torsten committed 2026-08-19 11:18:24 +02:00
1 parent 8453e104c5
commit 3bb6e89496
2102 files changed
+17482 -15071
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_explosion.cpp
+13 -13
View File
@@ -76,8 +76,8 @@ void HandlerFiringExplosion::setFiringClearanceDuration()
//-----------------------------------------------------------------------------
void HandlerFiringExplosion::onStartHandlerFiring(const Database::EscOrder &escOrder)
{
DEBUG_LOG() << "onStartHandlerFiring()";
DEBUG_LOG() << "numOfVolley: " << escOrder.numOfVolley
DEBUG_LOG(m_logger) << "onStartHandlerFiring()";
DEBUG_LOG(m_logger) << "numOfVolley: " << escOrder.numOfVolley
<< "shotsInTotal: " << escOrder.shotsPerVolley
<< "duration: " << escOrder.duration;
if (escOrder.numOfVolley < 0)
@@ -94,7 +94,7 @@ void HandlerFiringExplosion::onStartHandlerFiring(const Database::EscOrder &escO
m_firingExplosionEntity.numberOfShot(escOrder.shotsPerVolley);
m_firingExplosionEntity.remainingVolleys(escOrder.numOfVolley);
m_firingExplosionEntity.remainingShots(m_firingExplosionEntity.numberOfShot());
DEBUG_LOG() << "Changed number of Shots Remain: " << m_firingExplosionEntity.numberOfShot();
DEBUG_LOG(m_logger) << "Changed number of Shots Remain: " << m_firingExplosionEntity.numberOfShot();
m_isNew = false;
}
m_firingExplosionEntity.duration(escOrder.duration * 1000);
@@ -103,7 +103,7 @@ void HandlerFiringExplosion::onStartHandlerFiring(const Database::EscOrder &escO
m_firingExplosionEntity.firingClearanceTime().set(escOrder.startTime);
else
{
WARNING_LOG() << "reset clearance time";
WARNING_LOG(m_logger) << "reset clearance time";
m_firingExplosionEntity.firingClearanceTime().reset();
}
@@ -111,7 +111,7 @@ void HandlerFiringExplosion::onStartHandlerFiring(const Database::EscOrder &escO
m_firingExplosionEntity.numberOfShot() <= 0 ||
m_firingExplosionEntity.numberOfVolley() <= 0)
{
WARNING_LOG() << "Won't start Explosion ";
WARNING_LOG(m_logger) << "Won't start Explosion ";
return;
}
@@ -123,8 +123,8 @@ void HandlerFiringExplosion::onStartHandlerFiring(const Database::EscOrder &escO
//-----------------------------------------------------------------------------
void HandlerFiringExplosion::onEndHandlerFiring(const Database::EscOrder &escOrder)
{
DEBUG_LOG() << "onStopHandlerFiring()";
DEBUG_LOG() << "numOfVolley: " << escOrder.numOfVolley
DEBUG_LOG(m_logger) << "onStopHandlerFiring()";
DEBUG_LOG(m_logger) << "numOfVolley: " << escOrder.numOfVolley
<< "shotsInTotal: " << escOrder.shotsPerVolley
<< "duration: " << escOrder.duration;
if (escOrder.numOfVolley < 0 || escOrder.idOrder != m_firingExplosionEntity.idOrder())
@@ -154,7 +154,7 @@ void HandlerFiringExplosion::onEffectShowStopped(qint16 idEffectShow)
{
if (idEffectShow != m_firingExplosionEntity.idEffectShow())
{
ERROR_LOG() << "EffectShow IDs not consistent: " << idEffectShow << " / " << m_firingExplosionEntity.idEffectShow();
ERROR_LOG(m_logger) << "EffectShow IDs not consistent: " << idEffectShow << " / " << m_firingExplosionEntity.idEffectShow();
return;
}
m_firingExplosionEntity.isActive(false);
@@ -164,7 +164,7 @@ void HandlerFiringExplosion::onEffectShowContinued(const ConvertFromTab::EffectS
{
if (effectShowContinue.idEffectShow != m_firingExplosionEntity.idEffectShow())
{
ERROR_LOG() << "EffectShow IDs not consistent: " << effectShowContinue.idEffectShow << " / " << m_firingExplosionEntity.idEffectShow();
ERROR_LOG(m_logger) << "EffectShow IDs not consistent: " << effectShowContinue.idEffectShow << " / " << m_firingExplosionEntity.idEffectShow();
return;
}
}
@@ -206,7 +206,7 @@ void HandlerFiringExplosion::onStatusExplosionFiring(const StatusExplosionFiring
void HandlerFiringExplosion::onEffectShowStarted()
{
DEBUG_LOG() << "onEffectShowStarted";
DEBUG_LOG(m_logger) << "onEffectShowStarted";
m_mainHandler->handlerVehicle()->setExplosionParameter(m_firingExplosionEntity.remainingVolleys(),
m_firingExplosionEntity.remainingShots(),
m_firingExplosionEntity.remainingTime());
@@ -227,10 +227,10 @@ bool HandlerFiringExplosion::onEffectShowInterrupted()
if (!m_firingExplosionEntity.isActive() && m_isInterrupted == false)
{
DEBUG_LOG() << "onEffectShowInterrupted is active so return";
DEBUG_LOG(m_logger) << "onEffectShowInterrupted is active so return";
return false;
}
DEBUG_LOG() << "onEffectShowInterrupted";
DEBUG_LOG(m_logger) << "onEffectShowInterrupted";
m_mainHandler->handlerControlUnit()->send(CommandSignal::FT_SE_CB_SICHERHEIT_WIDERRUFEN);
m_mainHandler->handlerVehicle()->effectShowControl(EffectShowControl_e::StopTimer);
@@ -246,7 +246,7 @@ bool HandlerFiringExplosion::onEffectShowInterrupted()
void HandlerFiringExplosion::onManuallyExplosionRequest(const rti::core::SampleIdentity &cookie,
const ManuallyExplosionRequest &request)
{
DEBUG_LOG() << "onManuallyExplosionRequest ";
DEBUG_LOG(m_logger) << "onManuallyExplosionRequest ";
//override order!
if (m_firingExplosionEntity.idEffectShow() == 0)
{