Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+2
@@ -30,6 +30,8 @@ public:
|
||||
bool init(LtsSession::LtsSession *session);
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void retranslate() override;
|
||||
void onSelectionChanged();
|
||||
void onShowEffectShowActor();
|
||||
|
||||
+2
@@ -24,6 +24,8 @@ public:
|
||||
EffectShowActorProxyModel(EffectShowActorModel *sourceModel, EffectShowModel *effectShowModel, QObject *parent);
|
||||
|
||||
protected:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
|
||||
|
||||
EffectShowModel *m_effectShowModel;
|
||||
|
||||
+2
-2
@@ -95,11 +95,11 @@ bool EffectShowActorRelocationEdit::init(LtsSession::LtsSession *session,
|
||||
EffectShowModel *model,
|
||||
int rowToCopy)
|
||||
{
|
||||
DEBUG_LOG() << "EffectShowActorRelocationEdit::init()";
|
||||
DEBUG_LOG(m_logger) << "EffectShowActorRelocationEdit::init()";
|
||||
|
||||
if (!session)
|
||||
{
|
||||
ERROR_LOG() << "EffectShowActorRelocationEdit::init() Invalid shared_ptr!";
|
||||
ERROR_LOG(m_logger) << "EffectShowActorRelocationEdit::init() Invalid shared_ptr!";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
+2
@@ -47,6 +47,8 @@ private slots:
|
||||
void onEffectShowVehicleStatusChanged(const EffectShowVehicleStatus &data, const DataModification &modType);
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void retranslate() override;
|
||||
void onEffectShowActorRelocationModifyReply(const Core::FunctionReplyObject &replyObject) override { m_requestHelper->requestReply(replyObject); }
|
||||
|
||||
|
||||
+1
-1
@@ -92,7 +92,7 @@ void EffectShowActorRelocationList::onSelectionChanged()
|
||||
|
||||
void EffectShowActorRelocationList::onAddEffectShowActorRelocation()
|
||||
{
|
||||
DEBUG_LOG() << "--- onAddEffectShowActorRelocation() ";
|
||||
DEBUG_LOG(m_logger) << "--- onAddEffectShowActorRelocation() ";
|
||||
EffectShowActorRelocationEdit *dialog = new EffectShowActorRelocationEdit(this);
|
||||
if (m_ui->widget->currentIndex().row() >= 0)
|
||||
dialog->init(m_session, m_effectShowModel, m_ui->widget->currentIndex().row());
|
||||
|
||||
+2
@@ -33,6 +33,8 @@ public:
|
||||
bool init(LtsSession::LtsSession *session);
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void retranslate() override;
|
||||
void onSelectionChanged();
|
||||
void onAddEffectShowActorRelocation();
|
||||
|
||||
+2
@@ -39,6 +39,8 @@ public:
|
||||
QVector<EffectShowManagement::EffectShowActorRelocation>::const_iterator getItEnd() const { return m_vecData.end(); }
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<EffectShowManagement::Interface::Dtc> m_dtc;
|
||||
|
||||
EffectShowModel *m_effectShowModel;
|
||||
|
||||
+3
-3
@@ -54,12 +54,12 @@ bool EffectShowEdit::init(LtsSession::LtsSession *session,
|
||||
if (!session->getForeignGuiInterface(m_esmActorCbx))
|
||||
return false;
|
||||
|
||||
DEBUG_LOG() << "EffectShowEdit::init()";
|
||||
DEBUG_LOG(m_logger) << "EffectShowEdit::init()";
|
||||
m_model = model;
|
||||
|
||||
AreaEffectSimulation::AesItem aesItem;
|
||||
bool foundItem = m_aesDtc->aesItemFromId(m_effectShow.idAreaEffectSimulation(), aesItem);
|
||||
DEBUG_LOG() << ", found :" << foundItem
|
||||
DEBUG_LOG(m_logger) << ", found :" << foundItem
|
||||
<< ", idAreaEffectSimulation :" << m_effectShow.idAreaEffectSimulation()
|
||||
<< ", aesItem.id() :" << aesItem.id()
|
||||
<< ", esmParticipantId: " << m_effectShow.esmParticipantId();
|
||||
@@ -174,7 +174,7 @@ void EffectShowEdit::updateActorComboBox(const Core::GeoPosition &coordGeo)
|
||||
bool ok;
|
||||
|
||||
int esmParticipantId = m_ui->cbEffectShowActor->currentData().toInt(&ok);
|
||||
DEBUG_LOG() << "currentIndex: " << m_ui->cbEffectShowActor->currentIndex()
|
||||
DEBUG_LOG(m_logger) << "currentIndex: " << m_ui->cbEffectShowActor->currentIndex()
|
||||
<< ", currentText: " << m_ui->cbEffectShowActor->currentText()
|
||||
<< ", esmParticipantId: " << esmParticipantId
|
||||
<< ", ok: " << ok;
|
||||
|
||||
+2
@@ -43,6 +43,8 @@ public:
|
||||
bool apply() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void retranslate() override;
|
||||
void showEffectShow();
|
||||
void onEffectShowModifyReply(const Core::FunctionReplyObject &replyObject) override { m_requestHelper->requestReply(replyObject); }
|
||||
|
||||
+1
-1
@@ -117,7 +117,7 @@ void EffectShowList::onEditEffectShow()
|
||||
|
||||
EffectShowManagement::EffectShow effectShow = m_model->getRowData(row);
|
||||
|
||||
DEBUG_LOG() << "--- onEffectShow() "
|
||||
DEBUG_LOG(m_logger) << "--- onEffectShow() "
|
||||
<< " id: " << effectShow.id()
|
||||
<< " position: " << effectShow.position();
|
||||
|
||||
|
||||
+2
@@ -41,6 +41,8 @@ private slots:
|
||||
void setShowExpired(bool show);
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void retranslate() override;
|
||||
void onSelectionChanged();
|
||||
void onEditEffectShow();
|
||||
|
||||
+4
-4
@@ -297,7 +297,7 @@ bool EffectShowModel::hasVehicleReportedOperationalToday(int equipmentNum) const
|
||||
|
||||
if (vehicleStatus.operational())
|
||||
{
|
||||
DEBUG_LOG() << "Effect show actor " << vehicleStatus.nameEffectShowActor() << " with participantId "
|
||||
DEBUG_LOG(m_logger) << "Effect show actor " << vehicleStatus.nameEffectShowActor() << " with participantId "
|
||||
<< vehicleStatus.esmParticipantId() << " is operational.";
|
||||
return true;
|
||||
}
|
||||
@@ -305,7 +305,7 @@ bool EffectShowModel::hasVehicleReportedOperationalToday(int equipmentNum) const
|
||||
|
||||
if (!m_effectShowVehicleLastTimeOperational.contains(equipmentNum))
|
||||
{
|
||||
DEBUG_LOG() << "Effect show actor " << vehicleStatus.nameEffectShowActor() << " with participantId "
|
||||
DEBUG_LOG(m_logger) << "Effect show actor " << vehicleStatus.nameEffectShowActor() << " with participantId "
|
||||
<< vehicleStatus.esmParticipantId() << " has not reported operational at any time.";
|
||||
return false;
|
||||
}
|
||||
@@ -313,10 +313,10 @@ bool EffectShowModel::hasVehicleReportedOperationalToday(int equipmentNum) const
|
||||
|
||||
bool bRet = QDateTime().addMSecs(m_effectShowVehicleLastTimeOperational[equipmentNum]).date() == QDate::currentDate();
|
||||
if (bRet)
|
||||
DEBUG_LOG() << "Effect show actor " << vehicleStatus.nameEffectShowActor() << " with participantId "
|
||||
DEBUG_LOG(m_logger) << "Effect show actor " << vehicleStatus.nameEffectShowActor() << " with participantId "
|
||||
<< vehicleStatus.esmParticipantId() << " is not operational, but has reported operational today.";
|
||||
else
|
||||
DEBUG_LOG() << "Effect show actor " << vehicleStatus.nameEffectShowActor() << " with participantId "
|
||||
DEBUG_LOG(m_logger) << "Effect show actor " << vehicleStatus.nameEffectShowActor() << " with participantId "
|
||||
<< vehicleStatus.esmParticipantId() << " is not operational and has not reported operational today.";
|
||||
return bRet;
|
||||
}
|
||||
|
||||
+2
@@ -98,6 +98,8 @@ public:
|
||||
void updateAll();
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
bool onEffectShowVehicleStatusChanged(const EffectShowManagement::EffectShowVehicleStatus &data, DataModification modType);
|
||||
|
||||
signals:
|
||||
|
||||
Reference in new issue
Block a user