Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen
- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung - 44 Export-Header Include-Pfade korrigiert (_export.h) - 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h) - INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros - Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits) - FATAL_LOG Makro hinzugefügt - InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h) - FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h) - AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp) - SymbolAppearance Klasse vollständig definiert mit content() Methode - BuildingComponentFilter Klasse definiert mit Copy-Konstruktor - Ftc Factory: nullptr Return (abstract class) - AesFilter Klasse in aes.hpp hinzugefügt - Dtc Klasse in ppm.hpp mit participantChanged Signal - AesType Enum: alle 15 At* Werte definiert - AesEffectState_def: EsReceived hinzugefügt - DataModification Enum: eAdded/eModified/eRemoved - function_reply_object.h → core_types.h Include-Pfad (72 Dateien) - Enum-Class-Streaming Template-Operator in INGLLogger.h - ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen - ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge - QRegExp → QRegularExpression in tpm_js_parser.cpp - .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert - Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
2785 files changed
+18754
-18316
No files matched your search
+1
-1
@@ -145,7 +145,7 @@ void BaseEquipmentCheck::onMappedEquipTimeout(int participantId, QTimer *timer)
|
||||
|
||||
void BaseEquipmentCheck::onSelectionChanged()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onSelectionChanged";
|
||||
DEBUG_LOG() << "onSelectionChanged";
|
||||
|
||||
bool enable = false;
|
||||
const auto selectedIndexes = view()->selectedRows();
|
||||
|
||||
-2
@@ -81,8 +81,6 @@ protected:
|
||||
QAction *m_requestBiteSelfTest;
|
||||
std::vector<int> m_selectedParticipants;
|
||||
CheckButtonHandler *m_checkButtonHandler;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+5
-6
@@ -52,7 +52,6 @@ BasePlayerModel::BasePlayerModel(QObject *parent)
|
||||
, m_timeoutCheckTimer(new QTimer(this))
|
||||
, m_positionAgeTimer(new QTimer(this))
|
||||
, m_session(nullptr)
|
||||
, m_logger(getLogger("BasePlayerModel"))
|
||||
{
|
||||
m_timeoutCheckTimer->setSingleShot(false);
|
||||
connect(m_timeoutCheckTimer, &QTimer::timeout,
|
||||
@@ -67,7 +66,7 @@ bool BasePlayerModel::initModel(LtsSession::LtsSessionDataDds *session)
|
||||
if (!session)
|
||||
return false;
|
||||
|
||||
DEBUG_LOG(m_logger) << "**** initModel";
|
||||
DEBUG_LOG() << "**** initModel";
|
||||
m_session = session;
|
||||
m_partitionTime = m_session->partitionTime();
|
||||
|
||||
@@ -483,7 +482,7 @@ int BasePlayerModel::findRowForEquipmentNumber(int equipNo) const
|
||||
|
||||
if (data.equipmentNumber == equipNo)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "** findRowForEquipmentNumber: "
|
||||
DEBUG_LOG() << "** findRowForEquipmentNumber: "
|
||||
<< equipNo << "--> " << i;
|
||||
return i;
|
||||
}
|
||||
@@ -494,7 +493,7 @@ int BasePlayerModel::findRowForEquipmentNumber(int equipNo) const
|
||||
void BasePlayerModel::onDynamicParticipantChanged(const ParticipantManagement::DynamicParticipantData &data,
|
||||
DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "**** onDynamicParticipantChanged: " << data;
|
||||
DEBUG_LOG() << "**** onDynamicParticipantChanged: " << data;
|
||||
|
||||
int row = findRowForId(data.participantId());
|
||||
if (row < 0)
|
||||
@@ -688,7 +687,7 @@ void BasePlayerModel::onPositionChanged(const ParticipantManagement::Participant
|
||||
{
|
||||
if (modType == DataModification::eRemoved)
|
||||
return;
|
||||
DEBUG_LOG(m_logger) << "**** onPositionChanged: " << position;
|
||||
DEBUG_LOG() << "**** onPositionChanged: " << position;
|
||||
|
||||
m_positions[position.participantId()] = position;
|
||||
|
||||
@@ -719,7 +718,7 @@ void BasePlayerModel::onBiteChanged(const ParticipantManagement::Bite &bite,
|
||||
{
|
||||
if (modType == DataModification::eRemoved)
|
||||
return;
|
||||
DEBUG_LOG(m_logger) << "**** onBiteChanged: " << bite;
|
||||
DEBUG_LOG() << "**** onBiteChanged: " << bite;
|
||||
|
||||
m_bites[bite.equipmentNumber()] = bite;
|
||||
|
||||
|
||||
-3
@@ -164,9 +164,6 @@ protected:
|
||||
QTimer *m_timeoutCheckTimer;
|
||||
QTimer *m_positionAgeTimer;
|
||||
LtsSession::LtsSessionDataDds *m_session;
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
|
||||
friend class BasePlayerProxyModel;
|
||||
};
|
||||
|
||||
|
||||
+7
-8
@@ -17,13 +17,12 @@ BiteModel::BiteModel(QObject *parent)
|
||||
tr("Low Battery"),
|
||||
tr("Component")},
|
||||
parent)
|
||||
, m_logger(getLogger("BiteModel"))
|
||||
{}
|
||||
|
||||
bool BiteModel::initModel(const std::shared_ptr<ParticipantManagement::Interface::Dtc> &ppmDtc,
|
||||
const std::shared_ptr<ProjectDataManagement::Interface::Dtc> &pdmDtc)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "initModel";
|
||||
DEBUG_LOG() << "initModel";
|
||||
|
||||
m_ppmDtc = ppmDtc;
|
||||
if (!m_ppmDtc)
|
||||
@@ -104,7 +103,7 @@ QString BiteModel::checkBit(const ParticipantManagement::Bite &bite, quint32 bit
|
||||
break;
|
||||
}
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "** name: " << name;
|
||||
DEBUG_LOG() << "** name: " << name;
|
||||
|
||||
QString ret;
|
||||
if (available)
|
||||
@@ -149,7 +148,7 @@ QString BiteModel::checkBatteryBit(int state, qint64 bitValue) const
|
||||
break;
|
||||
}
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "** name: " << name;
|
||||
DEBUG_LOG() << "** name: " << name;
|
||||
|
||||
if ((state & bitValue) == bitValue)
|
||||
return name;
|
||||
@@ -224,7 +223,7 @@ int BiteModel::findRowForEquipmentNumber(int equipNo) const
|
||||
{
|
||||
if (m_vecData.at(i).equipmentNumber() == equipNo)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "findRowForEquipmentNumber: "
|
||||
DEBUG_LOG() << "findRowForEquipmentNumber: "
|
||||
<< equipNo << "-->" << i;
|
||||
return i;
|
||||
}
|
||||
@@ -235,7 +234,7 @@ int BiteModel::findRowForEquipmentNumber(int equipNo) const
|
||||
void BiteModel::biteDataChanged(const ParticipantManagement::Bite &data,
|
||||
DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "biteDataChanged";
|
||||
DEBUG_LOG() << "biteDataChanged";
|
||||
|
||||
const int equipNo = data.equipmentNumber();
|
||||
const int row = findRowForEquipmentNumber(equipNo);
|
||||
@@ -245,7 +244,7 @@ void BiteModel::biteDataChanged(const ParticipantManagement::Bite &data,
|
||||
case DataModification::eAdded:
|
||||
case DataModification::eModified:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << " Modified bite msg";
|
||||
DEBUG_LOG() << " Modified bite msg";
|
||||
|
||||
if (row < 0)
|
||||
{
|
||||
@@ -266,7 +265,7 @@ void BiteModel::biteDataChanged(const ParticipantManagement::Bite &data,
|
||||
}
|
||||
case DataModification::eRemoved:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << " Remove bite msg";
|
||||
DEBUG_LOG() << " Remove bite msg";
|
||||
removeRow(row);
|
||||
break;
|
||||
}
|
||||
|
||||
-3
@@ -68,9 +68,6 @@ private:
|
||||
std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_pdmDtc;
|
||||
QMap<qint32, ProjectDataManagement::CanComponentString> m_ccsMap;
|
||||
QMap<qint32, ProjectDataManagement::BiteComponentText> m_bctMap;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
friend class BiteProxyModel;
|
||||
};
|
||||
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Plugins/ServiceMonitor/Gui/Monitors/smocheckbuttonhandler_export.h>
|
||||
#include <Lts/Plugins/ServiceMonitor/Gui/Monitors/smocheckbuttonhandler_export.h>
|
||||
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm_ftc.h>
|
||||
|
||||
+3
-4
@@ -21,12 +21,11 @@ CtasErrorModel:: CtasErrorModel(QObject *parent)
|
||||
},
|
||||
parent)
|
||||
, m_ppmDtc(nullptr)
|
||||
, m_logger(getLogger("CtasErrorModel"))
|
||||
{}
|
||||
|
||||
bool CtasErrorModel::initModel(const std::shared_ptr<ParticipantManagement::Interface::Dtc> &ppmDtc)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "initModel";
|
||||
DEBUG_LOG() << "initModel";
|
||||
|
||||
if (!ppmDtc)
|
||||
return false;
|
||||
@@ -253,11 +252,11 @@ QString CtasErrorModel::telegramId2Text(int id) const
|
||||
void CtasErrorModel::ctasErrorChanged(const ParticipantManagement::CtaError &data,
|
||||
DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "ctasErrorChanged";
|
||||
DEBUG_LOG() << "ctasErrorChanged";
|
||||
|
||||
if (modType == DataModification::eAdded || modType == DataModification::eModified)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << " Added Fehlermeldung GFD";
|
||||
DEBUG_LOG() << " Added Fehlermeldung GFD";
|
||||
insertRow(data);
|
||||
return;
|
||||
}
|
||||
|
||||
-2
@@ -42,8 +42,6 @@ private:
|
||||
QString telegramId2Text(int id) const;
|
||||
|
||||
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
friend class CtasErrorProxyModel;
|
||||
};
|
||||
|
||||
|
||||
+8
-9
@@ -32,7 +32,6 @@ ServiceMonitorDialog::ServiceMonitorDialog(Monitor monitor,
|
||||
, m_proxyModel(nullptr)
|
||||
, m_ppmDtc(nullptr)
|
||||
, m_pdmDtc(nullptr)
|
||||
, m_logger(getLogger("ServiceMonitorDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_buttonBox->connectButton(LtsWidgets::DialogButton::Print, this, &ServiceMonitorDialog::onPrint);
|
||||
@@ -260,11 +259,11 @@ void ServiceMonitorDialog::onTableViewClicked(const QModelIndex &index)
|
||||
delete dlg;
|
||||
}
|
||||
}
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START, index=" << index.row() << " - " << index.column();
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START, index=" << index.row() << " - " << index.column();
|
||||
if (!m_ui->ltsDataView->sourceModel())
|
||||
return;
|
||||
onParticipantClicked(participantId(index));
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END, index=" << index.row() << " - " << index.column();
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END, index=" << index.row() << " - " << index.column();
|
||||
}
|
||||
|
||||
void ServiceMonitorDialog::onEditItem()
|
||||
@@ -301,7 +300,7 @@ void ServiceMonitorDialog::onAllAuto()
|
||||
|
||||
void ServiceMonitorDialog::onTableViewSelectionChanged(const QItemSelection &selected)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
if (m_monitor == Monitor::Egcu)
|
||||
{
|
||||
|
||||
@@ -327,12 +326,12 @@ void ServiceMonitorDialog::onTableViewSelectionChanged(const QItemSelection &sel
|
||||
{
|
||||
onParticipantClicked(participantId(mil.first()));
|
||||
}
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
void ServiceMonitorDialog::onParticipantClicked(int participantId)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START, participantId=" << participantId;
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START, participantId=" << participantId;
|
||||
if (!m_session)
|
||||
return;
|
||||
|
||||
@@ -345,9 +344,9 @@ void ServiceMonitorDialog::onParticipantClicked(int participantId)
|
||||
sitMapGuiIfc->removeObjectIndicator();
|
||||
else
|
||||
if (!sitMapGuiIfc->objectIndicatorToParticipant(participantId))
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " objectIndicatorToParticipant failed for participantId = " << participantId;
|
||||
ERROR_LOG() << Q_FUNC_INFO << " objectIndicatorToParticipant failed for participantId = " << participantId;
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END, participantId=" << participantId;
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END, participantId=" << participantId;
|
||||
}
|
||||
|
||||
void ServiceMonitorDialog::leaveEvent(QEvent *e)
|
||||
@@ -368,7 +367,7 @@ void ServiceMonitorDialog::onPrint()
|
||||
|
||||
int ServiceMonitorDialog::participantId(const QModelIndex &index) const
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START, index=" << index.row() << " - " << index.column();
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START, index=" << index.row() << " - " << index.column();
|
||||
if (!m_ui->ltsDataView->sourceModel())
|
||||
return -1;
|
||||
|
||||
|
||||
@@ -83,7 +83,6 @@ private:
|
||||
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
|
||||
std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_pdmDtc;
|
||||
std::shared_ptr<InfrastructureManagement::Interface::Dtc> m_ismDtc;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+1
-1
@@ -252,7 +252,7 @@ bool EgcuEdit::apply()
|
||||
}
|
||||
|
||||
properties= structureElement.properties();
|
||||
DEBUG_LOG(m_logger) << "structureElementId=" << m_egcuData.mountingPoint.id()
|
||||
DEBUG_LOG() << "structureElementId=" << m_egcuData.mountingPoint.id()
|
||||
<< " properties=" << properties;
|
||||
|
||||
QJsonArray arrRelays;
|
||||
|
||||
@@ -62,8 +62,6 @@ private:
|
||||
std::shared_ptr<InfrastructureManagement::Interface::Ftc> m_ismFtc;
|
||||
LtsUtils::RequestHelper *m_requestHelper;
|
||||
QMap<int, QComboBox*> m_relayCbs;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
Ui::EgcuEdit *m_ui;
|
||||
bool saveEgcuToRooms();
|
||||
};
|
||||
|
||||
+16
-17
@@ -77,7 +77,6 @@ EgcuModel::EgcuModel(QObject *parent)
|
||||
tr("Hostname"), tr("Properties"), tr("Rooms"), tr("Overrides"), tr("Status")})
|
||||
, m_visRoot(new NGLTreeItem(tr("Mounting Points")))
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("EgcuModel"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -99,7 +98,7 @@ QVariant EgcuModel::data(const QModelIndex &index, int role) const
|
||||
switch (index.column())
|
||||
{
|
||||
case Id:
|
||||
DEBUG_LOG(m_logger) << "EGCU DATA= "
|
||||
DEBUG_LOG() << "EGCU DATA= "
|
||||
<< " instrumentationAsset.id=" << instrumentationAsset.id()
|
||||
<< " hostname=" << instrumentationAsset.hostname()
|
||||
<< " name=" << instrumentationAsset.name()
|
||||
@@ -235,7 +234,7 @@ QString EgcuModel::getOverridesString(const EgcuData &data) const
|
||||
|
||||
QString EgcuModel::getRelaisStates(const EgcuData &data) const
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "getRelaisStates"
|
||||
DEBUG_LOG() << "getRelaisStates"
|
||||
<< " offlineTime=" << data.relayState.offlineTime()
|
||||
<< " stateTime=" << data.relayState.stateTime()
|
||||
<< " mountingPoint.id=" << data.mountingPoint.id()
|
||||
@@ -254,14 +253,14 @@ QString EgcuModel::getRelaisStates(const EgcuData &data) const
|
||||
QStringList sl;
|
||||
|
||||
Buildings::RelayState relayState = m_bldDtc->relayState(data.mountingPointAsset.assetId());
|
||||
DEBUG_LOG(m_logger) << "relayState id=" << relayState.id()
|
||||
DEBUG_LOG() << "relayState id=" << relayState.id()
|
||||
<< " offlineTime=" << relayState.offlineTime()
|
||||
<< " stateTime=" << relayState.stateTime()
|
||||
<< " relayStates().size=" << relayState.relayStates().size();
|
||||
|
||||
if (relayState.offlineTime() > relayState.stateTime())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << QString(tr("Connection Error"));
|
||||
DEBUG_LOG() << QString(tr("Connection Error"));
|
||||
sl << QString(tr("Connection Error"));
|
||||
sl << QStringLiteral(" - ");
|
||||
}
|
||||
@@ -271,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(m_logger) << "relayInfo id=" << relayInfo.id()
|
||||
DEBUG_LOG() << "relayInfo id=" << relayInfo.id()
|
||||
<< " name=" << relayInfo.name()
|
||||
<< " property=" << relayInfo.property()
|
||||
<< " state=" << state;
|
||||
@@ -360,7 +359,7 @@ bool EgcuModel::initModel(LtsSession::LtsSession *session)
|
||||
|
||||
initData();
|
||||
|
||||
DEBUG_LOG(m_logger) << "initModel successfull";
|
||||
DEBUG_LOG() << "initModel successfull";
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -371,7 +370,7 @@ QModelIndex EgcuModel::getIndexOfVisableRootItem() const
|
||||
|
||||
bool EgcuModel::mseHasMountedAsset(const InfrastructureManagement::MainStructureElement &mse, InfrastructureManagement::MountingPointType mpType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "mseHasMountedBsm mse.id=" << mse.id()
|
||||
DEBUG_LOG() << "mseHasMountedBsm mse.id=" << mse.id()
|
||||
<< " name=" << mse.name();
|
||||
for (const InfrastructureManagement::StructureElement &element : std::as_const(mse.elements()))
|
||||
{
|
||||
@@ -379,7 +378,7 @@ bool EgcuModel::mseHasMountedAsset(const InfrastructureManagement::MainStructure
|
||||
if (element.mountingPointTypeId() != mpType)
|
||||
continue;
|
||||
|
||||
DEBUG_LOG(m_logger) << "Mountpoint BSM:" << element.id()
|
||||
DEBUG_LOG() << "Mountpoint BSM:" << element.id()
|
||||
<< " name=" << element.name();
|
||||
if (isMounted(element.id()))
|
||||
return true;
|
||||
@@ -389,10 +388,10 @@ bool EgcuModel::mseHasMountedAsset(const InfrastructureManagement::MainStructure
|
||||
|
||||
bool EgcuModel::isMounted(int mountingPointId)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "isMounted id=" << mountingPointId;
|
||||
DEBUG_LOG() << "isMounted id=" << mountingPointId;
|
||||
for (const InfrastructureManagement::MountingPointAsset &asset : std::as_const(m_mountingPointAssets))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "assetId=" << asset.structureElementId()
|
||||
DEBUG_LOG() << "assetId=" << asset.structureElementId()
|
||||
<< " mountingPointId=" << mountingPointId;
|
||||
if (asset.structureElementId() == mountingPointId)
|
||||
return true;
|
||||
@@ -425,7 +424,7 @@ void EgcuModel::initData()
|
||||
|
||||
if ( !m_dtc->isElementAssignedToExercise( mse, m_session->exerciseId()))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "EgcuModel::initData mseId=" << mse.id() << " not in Exercise";
|
||||
DEBUG_LOG() << "EgcuModel::initData mseId=" << mse.id() << " not in Exercise";
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -457,9 +456,9 @@ void EgcuModel::initData()
|
||||
parentIndex = treeIndices.value(path.at(path.size() - 2), indexFromItem(m_rootItem));
|
||||
if (!parentIndex.isValid())
|
||||
{
|
||||
INFO_LOG(m_logger) << "Did not find parent for structure element with id " << currentElement.id() << " mseid: " << mse.id();
|
||||
INFO_LOG() << "Did not find parent for structure element with id " << currentElement.id() << " mseid: " << mse.id();
|
||||
for (const InfrastructureManagement::StructureElement &se : mse.elements())
|
||||
INFO_LOG(m_logger) << " se: " << se.id() << ", " << se.name();
|
||||
INFO_LOG() << " se: " << se.id() << ", " << se.name();
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -497,7 +496,7 @@ NGLTreeItem* EgcuModel::createItemFromMountingPoint(const InfrastructureManageme
|
||||
{
|
||||
|
||||
|
||||
DEBUG_LOG(m_logger) << "mountingPoint Id=" << mountingPoint.buildingId()
|
||||
DEBUG_LOG() << "mountingPoint Id=" << mountingPoint.buildingId()
|
||||
<< " properties=" << mountingPoint.properties()
|
||||
<< " associatedAssetId=" << mountingPoint.associatedAssetId()
|
||||
<< " isUsed=" << mountingPoint.data().isUsed()
|
||||
@@ -541,7 +540,7 @@ NGLTreeItem* EgcuModel::createItemFromMountingPoint(const InfrastructureManageme
|
||||
|
||||
NGLTreeItem* EgcuModel::createItemFromStructureElement(const InfrastructureManagement::StructureElement ¤tElement)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "createItemFromStructureElement" << currentElement.displayName();
|
||||
DEBUG_LOG() << "createItemFromStructureElement" << currentElement.displayName();
|
||||
return new NGLTreeItem(QVariant::fromValue(currentElement));
|
||||
}
|
||||
|
||||
@@ -1192,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(m_logger) << "structureElementIds.size=" << structureElementIds.size()
|
||||
ERROR_LOG() << "structureElementIds.size=" << structureElementIds.size()
|
||||
<< " id[0]=" << structureElementIds[0];
|
||||
findStructureElementChildrenByIds(m_rootItem, structureElementIds, map);
|
||||
return map;
|
||||
|
||||
-2
@@ -175,8 +175,6 @@ private:
|
||||
|
||||
LtsSession::LtsSession *m_session = nullptr;
|
||||
LtsUtils::RequestHelper *m_requestHelper = nullptr;
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
NGLTreeItem* findItemByMountingPointId(int mpId, NGLTreeItem *parent) const;
|
||||
NGLTreeItem* findItemByAssetId(int assetId, NGLTreeItem *parent) const;
|
||||
NGLTreeItem* findItemByMseId(int mseId, NGLTreeItem *parent) const;
|
||||
|
||||
+1
-1
@@ -211,7 +211,7 @@ void FaultMessageDialog::onSpecificsEquipmentChanged(const TrainingAreaBaseOC::S
|
||||
|
||||
m_ownEquipmentId = data.equipmentNumber();
|
||||
if (m_ownEquipmentId <= 0)
|
||||
WARNING_LOG(m_logger) << "EquipmentNumber " << data.equipmentNumber() << " is not present ";
|
||||
WARNING_LOG() << "EquipmentNumber " << data.equipmentNumber() << " is not present ";
|
||||
}
|
||||
|
||||
}
|
||||
-1
@@ -65,7 +65,6 @@ private:
|
||||
std::shared_ptr<ParticipantManagement::ForeignGuiComboboxInterface> m_ppmGuiCbxIfc{nullptr};
|
||||
|
||||
Ui::FaultMessageDialog *m_ui{nullptr};
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+2
-3
@@ -15,13 +15,12 @@ ManipulationModel::ManipulationModel(QObject *parent)
|
||||
tr("Time (PU)"),
|
||||
tr("Equipment Identification")},
|
||||
parent)
|
||||
, m_logger(getLogger("ManipulationModel"))
|
||||
{}
|
||||
|
||||
bool ManipulationModel::initModel(const std::shared_ptr<ParticipantManagement::Interface::Dtc> &ppmDtc,
|
||||
const std::shared_ptr<ProjectDataManagement::Interface::Dtc> &pdmDtc)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "----- initModel";
|
||||
DEBUG_LOG() << "----- initModel";
|
||||
|
||||
if (!pdmDtc || !ppmDtc)
|
||||
return false;
|
||||
@@ -77,7 +76,7 @@ QVariant ManipulationModel::data(const QModelIndex &index,
|
||||
void ManipulationModel::manipulationDataChanged(const ParticipantManagement::DynamicParticipantData &data,
|
||||
DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "manipulationDataChanged: " << data.manipulation().size() << ", " << modType;
|
||||
DEBUG_LOG() << "manipulationDataChanged: " << data.manipulation().size() << ", " << modType;
|
||||
|
||||
const bool isManipulated = data.manipulation().size() > 0;
|
||||
|
||||
|
||||
-2
@@ -60,8 +60,6 @@ private:
|
||||
std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_pdmDtc;
|
||||
QHash<int, ProjectDataManagement::CanComponentString> m_ccsMap;
|
||||
QSet<int> m_participantsWithManipulation;
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
friend class ManipulationProxyModel;
|
||||
};
|
||||
|
||||
|
||||
+2
-2
@@ -132,7 +132,7 @@ bool StructureElementEdit::apply()
|
||||
QByteArray content_neu;
|
||||
|
||||
properties= m_structureElement.properties();
|
||||
DEBUG_LOG(m_logger) << "structureElementId=" << m_structureElement.id()
|
||||
DEBUG_LOG() << "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(m_logger) << "properties=" << m_structureElement.properties()
|
||||
ERROR_LOG() << "properties=" << m_structureElement.properties()
|
||||
<< " name=" << m_structureElement.name()
|
||||
<< " seId=" << m_structureElement.id()
|
||||
<< " mountingPointId=" << m_structureElement.mountingPointId();
|
||||
|
||||
-2
@@ -53,8 +53,6 @@ private:
|
||||
std::shared_ptr<InfrastructureManagement::Interface::Dtc> m_ismDtc;
|
||||
std::shared_ptr<InfrastructureManagement::Interface::Ftc> m_ismFtc;
|
||||
LtsUtils::RequestHelper *m_requestHelper;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
Ui::StructureElementEdit *m_ui;
|
||||
QString structureElementName(int seId);
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user