Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+6
-6
@@ -27,7 +27,7 @@ HandlerFiringSmoke::HandlerFiringSmoke(MainHandler *mainHandler,
|
||||
, ManuallySmokeRequestHandler(mainHandler->dds()->fts())
|
||||
, m_mainHandler(mainHandler)
|
||||
{
|
||||
DEBUG_LOG() << "HandlerFiringSmoke ctor";
|
||||
DEBUG_LOG(m_logger) << "HandlerFiringSmoke ctor";
|
||||
}
|
||||
//=============================================================================
|
||||
HandlerFiringSmoke::~HandlerFiringSmoke()
|
||||
@@ -81,8 +81,8 @@ void HandlerFiringSmoke::onStartHandlerFiring(const Database::EscOrder &escOrder
|
||||
if (m_firingSmokeEntity.lengthOfFogZone() <= 0 ||
|
||||
m_firingSmokeEntity.duration() <= 0)
|
||||
{
|
||||
WARNING_LOG() << "Won't start Smoke ";
|
||||
DEBUG_LOG() << "areaWidth: " << escOrder.areaWidth
|
||||
WARNING_LOG(m_logger) << "Won't start Smoke ";
|
||||
DEBUG_LOG(m_logger) << "areaWidth: " << escOrder.areaWidth
|
||||
<< "duration: " << escOrder.duration;
|
||||
return;
|
||||
}
|
||||
@@ -110,7 +110,7 @@ void HandlerFiringSmoke::onEffectShowStopped(qint16 idEffectShow)
|
||||
{
|
||||
if (idEffectShow != m_firingSmokeEntity.idEffectShow())
|
||||
{
|
||||
ERROR_LOG() << "EffectShow IDs not consistent: " << idEffectShow << " / " << m_firingSmokeEntity.idEffectShow();
|
||||
ERROR_LOG(m_logger) << "EffectShow IDs not consistent: " << idEffectShow << " / " << m_firingSmokeEntity.idEffectShow();
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -119,7 +119,7 @@ void HandlerFiringSmoke::onEffectShowContinued(const ConvertFromTab::EffectShowC
|
||||
{
|
||||
if (effectShowContinue.idEffectShow != m_firingSmokeEntity.idEffectShow())
|
||||
{
|
||||
ERROR_LOG() << "EffectShow IDs not consistent: " << effectShowContinue.idEffectShow << " / " << m_firingSmokeEntity.idEffectShow();
|
||||
ERROR_LOG(m_logger) << "EffectShow IDs not consistent: " << effectShowContinue.idEffectShow << " / " << m_firingSmokeEntity.idEffectShow();
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -153,7 +153,7 @@ void HandlerFiringSmoke::setSmoking()
|
||||
void HandlerFiringSmoke::onManuallySmokeRequest(const rti::core::SampleIdentity &cookie,
|
||||
const ManuallySmokeRequest &request)
|
||||
{
|
||||
DEBUG_LOG() << "onManuallySmokeRequest";
|
||||
DEBUG_LOG(m_logger) << "onManuallySmokeRequest";
|
||||
|
||||
//override order!
|
||||
if (m_firingSmokeEntity.idOrder() == 0)
|
||||
|
||||
Reference in new issue
Block a user