Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+4
-4
@@ -56,19 +56,19 @@ bool ExerciseAssignmentDialog::init(const std::shared_ptr<Interface::Dtc> &ismDt
|
||||
|
||||
if (!m_ismFtc->enableInstrumentationAssetModify())
|
||||
{
|
||||
ERROR_LOG() << "Could not enable FT InstrumentationAssetModify of ISM";
|
||||
ERROR_LOG(m_logger) << "Could not enable FT InstrumentationAssetModify of ISM";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_ismFtc->enableMainStructureElementModify())
|
||||
{
|
||||
ERROR_LOG() << "Could not enable FT MainStructureElementModify of ISM";
|
||||
ERROR_LOG(m_logger) << "Could not enable FT MainStructureElementModify of ISM";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_exmDtc->enableExercise())
|
||||
{
|
||||
ERROR_LOG() << "Could not enable DT Exercise of EXM";
|
||||
ERROR_LOG(m_logger) << "Could not enable DT Exercise of EXM";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -83,7 +83,7 @@ bool ExerciseAssignmentDialog::init(const std::shared_ptr<Interface::Dtc> &ismDt
|
||||
m_model = new ExerciseAssignmentDialogModel(this);
|
||||
if (!m_model->initModel(m_ismDtc, m_exmDtc))
|
||||
{
|
||||
ERROR_LOG() << "Could not init model";
|
||||
ERROR_LOG(m_logger) << "Could not init model";
|
||||
delete m_model;
|
||||
m_model = nullptr;
|
||||
return false;
|
||||
|
||||
+2
@@ -45,6 +45,8 @@ private Q_SLOTS:
|
||||
void onPrint();
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void retranslate() override;
|
||||
|
||||
private:
|
||||
|
||||
+4
-4
@@ -46,7 +46,7 @@ QVariant ExerciseAssignmentDialogModel::data(const QModelIndex &index, int role)
|
||||
|
||||
if (parseError.error != QJsonParseError::NoError)
|
||||
{
|
||||
INFO_LOG() << "Could not parse JSON props of building with ID "
|
||||
INFO_LOG(m_logger) << "Could not parse JSON props of building with ID "
|
||||
<< currentMainStructureElement.id()
|
||||
<< ". Reason: "
|
||||
<< parseError.errorString()
|
||||
@@ -83,13 +83,13 @@ bool ExerciseAssignmentDialogModel::initModel(const std::shared_ptr<Interface::D
|
||||
|
||||
if (!m_dtc->enableInstrumentationAsset())
|
||||
{
|
||||
ERROR_LOG() << "Could not enable Datatopic InstrumentationAsset of the Data Topic Client";
|
||||
ERROR_LOG(m_logger) << "Could not enable Datatopic InstrumentationAsset of the Data Topic Client";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_exmDtc->enableExercise())
|
||||
{
|
||||
ERROR_LOG() << "Could not enable Topic Exercise from Exercise Management DTC";
|
||||
ERROR_LOG(m_logger) << "Could not enable Topic Exercise from Exercise Management DTC";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -102,7 +102,7 @@ bool ExerciseAssignmentDialogModel::initModel(const std::shared_ptr<Interface::D
|
||||
};
|
||||
m_dtc->mainStructureElements(cb);
|
||||
|
||||
INFO_LOG() << "initModel successful";
|
||||
INFO_LOG(m_logger) << "initModel successful";
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
+2
@@ -25,6 +25,8 @@ public:
|
||||
bool initModel(const std::shared_ptr<Interface::Dtc> &dtc, const std::shared_ptr<ExerciseManagement::Interface::Dtc> &exmDtc);
|
||||
|
||||
protected:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
bool isFiltered(const InfrastructureManagement::MainStructureElement &data, DataModification modType) const override;
|
||||
|
||||
private:
|
||||
|
||||
Reference in new issue
Block a user