Adds immediate migration results
This commit is contained in:
2395 files changed
+357322
-2524
No files matched your search
+3
-3
@@ -47,7 +47,7 @@ NGL_WRAP_UI(bld_info_gui_SRCS
|
||||
|
||||
NGL_ADD_LIBRARY(WS BldInfoGuiPlugin MODULE ${bld_info_gui_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(BldInfoGuiPlugin
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
BldInfoGuiPluginInterface
|
||||
BuildingViewerCommon
|
||||
NGLLogger
|
||||
@@ -56,8 +56,8 @@ NGL_TARGET_LINK_LIBRARIES(BldInfoGuiPlugin
|
||||
svcBldClient
|
||||
svcAsmClient
|
||||
svcBldCommon
|
||||
Qt5::Widgets
|
||||
Qt5::Network
|
||||
Qt6::Widgets
|
||||
Qt6::Network
|
||||
LtsWidgets
|
||||
LtsSession
|
||||
LtsUtilsSettings
|
||||
|
||||
+7
-6
@@ -4,6 +4,7 @@
|
||||
|
||||
|
||||
#include "bld_info_dialog.h"
|
||||
#include <utility>
|
||||
#include "ui_bld_info_dialog.h"
|
||||
#include "bld_history_dialog.h"
|
||||
#include "egcu_info_dialog.h"
|
||||
@@ -228,10 +229,10 @@ bool BldInfoDialog::init(LtsSession::LtsSession *session)
|
||||
{
|
||||
const QVector<InfrastructureManagement::InstrumentationAsset> &instrumentationAssets = assetsMapBuilding[m_mseId];
|
||||
const QMap<qint32, InfrastructureManagement::MountingPointAsset> &mountingPointAssets = m_ismDtc->mountingPointAssets();
|
||||
for (const auto &instrumentationAsset : qAsConst(instrumentationAssets))
|
||||
for (const auto &instrumentationAsset : std::as_const(instrumentationAssets))
|
||||
{
|
||||
InfrastructureManagement::MountingPointAsset mpa;
|
||||
for (const auto &mpax : qAsConst(mountingPointAssets))
|
||||
for (const auto &mpax : std::as_const(mountingPointAssets))
|
||||
{
|
||||
if (mpax.assetId() == instrumentationAsset.id())
|
||||
{
|
||||
@@ -366,7 +367,7 @@ bool BldInfoDialog::init(LtsSession::LtsSession *session)
|
||||
|
||||
const QMap<qint32, ParticipantManagement::ParticipantPosition> &participantPosition =
|
||||
m_ppmDtc->participantPositions();
|
||||
for (const ParticipantPosition &pp : qAsConst(participantPosition))
|
||||
for (const ParticipantPosition &pp : std::as_const(participantPosition))
|
||||
addParticipantPosition(pp, DataModification::eAdded);
|
||||
updateFloorParticipantTable();
|
||||
#endif
|
||||
@@ -658,7 +659,7 @@ void BldInfoDialog::updateFloorParticipantTable()
|
||||
|
||||
|
||||
QMap<int , QMap<int , int >> floorPartyPeople;
|
||||
for (const int floor : qAsConst(floors))
|
||||
for (const int floor : std::as_const(floors))
|
||||
{
|
||||
QMapIterator<int , QPair<int , int > > it(m_rawParticipantCount);
|
||||
while (it.hasNext())
|
||||
@@ -1056,7 +1057,7 @@ void BldInfoDialog::onMountingPointAssetChanged(const InfrastructureManagement::
|
||||
else if (modType == DataModification::eRemoved)
|
||||
{
|
||||
const QList<QPushButton *> &list = m_ui->gbSegments->findChildren<QPushButton *>();
|
||||
for (QPushButton *pb : qAsConst(list))
|
||||
for (QPushButton *pb : std::as_const(list))
|
||||
{
|
||||
if (pb->property("assetId").toInt() == data.assetId())
|
||||
{
|
||||
@@ -1074,7 +1075,7 @@ void BldInfoDialog::onMountingPointAssetChanged(const InfrastructureManagement::
|
||||
else if (modType == DataModification::eModified)
|
||||
{
|
||||
const QList<QPushButton *> &list = m_ui->gbSegments->findChildren<QPushButton *>();
|
||||
for (QPushButton *pb : qAsConst(list))
|
||||
for (QPushButton *pb : std::as_const(list))
|
||||
{
|
||||
if (pb->property("assetId").toInt() == data.assetId())
|
||||
pb->setText(data.name().empty() ? pb->property("assetName").toString() : QString::fromStdString(data.name()));
|
||||
|
||||
+2
-1
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "egcu_info_dialog.h"
|
||||
#include <utility>
|
||||
#include "ui_egcu_info_dialog.h"
|
||||
#include "relay_info.h"
|
||||
|
||||
@@ -368,7 +369,7 @@ void EgcuInfoDialog::showEgcuInfos(const InfrastructureManagement::StructureElem
|
||||
if (m_relayInfoWidgets.contains(relayId))
|
||||
m_relayInfoWidgets[relayId]->setEffectOverride(static_cast<InfrastructureManagement::EffectOverride::inner_enum>(value));
|
||||
}
|
||||
for (auto relayId : qAsConst(allRelayIds))
|
||||
for (auto relayId : std::as_const(allRelayIds))
|
||||
m_relayInfoWidgets[relayId]->setEffectOverride(InfrastructureManagement::EffectOverride_def::Automatic);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user