Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+6
-7
@@ -15,10 +15,9 @@ namespace EffectShowManagement
|
||||
{
|
||||
//=============================================================================
|
||||
ObjectAesData::ObjectAesData(Initialization *mainHandler,
|
||||
QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_mainHandler(mainHandler)
|
||||
{
|
||||
QObject *parent) : QObject(parent)
|
||||
, m_mainHandler(mainHandler),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
}
|
||||
//=============================================================================
|
||||
|
||||
@@ -29,7 +28,7 @@ Core::FunctionReplyObject ObjectAesData::createObject(const Database::EsmAesData
|
||||
if (!m_mainHandler->db()->insert(m_data))
|
||||
return Core::FunctionReplyObject(m_data.idAes, tr_lts("dds", "Error inserting EsmAesData into database."));
|
||||
|
||||
DEBUG_LOG() << "New EsmAesData Id: " << m_data.idAes;
|
||||
DEBUG_LOG(m_logger) << "New EsmAesData Id: " << m_data.idAes;
|
||||
return Core::FunctionReplyObject(m_data.idAes);
|
||||
}
|
||||
//=============================================================================
|
||||
@@ -40,7 +39,7 @@ Core::FunctionReplyObject ObjectAesData::updateObject(const Database::EsmAesData
|
||||
if (!m_mainHandler->db()->update(m_data))
|
||||
return Core::FunctionReplyObject(m_data.idAes, tr_lts("dds", "Error updating EsmAesData into database"));
|
||||
|
||||
DEBUG_LOG() << "Data changed for EsmAesData Id: " << m_data.idAes;
|
||||
DEBUG_LOG(m_logger) << "Data changed for EsmAesData Id: " << m_data.idAes;
|
||||
|
||||
return Core::FunctionReplyObject(m_data.idAes);
|
||||
}
|
||||
@@ -72,7 +71,7 @@ bool ObjectAesData::dataChanged(const Database::EsmAesData &data) const
|
||||
if (m_data.nameAes != data.nameAes)
|
||||
return true;
|
||||
|
||||
DEBUG_LOG() << "Data Volley: " << data.volley << " old: " << m_data.volley;
|
||||
DEBUG_LOG(m_logger) << "Data Volley: " << data.volley << " old: " << m_data.volley;
|
||||
return (m_data.chargeTypeId != data.chargeTypeId)
|
||||
|| (m_data.effectStart != data.effectStart)
|
||||
|| (m_data.effectStateId == AreaEffectSimulation::AesEffectState::EsFired)
|
||||
|
||||
Reference in new issue
Block a user