Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+11
-11
@@ -49,7 +49,7 @@ void ForeignInterfaceImpl::enableIsmForeignInterface() const
|
||||
|
||||
if (!m_mountingPoints.isEmpty())
|
||||
{
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " START, ismDataDtc, m_exerciseId = " << m_exerciseId
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, ismDataDtc, m_exerciseId = " << m_exerciseId
|
||||
<< " already initialized -> return";
|
||||
return;
|
||||
}
|
||||
@@ -117,7 +117,7 @@ MainSchedule ForeignInterfaceImpl::mainSchedule(int32_t scheduleId)
|
||||
|
||||
void ForeignInterfaceImpl::setScheduleId(int32_t scheduleId)
|
||||
{
|
||||
DEBUG_LOG() << "setScheduleId to: " << scheduleId
|
||||
DEBUG_LOG(m_logger) << "setScheduleId to: " << scheduleId
|
||||
<< " (was " << m_scheduleId << ")";
|
||||
|
||||
enableIsmForeignInterface();
|
||||
@@ -183,7 +183,7 @@ void ForeignInterfaceImpl::onMainStructureElementChanged(const MainStructureElem
|
||||
|
||||
const QJsonDocument doc(QJsonDocument::fromJson(content, &parserError));
|
||||
if (parserError.error != QJsonParseError::NoError)
|
||||
WARNING_LOG() << "Invalid properties for MSE " << data.id() << ", " << data.name();
|
||||
WARNING_LOG(m_logger) << "Invalid properties for MSE " << data.id() << ", " << data.name();
|
||||
else
|
||||
{
|
||||
const QJsonArray exercises(QJsonObject(doc.object()).value(QStringLiteral("available_in_exercise")).toArray());
|
||||
@@ -221,7 +221,7 @@ void ForeignInterfaceImpl::onMainStructureElementChanged(const MainStructureElem
|
||||
if (realChange)
|
||||
{
|
||||
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " m_bldgsInExcersise updated."
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " m_bldgsInExcersise updated."
|
||||
<< " (mseId=" << mseId << " name=" << data.name();
|
||||
emit buildingsInCurrentExerciseChanged();
|
||||
}
|
||||
@@ -247,7 +247,7 @@ void ForeignInterfaceImpl::onMainStructureElementChanged(const MainStructureElem
|
||||
|
||||
|
||||
if (!m_dtc->getStructureElementById(curPath[1], seFloor))
|
||||
WARNING_LOG() << " getStructureElementById failed for " << curPath[1];
|
||||
WARNING_LOG(m_logger) << " getStructureElementById failed for " << curPath[1];
|
||||
|
||||
}
|
||||
|
||||
@@ -268,7 +268,7 @@ void ForeignInterfaceImpl::onMainStructureElementChanged(const MainStructureElem
|
||||
mountingPointRef.updateData(currentStructEle, floorId);
|
||||
emit mountingPointChanged(mountingPointRef, DataModification::eModified);
|
||||
} else {
|
||||
DEBUG_LOG() << "New Mounting point with id " << currentStructEle.id()
|
||||
DEBUG_LOG(m_logger) << "New Mounting point with id " << currentStructEle.id()
|
||||
<< " and type " << currentStructEle.mountingPointTypeId()
|
||||
<< " (type " << currentStructEle.mountingPointTypeId().underlying() << ")"
|
||||
<< " subid: " << currentStructEle.mountingPointId() << this;
|
||||
@@ -294,7 +294,7 @@ void ForeignInterfaceImpl::onMountingPointAssetChanged(const MountingPointAsset
|
||||
{
|
||||
const int32_t structureElementId = data.structureElementId();
|
||||
|
||||
DEBUG_LOG() << "onMountingPointAssetChanged se id: " << structureElementId << ", assetId: " << data.assetId();
|
||||
DEBUG_LOG(m_logger) << "onMountingPointAssetChanged se id: " << structureElementId << ", assetId: " << data.assetId();
|
||||
|
||||
|
||||
|
||||
@@ -366,7 +366,7 @@ void ForeignInterfaceImpl::onMainScheduleChanged(const MainSchedule &data, DataM
|
||||
|
||||
void ForeignInterfaceImpl::init()
|
||||
{
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " START, ismDataDtc, m_exerciseId = " << m_exerciseId
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, ismDataDtc, m_exerciseId = " << m_exerciseId
|
||||
<< " - m_mountingPoints.size()=" << m_mountingPoints.size()
|
||||
<< ", (m_mountingPointAssetMap.size()=" << m_mountingPointAssetMap.size() << ")";
|
||||
|
||||
@@ -425,12 +425,12 @@ void ForeignInterfaceImpl::init()
|
||||
int firstBldg = -1;
|
||||
if (!m_bldgsInExcersise.isEmpty())
|
||||
firstBldg = *m_bldgsInExcersise.begin();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << ", exerciseId = " << m_exerciseId << ", bldgs in excersise = " << m_bldgsInExcersise.size()
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << ", exerciseId = " << m_exerciseId << ", bldgs in excersise = " << m_bldgsInExcersise.size()
|
||||
<< ", firstBldg: " << firstBldg;
|
||||
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "XXXXX" << m_bldgsInExcersise.size();
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "XXXXX" << m_bldgsInExcersise.size();
|
||||
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " END, ismDataDtc, m_exerciseId = " << m_exerciseId
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END, ismDataDtc, m_exerciseId = " << m_exerciseId
|
||||
<< " - m_mountingPoints.size()=" << m_mountingPoints.size()
|
||||
<< ", (m_mountingPointAssetMap.size()=" << m_mountingPointAssetMap.size() << ")";
|
||||
}
|
||||
|
||||
+2
@@ -53,6 +53,8 @@ private Q_SLOTS:
|
||||
void onMainScheduleChanged(const InfrastructureManagement::MainSchedule &data, DataModification modType);
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void init();
|
||||
|
||||
private:
|
||||
|
||||
Reference in new issue
Block a user