Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+2
@@ -40,6 +40,8 @@ public slots:
|
||||
void onPrint();
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void retranslate() override;
|
||||
void tableColumnOrganiserSetting() override;
|
||||
|
||||
|
||||
+2
-2
@@ -42,7 +42,7 @@ bool EquipmentErrorRegistrationModel::initModel(LtsSession::LtsSession *session,
|
||||
|
||||
if (!m_exmDtc->enableExercise())
|
||||
{
|
||||
ERROR_LOG() << " Could not enable Exercise Data-Topic in EXM DTC!";
|
||||
ERROR_LOG(m_logger) << " Could not enable Exercise Data-Topic in EXM DTC!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -135,7 +135,7 @@ void EquipmentErrorRegistrationModel::onLiveEvent(const ExerciseEventManagement:
|
||||
{
|
||||
if (ev.eventTypeId() != ProjectDataManagement::EventType_def::EquipmentErrorReport)
|
||||
return;
|
||||
INFO_LOG() << "Event EquipmentNumber=" << ev.equipmentNumber();
|
||||
INFO_LOG(m_logger) << "Event EquipmentNumber=" << ev.equipmentNumber();
|
||||
insertRow(event2Entry(ev));
|
||||
|
||||
emit chunksUpdated(m_chunksReceived, m_chunksRequested);
|
||||
|
||||
+2
@@ -52,6 +52,8 @@ signals:
|
||||
void chunksUpdated(int chunksReceived, int chunksRequested);
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void onRequestedDataAvailable(TimeLineManagement::TimelineDataProviderInterface *request);
|
||||
void onLiveEvent(const ExerciseEventManagement::Event &ev);
|
||||
|
||||
|
||||
+2
@@ -74,6 +74,8 @@ private slots:
|
||||
void onSelectionChanged();
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
bool hasValidPosition();
|
||||
void retranslate() override;
|
||||
void tableColumnOrganiserSetting() override;
|
||||
|
||||
+7
-7
@@ -67,44 +67,44 @@ bool HgrAndMineSearchModel::initModel(LtsSession::LtsSession *session,
|
||||
|
||||
if (!m_ppmDtc->enableEquipmentSystemEventFtcReply())
|
||||
{
|
||||
ERROR_LOG() << " Could not enable EquipmentSystemEventFtcReply Data-Topic in PPM DTC!";
|
||||
ERROR_LOG(m_logger) << " Could not enable EquipmentSystemEventFtcReply Data-Topic in PPM DTC!";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_ppmFtc->enableEquipmentSystemEventData())
|
||||
{
|
||||
ERROR_LOG() << " Could not enable EquipmentSystemEventData Function-Topic in PPM FTC!";
|
||||
ERROR_LOG(m_logger) << " Could not enable EquipmentSystemEventData Function-Topic in PPM FTC!";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_exmDtc->enableExercise())
|
||||
{
|
||||
ERROR_LOG() << " Could not enable Exercise Data-Topic in EXM DTC!";
|
||||
ERROR_LOG(m_logger) << " Could not enable Exercise Data-Topic in EXM DTC!";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
if (!m_pdmDtc->enableEquipmentSystemEventFilter())
|
||||
{
|
||||
ERROR_LOG() << " Could not enable EquipmentSystemEventFilter Data-Topic in PDM DTC!";
|
||||
ERROR_LOG(m_logger) << " Could not enable EquipmentSystemEventFilter Data-Topic in PDM DTC!";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_pdmDtc->enableEventFilterHgrMineSearch())
|
||||
{
|
||||
ERROR_LOG() << " Could not enable EventFilterHgrMineSearch Data-Topic in PDM DTC!";
|
||||
ERROR_LOG(m_logger) << " Could not enable EventFilterHgrMineSearch Data-Topic in PDM DTC!";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_aesDtc->enableMineArea())
|
||||
{
|
||||
ERROR_LOG() << " Could not enable MineArea Data-Topic in AES DTC!";
|
||||
ERROR_LOG(m_logger) << " Could not enable MineArea Data-Topic in AES DTC!";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_aesDtc->enableDusMineState())
|
||||
{
|
||||
ERROR_LOG() << " Could not enable DusMineState Data-Topic in AES DTC!";
|
||||
ERROR_LOG(m_logger) << " Could not enable DusMineState Data-Topic in AES DTC!";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
+2
@@ -67,6 +67,8 @@ signals:
|
||||
void chunksUpdated(int chunksReceived, int chunksRequested);
|
||||
|
||||
protected:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
QIcon iconFromPartyId(int partyId) const;
|
||||
QVariant stringFromPartyId(int partyId) const;
|
||||
void onUpdateComboboxFilterData();
|
||||
|
||||
+1
-1
@@ -145,7 +145,7 @@ void BaseEquipmentCheck::onMappedEquipTimeout(int participantId, QTimer *timer)
|
||||
|
||||
void BaseEquipmentCheck::onSelectionChanged()
|
||||
{
|
||||
DEBUG_LOG() << "onSelectionChanged";
|
||||
DEBUG_LOG(m_logger) << "onSelectionChanged";
|
||||
|
||||
bool enable = false;
|
||||
const auto selectedIndexes = view()->selectedRows();
|
||||
|
||||
+2
@@ -66,6 +66,8 @@ protected slots:
|
||||
void onPrint();
|
||||
|
||||
protected:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
virtual LtsDataView::LtsDataView *view() = 0;
|
||||
virtual const LtsDataView::LtsDataView *view() const = 0;
|
||||
protected:
|
||||
|
||||
+5
-5
@@ -66,7 +66,7 @@ bool BasePlayerModel::initModel(LtsSession::LtsSessionDataDds *session)
|
||||
if (!session)
|
||||
return false;
|
||||
|
||||
DEBUG_LOG() << "**** initModel";
|
||||
DEBUG_LOG(m_logger) << "**** initModel";
|
||||
m_session = session;
|
||||
m_partitionTime = m_session->partitionTime();
|
||||
|
||||
@@ -482,7 +482,7 @@ int BasePlayerModel::findRowForEquipmentNumber(int equipNo) const
|
||||
|
||||
if (data.equipmentNumber == equipNo)
|
||||
{
|
||||
DEBUG_LOG() << "** findRowForEquipmentNumber: "
|
||||
DEBUG_LOG(m_logger) << "** findRowForEquipmentNumber: "
|
||||
<< equipNo << "--> " << i;
|
||||
return i;
|
||||
}
|
||||
@@ -493,7 +493,7 @@ int BasePlayerModel::findRowForEquipmentNumber(int equipNo) const
|
||||
void BasePlayerModel::onDynamicParticipantChanged(const ParticipantManagement::DynamicParticipantData &data,
|
||||
DataModification modType)
|
||||
{
|
||||
DEBUG_LOG() << "**** onDynamicParticipantChanged: " << data;
|
||||
DEBUG_LOG(m_logger) << "**** onDynamicParticipantChanged: " << data;
|
||||
|
||||
int row = findRowForId(data.participantId());
|
||||
if (row < 0)
|
||||
@@ -687,7 +687,7 @@ void BasePlayerModel::onPositionChanged(const ParticipantManagement::Participant
|
||||
{
|
||||
if (modType == DataModification::eRemoved)
|
||||
return;
|
||||
DEBUG_LOG() << "**** onPositionChanged: " << position;
|
||||
DEBUG_LOG(m_logger) << "**** onPositionChanged: " << position;
|
||||
|
||||
m_positions[position.participantId()] = position;
|
||||
|
||||
@@ -718,7 +718,7 @@ void BasePlayerModel::onBiteChanged(const ParticipantManagement::Bite &bite,
|
||||
{
|
||||
if (modType == DataModification::eRemoved)
|
||||
return;
|
||||
DEBUG_LOG() << "**** onBiteChanged: " << bite;
|
||||
DEBUG_LOG(m_logger) << "**** onBiteChanged: " << bite;
|
||||
|
||||
m_bites[bite.equipmentNumber()] = bite;
|
||||
|
||||
|
||||
+2
@@ -126,6 +126,8 @@ protected slots:
|
||||
void onUpdatePositionAge();
|
||||
|
||||
protected:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void updateUsedPartyIds();
|
||||
void setBiteResult(int row, qint64 sampleTime, const QString &biteResult, const QString &warnings);
|
||||
QString getBitResult(const ParticipantManagement::Bite &bite, int equipmnetNumber) const;
|
||||
|
||||
+7
-7
@@ -22,7 +22,7 @@ BiteModel::BiteModel(QObject *parent)
|
||||
bool BiteModel::initModel(const std::shared_ptr<ParticipantManagement::Interface::Dtc> &ppmDtc,
|
||||
const std::shared_ptr<ProjectDataManagement::Interface::Dtc> &pdmDtc)
|
||||
{
|
||||
DEBUG_LOG() << "initModel";
|
||||
DEBUG_LOG(m_logger) << "initModel";
|
||||
|
||||
m_ppmDtc = ppmDtc;
|
||||
if (!m_ppmDtc)
|
||||
@@ -103,7 +103,7 @@ QString BiteModel::checkBit(const ParticipantManagement::Bite &bite, quint32 bit
|
||||
break;
|
||||
}
|
||||
}
|
||||
DEBUG_LOG() << "** name: " << name;
|
||||
DEBUG_LOG(m_logger) << "** name: " << name;
|
||||
|
||||
QString ret;
|
||||
if (available)
|
||||
@@ -148,7 +148,7 @@ QString BiteModel::checkBatteryBit(int state, qint64 bitValue) const
|
||||
break;
|
||||
}
|
||||
}
|
||||
DEBUG_LOG() << "** name: " << name;
|
||||
DEBUG_LOG(m_logger) << "** name: " << name;
|
||||
|
||||
if ((state & bitValue) == bitValue)
|
||||
return name;
|
||||
@@ -223,7 +223,7 @@ int BiteModel::findRowForEquipmentNumber(int equipNo) const
|
||||
{
|
||||
if (m_vecData.at(i).equipmentNumber() == equipNo)
|
||||
{
|
||||
DEBUG_LOG() << "findRowForEquipmentNumber: "
|
||||
DEBUG_LOG(m_logger) << "findRowForEquipmentNumber: "
|
||||
<< equipNo << "-->" << i;
|
||||
return i;
|
||||
}
|
||||
@@ -234,7 +234,7 @@ int BiteModel::findRowForEquipmentNumber(int equipNo) const
|
||||
void BiteModel::biteDataChanged(const ParticipantManagement::Bite &data,
|
||||
DataModification modType)
|
||||
{
|
||||
DEBUG_LOG() << "biteDataChanged";
|
||||
DEBUG_LOG(m_logger) << "biteDataChanged";
|
||||
|
||||
const int equipNo = data.equipmentNumber();
|
||||
const int row = findRowForEquipmentNumber(equipNo);
|
||||
@@ -244,7 +244,7 @@ void BiteModel::biteDataChanged(const ParticipantManagement::Bite &data,
|
||||
case DataModification::eAdded:
|
||||
case DataModification::eModified:
|
||||
{
|
||||
DEBUG_LOG() << " Modified bite msg";
|
||||
DEBUG_LOG(m_logger) << " Modified bite msg";
|
||||
|
||||
if (row < 0)
|
||||
{
|
||||
@@ -265,7 +265,7 @@ void BiteModel::biteDataChanged(const ParticipantManagement::Bite &data,
|
||||
}
|
||||
case DataModification::eRemoved:
|
||||
{
|
||||
DEBUG_LOG() << " Remove bite msg";
|
||||
DEBUG_LOG(m_logger) << " Remove bite msg";
|
||||
removeRow(row);
|
||||
break;
|
||||
}
|
||||
|
||||
+2
@@ -54,6 +54,8 @@ private slots:
|
||||
|
||||
private:
|
||||
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
QString checkBit(const ParticipantManagement::Bite &bite,
|
||||
quint32 bitValue) const;
|
||||
|
||||
|
||||
+3
-3
@@ -25,7 +25,7 @@ CtasErrorModel:: CtasErrorModel(QObject *parent)
|
||||
|
||||
bool CtasErrorModel::initModel(const std::shared_ptr<ParticipantManagement::Interface::Dtc> &ppmDtc)
|
||||
{
|
||||
DEBUG_LOG() << "initModel";
|
||||
DEBUG_LOG(m_logger) << "initModel";
|
||||
|
||||
if (!ppmDtc)
|
||||
return false;
|
||||
@@ -252,11 +252,11 @@ QString CtasErrorModel::telegramId2Text(int id) const
|
||||
void CtasErrorModel::ctasErrorChanged(const ParticipantManagement::CtaError &data,
|
||||
DataModification modType)
|
||||
{
|
||||
DEBUG_LOG() << "ctasErrorChanged";
|
||||
DEBUG_LOG(m_logger) << "ctasErrorChanged";
|
||||
|
||||
if (modType == DataModification::eAdded || modType == DataModification::eModified)
|
||||
{
|
||||
DEBUG_LOG() << " Added Fehlermeldung GFD";
|
||||
DEBUG_LOG(m_logger) << " Added Fehlermeldung GFD";
|
||||
insertRow(data);
|
||||
return;
|
||||
}
|
||||
|
||||
+2
@@ -39,6 +39,8 @@ private slots:
|
||||
DataModification modType);
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
QString telegramId2Text(int id) const;
|
||||
|
||||
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
|
||||
|
||||
+8
-8
@@ -259,11 +259,11 @@ void ServiceMonitorDialog::onTableViewClicked(const QModelIndex &index)
|
||||
delete dlg;
|
||||
}
|
||||
}
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START, index=" << index.row() << " - " << index.column();
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, index=" << index.row() << " - " << index.column();
|
||||
if (!m_ui->ltsDataView->sourceModel())
|
||||
return;
|
||||
onParticipantClicked(participantId(index));
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END, index=" << index.row() << " - " << index.column();
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, index=" << index.row() << " - " << index.column();
|
||||
}
|
||||
|
||||
void ServiceMonitorDialog::onEditItem()
|
||||
@@ -300,7 +300,7 @@ void ServiceMonitorDialog::onAllAuto()
|
||||
|
||||
void ServiceMonitorDialog::onTableViewSelectionChanged(const QItemSelection &selected)
|
||||
{
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
|
||||
if (m_monitor == Monitor::Egcu)
|
||||
{
|
||||
|
||||
@@ -326,12 +326,12 @@ void ServiceMonitorDialog::onTableViewSelectionChanged(const QItemSelection &sel
|
||||
{
|
||||
onParticipantClicked(participantId(mil.first()));
|
||||
}
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
void ServiceMonitorDialog::onParticipantClicked(int participantId)
|
||||
{
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START, participantId=" << participantId;
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, participantId=" << participantId;
|
||||
if (!m_session)
|
||||
return;
|
||||
|
||||
@@ -344,9 +344,9 @@ void ServiceMonitorDialog::onParticipantClicked(int participantId)
|
||||
sitMapGuiIfc->removeObjectIndicator();
|
||||
else
|
||||
if (!sitMapGuiIfc->objectIndicatorToParticipant(participantId))
|
||||
ERROR_LOG() << Q_FUNC_INFO << " objectIndicatorToParticipant failed for participantId = " << participantId;
|
||||
ERROR_LOG(m_logger) << Q_FUNC_INFO << " objectIndicatorToParticipant failed for participantId = " << participantId;
|
||||
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END, participantId=" << participantId;
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, participantId=" << participantId;
|
||||
}
|
||||
|
||||
void ServiceMonitorDialog::leaveEvent(QEvent *e)
|
||||
@@ -367,7 +367,7 @@ void ServiceMonitorDialog::onPrint()
|
||||
|
||||
int ServiceMonitorDialog::participantId(const QModelIndex &index) const
|
||||
{
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START, index=" << index.row() << " - " << index.column();
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, index=" << index.row() << " - " << index.column();
|
||||
if (!m_ui->ltsDataView->sourceModel())
|
||||
return -1;
|
||||
|
||||
|
||||
@@ -70,6 +70,8 @@ private slots:
|
||||
void onShowContextMenu(const QPoint &position);
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void setAllOverrides(InfrastructureManagement::EffectOverride eo);
|
||||
void retranslate() override;
|
||||
void onPrint();
|
||||
|
||||
+1
-1
@@ -252,7 +252,7 @@ bool EgcuEdit::apply()
|
||||
}
|
||||
|
||||
properties= structureElement.properties();
|
||||
DEBUG_LOG() << "structureElementId=" << m_egcuData.mountingPoint.id()
|
||||
DEBUG_LOG(m_logger) << "structureElementId=" << m_egcuData.mountingPoint.id()
|
||||
<< " properties=" << properties;
|
||||
|
||||
QJsonArray arrRelays;
|
||||
|
||||
@@ -47,6 +47,7 @@ public:
|
||||
|
||||
bool apply() override;
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
void retranslate() override;
|
||||
static void getRoomIds(QTreeWidgetItem *twi, QVariantList &vl);
|
||||
void updateRelays();
|
||||
|
||||
+19
-20
@@ -98,7 +98,7 @@ QVariant EgcuModel::data(const QModelIndex &index, int role) const
|
||||
switch (index.column())
|
||||
{
|
||||
case Id:
|
||||
DEBUG_LOG() << "EGCU DATA= "
|
||||
DEBUG_LOG(m_logger) << "EGCU DATA= "
|
||||
<< " instrumentationAsset.id=" << instrumentationAsset.id()
|
||||
<< " hostname=" << instrumentationAsset.hostname()
|
||||
<< " name=" << instrumentationAsset.name()
|
||||
@@ -234,7 +234,7 @@ QString EgcuModel::getOverridesString(const EgcuData &data) const
|
||||
|
||||
QString EgcuModel::getRelaisStates(const EgcuData &data) const
|
||||
{
|
||||
DEBUG_LOG() << "getRelaisStates"
|
||||
DEBUG_LOG(m_logger) << "getRelaisStates"
|
||||
<< " offlineTime=" << data.relayState.offlineTime()
|
||||
<< " stateTime=" << data.relayState.stateTime()
|
||||
<< " mountingPoint.id=" << data.mountingPoint.id()
|
||||
@@ -253,14 +253,14 @@ QString EgcuModel::getRelaisStates(const EgcuData &data) const
|
||||
QStringList sl;
|
||||
|
||||
Buildings::RelayState relayState = m_bldDtc->relayState(data.mountingPointAsset.assetId());
|
||||
DEBUG_LOG() << "relayState id=" << relayState.id()
|
||||
DEBUG_LOG(m_logger) << "relayState id=" << relayState.id()
|
||||
<< " offlineTime=" << relayState.offlineTime()
|
||||
<< " stateTime=" << relayState.stateTime()
|
||||
<< " relayStates().size=" << relayState.relayStates().size();
|
||||
|
||||
if (relayState.offlineTime() > relayState.stateTime())
|
||||
{
|
||||
DEBUG_LOG() << QString(tr("Connection Error"));
|
||||
DEBUG_LOG(m_logger) << QString(tr("Connection Error"));
|
||||
sl << QString(tr("Connection Error"));
|
||||
sl << QStringLiteral(" - ");
|
||||
}
|
||||
@@ -270,7 +270,7 @@ QString EgcuModel::getRelaisStates(const EgcuData &data) const
|
||||
{
|
||||
AssetManagement::RelayInfo relayInfo = m_asmDtc->relayInfo(relayState.relayStates()[i].id());
|
||||
bool state = relayState.relayStates().at(i).state();
|
||||
DEBUG_LOG() << "relayInfo id=" << relayInfo.id()
|
||||
DEBUG_LOG(m_logger) << "relayInfo id=" << relayInfo.id()
|
||||
<< " name=" << relayInfo.name()
|
||||
<< " property=" << relayInfo.property()
|
||||
<< " state=" << state;
|
||||
@@ -359,7 +359,7 @@ bool EgcuModel::initModel(LtsSession::LtsSession *session)
|
||||
|
||||
initData();
|
||||
|
||||
DEBUG_LOG() << "initModel successfull";
|
||||
DEBUG_LOG(m_logger) << "initModel successfull";
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -370,7 +370,7 @@ QModelIndex EgcuModel::getIndexOfVisableRootItem() const
|
||||
|
||||
bool EgcuModel::mseHasMountedAsset(const InfrastructureManagement::MainStructureElement &mse, InfrastructureManagement::MountingPointType mpType)
|
||||
{
|
||||
DEBUG_LOG() << "mseHasMountedBsm mse.id=" << mse.id()
|
||||
DEBUG_LOG(m_logger) << "mseHasMountedBsm mse.id=" << mse.id()
|
||||
<< " name=" << mse.name();
|
||||
for (const InfrastructureManagement::StructureElement &element : std::as_const(mse.elements()))
|
||||
{
|
||||
@@ -378,7 +378,7 @@ bool EgcuModel::mseHasMountedAsset(const InfrastructureManagement::MainStructure
|
||||
if (element.mountingPointTypeId() != mpType)
|
||||
continue;
|
||||
|
||||
DEBUG_LOG() << "Mountpoint BSM:" << element.id()
|
||||
DEBUG_LOG(m_logger) << "Mountpoint BSM:" << element.id()
|
||||
<< " name=" << element.name();
|
||||
if (isMounted(element.id()))
|
||||
return true;
|
||||
@@ -388,10 +388,10 @@ bool EgcuModel::mseHasMountedAsset(const InfrastructureManagement::MainStructure
|
||||
|
||||
bool EgcuModel::isMounted(int mountingPointId)
|
||||
{
|
||||
DEBUG_LOG() << "isMounted id=" << mountingPointId;
|
||||
DEBUG_LOG(m_logger) << "isMounted id=" << mountingPointId;
|
||||
for (const InfrastructureManagement::MountingPointAsset &asset : std::as_const(m_mountingPointAssets))
|
||||
{
|
||||
DEBUG_LOG() << "assetId=" << asset.structureElementId()
|
||||
DEBUG_LOG(m_logger) << "assetId=" << asset.structureElementId()
|
||||
<< " mountingPointId=" << mountingPointId;
|
||||
if (asset.structureElementId() == mountingPointId)
|
||||
return true;
|
||||
@@ -424,7 +424,7 @@ void EgcuModel::initData()
|
||||
|
||||
if ( !m_dtc->isElementAssignedToExercise( mse, m_session->exerciseId()))
|
||||
{
|
||||
DEBUG_LOG() << "EgcuModel::initData mseId=" << mse.id() << " not in Exercise";
|
||||
DEBUG_LOG(m_logger) << "EgcuModel::initData mseId=" << mse.id() << " not in Exercise";
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -456,9 +456,9 @@ void EgcuModel::initData()
|
||||
parentIndex = treeIndices.value(path.at(path.size() - 2), indexFromItem(m_rootItem));
|
||||
if (!parentIndex.isValid())
|
||||
{
|
||||
INFO_LOG() << "Did not find parent for structure element with id " << currentElement.id() << " mseid: " << mse.id();
|
||||
INFO_LOG(m_logger) << "Did not find parent for structure element with id " << currentElement.id() << " mseid: " << mse.id();
|
||||
for (const InfrastructureManagement::StructureElement &se : mse.elements())
|
||||
INFO_LOG() << " se: " << se.id() << ", " << se.name();
|
||||
INFO_LOG(m_logger) << " se: " << se.id() << ", " << se.name();
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -496,7 +496,7 @@ NGLTreeItem* EgcuModel::createItemFromMountingPoint(const InfrastructureManageme
|
||||
{
|
||||
|
||||
|
||||
DEBUG_LOG() << "mountingPoint Id=" << mountingPoint.buildingId()
|
||||
DEBUG_LOG(m_logger) << "mountingPoint Id=" << mountingPoint.buildingId()
|
||||
<< " properties=" << mountingPoint.properties()
|
||||
<< " associatedAssetId=" << mountingPoint.associatedAssetId()
|
||||
<< " isUsed=" << mountingPoint.data().isUsed()
|
||||
@@ -540,7 +540,7 @@ NGLTreeItem* EgcuModel::createItemFromMountingPoint(const InfrastructureManageme
|
||||
|
||||
NGLTreeItem* EgcuModel::createItemFromStructureElement(const InfrastructureManagement::StructureElement ¤tElement)
|
||||
{
|
||||
DEBUG_LOG() << "createItemFromStructureElement" << currentElement.displayName();
|
||||
DEBUG_LOG(m_logger) << "createItemFromStructureElement" << currentElement.displayName();
|
||||
return new NGLTreeItem(QVariant::fromValue(currentElement));
|
||||
}
|
||||
|
||||
@@ -1191,7 +1191,7 @@ bool EgcuModel::readAllowance(InfrastructureManagement::EffectOverride eo, const
|
||||
QMap<int,QModelIndex> EgcuModel::setSelectedStructureElements(const QVector<int> &structureElementIds)
|
||||
{
|
||||
QMap<int,QModelIndex> map;
|
||||
ERROR_LOG() << "structureElementIds.size=" << structureElementIds.size()
|
||||
ERROR_LOG(m_logger) << "structureElementIds.size=" << structureElementIds.size()
|
||||
<< " id[0]=" << structureElementIds[0];
|
||||
findStructureElementChildrenByIds(m_rootItem, structureElementIds, map);
|
||||
return map;
|
||||
@@ -1299,13 +1299,12 @@ void EgcuData::update(const InfrastructureManagement::InstrumentationAsset &ia,
|
||||
instrumentationAsset = ia;
|
||||
}
|
||||
|
||||
EgcuData::EgcuData(const InfrastructureManagement::InstrumentationAsset &ia, const InfrastructureManagement::MountingPoint &mp, const InfrastructureManagement::MainStructureElement &mse, const Buildings::RelayState &rs, const InfrastructureManagement::MountingPointAsset &mpa, const QSet<int> &relayIds)
|
||||
: instrumentationAsset(ia)
|
||||
EgcuData::EgcuData(const InfrastructureManagement::InstrumentationAsset &ia, const InfrastructureManagement::MountingPoint &mp, const InfrastructureManagement::MainStructureElement &mse, const Buildings::RelayState &rs, const InfrastructureManagement::MountingPointAsset &mpa, const QSet<int> &relayIds) : instrumentationAsset(ia)
|
||||
, mountingPoint(mp)
|
||||
, mainStructureElement(mse)
|
||||
, relayState(rs)
|
||||
, mountingPointAsset(mpa)
|
||||
{
|
||||
, mountingPointAsset(mpa),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
for (int relayId : relayIds)
|
||||
effectOverrides.insert(relayId, InfrastructureManagement::EffectOverride_def::Automatic);
|
||||
|
||||
|
||||
+2
@@ -150,6 +150,8 @@ signals:
|
||||
void invalidateFilter(const QModelIndex &mi = QModelIndex());
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void initData();
|
||||
void removeUnused(NGLTreeItem *item);
|
||||
bool isMountpointEgcu(const QByteArray &properties);
|
||||
|
||||
+1
-1
@@ -211,7 +211,7 @@ void FaultMessageDialog::onSpecificsEquipmentChanged(const TrainingAreaBaseOC::S
|
||||
|
||||
m_ownEquipmentId = data.equipmentNumber();
|
||||
if (m_ownEquipmentId <= 0)
|
||||
WARNING_LOG() << "EquipmentNumber " << data.equipmentNumber() << " is not present ";
|
||||
WARNING_LOG(m_logger) << "EquipmentNumber " << data.equipmentNumber() << " is not present ";
|
||||
}
|
||||
|
||||
}
|
||||
+2
@@ -36,6 +36,8 @@ public:
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void retranslate() override;
|
||||
bool apply() override;
|
||||
void tableColumnOrganiserSetting() override;
|
||||
|
||||
+2
-2
@@ -20,7 +20,7 @@ ManipulationModel::ManipulationModel(QObject *parent)
|
||||
bool ManipulationModel::initModel(const std::shared_ptr<ParticipantManagement::Interface::Dtc> &ppmDtc,
|
||||
const std::shared_ptr<ProjectDataManagement::Interface::Dtc> &pdmDtc)
|
||||
{
|
||||
DEBUG_LOG() << "----- initModel";
|
||||
DEBUG_LOG(m_logger) << "----- initModel";
|
||||
|
||||
if (!pdmDtc || !ppmDtc)
|
||||
return false;
|
||||
@@ -76,7 +76,7 @@ QVariant ManipulationModel::data(const QModelIndex &index,
|
||||
void ManipulationModel::manipulationDataChanged(const ParticipantManagement::DynamicParticipantData &data,
|
||||
DataModification modType)
|
||||
{
|
||||
DEBUG_LOG() << "manipulationDataChanged: " << data.manipulation().size() << ", " << modType;
|
||||
DEBUG_LOG(m_logger) << "manipulationDataChanged: " << data.manipulation().size() << ", " << modType;
|
||||
|
||||
const bool isManipulated = data.manipulation().size() > 0;
|
||||
|
||||
|
||||
+2
@@ -53,6 +53,8 @@ private slots:
|
||||
void participantChanged(const ParticipantManagement::Participant &data, DataModification modType);
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
ManipulationData buildManipulationData(const ParticipantManagement::DynamicParticipantData &data) const;
|
||||
QString buildCanDeviceString(const std::vector<ParticipantManagement::ManipulationInformation>& manipulations) const;
|
||||
|
||||
|
||||
+2
-2
@@ -132,7 +132,7 @@ bool StructureElementEdit::apply()
|
||||
QByteArray content_neu;
|
||||
|
||||
properties= m_structureElement.properties();
|
||||
DEBUG_LOG() << "structureElementId=" << m_structureElement.id()
|
||||
DEBUG_LOG(m_logger) << "structureElementId=" << m_structureElement.id()
|
||||
<< " properties=" << properties
|
||||
<< " MountingPointType=" << m_structureElement.mountingPointTypeId()
|
||||
<< " structureElementTypeId=" << m_structureElement.structureElementTypeId();
|
||||
@@ -149,7 +149,7 @@ bool StructureElementEdit::apply()
|
||||
return true;
|
||||
|
||||
m_structureElement.properties(content_neu.toStdString());
|
||||
ERROR_LOG() << "properties=" << m_structureElement.properties()
|
||||
ERROR_LOG(m_logger) << "properties=" << m_structureElement.properties()
|
||||
<< " name=" << m_structureElement.name()
|
||||
<< " seId=" << m_structureElement.id()
|
||||
<< " mountingPointId=" << m_structureElement.mountingPointId();
|
||||
|
||||
+1
@@ -43,6 +43,7 @@ public:
|
||||
|
||||
bool apply() override;
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
void retranslate() override;
|
||||
void updateComboBoxes();
|
||||
|
||||
|
||||
Reference in new issue
Block a user