lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds immediate migration results in progress

Browse Source
This commit is contained in:
torsten committed 2026-08-19 11:18:24 +02:00
1 parent 8453e104c5
commit 3bb6e89496
2102 files changed
+17482 -15071
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_charge_effect_item_info.cpp
+16 -16
View File
@@ -51,13 +51,13 @@ bool AesChargeEffectItemInfo::init(LtsSession::LtsSession *session)
if (!session->getDtc<ProjectDataManagement::DataInterface>(m_pdmDtc))
{
ERROR_LOG() << " failed to get pdmDtc";
ERROR_LOG(m_logger) << " failed to get pdmDtc";
return false;
}
if (!session->getDtc<AreaEffectSimulation::DataInterface>(m_aesDtc))
{
ERROR_LOG() << " failed to get aesDtc";
ERROR_LOG(m_logger) << " failed to get aesDtc";
return false;
}
if (!m_aesDtc->isAesItemViewEnabled())
@@ -103,12 +103,12 @@ void AesChargeEffectItemInfo::retranslate()
void AesChargeEffectItemInfo::onFindOnMap() const
{
DEBUG_LOG() << "onFindOnMap() aesId: "<<m_ChargeEffectId;
DEBUG_LOG(m_logger) << "onFindOnMap() aesId: "<<m_ChargeEffectId;
std::shared_ptr<SituationMap::ForeignGuiInterface> ifc;
if (m_session->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(ifc))
ifc->centerMapToChargeEffectObject(m_ChargeEffectId);
else
WARNING_LOG() << Q_FUNC_INFO << "getForeignGuiInterface<SituationMap::ForeignGuiInterface> failed!";
WARNING_LOG(m_logger) << Q_FUNC_INFO << "getForeignGuiInterface<SituationMap::ForeignGuiInterface> failed!";
}
template <typename InterfaceType>
@@ -125,13 +125,13 @@ bool AesChargeEffectItemInfo::tryShowStandardEditDialog(const AesItemView& aiv)
return true;
}
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface failed for specific AES interface!";
WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface failed for specific AES interface!";
return false;
}
void AesChargeEffectItemInfo::onShowDetails()
{
DEBUG_LOG() << Q_FUNC_INFO;
DEBUG_LOG(m_logger) << Q_FUNC_INFO;
const ChargeEffect item = m_aesDtc->chargeEffect(m_ChargeEffectId);
@@ -139,7 +139,7 @@ void AesChargeEffectItemInfo::onShowDetails()
{
AesItemView aiv;
m_aesDtc->aesItemViewFromEntityId(item.originatorId(), AreaEffectSimulation::AesType::AtUnknown, aiv);
DEBUG_LOG() << "aiv.id():" << aiv.id() << ", aesType: " << aiv.aesTypeId();
DEBUG_LOG(m_logger) << "aiv.id():" << aiv.id() << ", aesType: " << aiv.aesTypeId();
auto registerDialog = [this](AreaEffectSimulation::BaseEdit* dialog) {
@@ -200,7 +200,7 @@ void AesChargeEffectItemInfo::onShowDetails()
registerDialog(ifc->showEditWindow(aiv.aesItemId(), true, this));
}
else
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesBCContamination::ForeignGuiInterface> failed!";
WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesBCContamination::ForeignGuiInterface> failed!";
break;
}
case AreaEffectSimulation::AesType::AtBoobyTrap:
@@ -210,7 +210,7 @@ void AesChargeEffectItemInfo::onShowDetails()
if (m_session->getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface>(ifc))
registerDialog(ifc->showBoobyTrapEditWindow(aiv.aesItemId(), this));
else
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
break;
}
case AreaEffectSimulation::AesType::AtOffRouteMine:
@@ -220,7 +220,7 @@ void AesChargeEffectItemInfo::onShowDetails()
if (m_session->getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface>(ifc))
registerDialog(ifc->showOffRouteMineEditWindow(aiv.aesItemId(), this));
else
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
break;
}
case AreaEffectSimulation::AesType::AtExplosionSingle:
@@ -244,7 +244,7 @@ void AesChargeEffectItemInfo::onShowDetails()
}
}
else
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
break;
}
@@ -260,7 +260,7 @@ void AesChargeEffectItemInfo::onShowDetails()
registerDialog(ifc->showEditWindow(aiv.aesItemId(), ai.effectSourceId(), this));
}
else
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
break;
}
@@ -283,10 +283,10 @@ void AesChargeEffectItemInfo::onShowDetails()
break;
case AreaEffectSimulation::AesType::AtUnknown:
Q_ASSERT(false);
WARNING_LOG() << "Unknown AesType found for aesEntityId: " << aiv.aesTypeId();
WARNING_LOG(m_logger) << "Unknown AesType found for aesEntityId: " << aiv.aesTypeId();
break;
default:
DEBUG_LOG() << "Couldn't find AesItem to ChargeEffect (any more). Hiding the button";
DEBUG_LOG(m_logger) << "Couldn't find AesItem to ChargeEffect (any more). Hiding the button";
m_ui->pbDetails->hide();
break;
}
@@ -302,13 +302,13 @@ void AesChargeEffectItemInfo::onShowDetails()
addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
}
else
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface ChargeEffect failed!";
WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface ChargeEffect failed!";
}
}
void AesChargeEffectItemInfo::onChargeEffectChanged(const ChargeEffect &data, DataModification modType)
{
DEBUG_LOG() << " [onChargeEffectChanged] id: " << data.id();
DEBUG_LOG(m_logger) << " [onChargeEffectChanged] id: " << data.id();
if (data.id() == m_ChargeEffectId && modType != DataModification::eRemoved)
handleChargeEffect(data);
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_danger_area_aes_item_info.cpp
+3 -3
View File
@@ -99,12 +99,12 @@ bool DangerAreaAesItemInfo::init(LtsSession::LtsSession *session)
{
if (m_session && session)
{
ERROR_LOG() << "double init()!";
ERROR_LOG(m_logger) << "double init()!";
return false;
}
if (!m_session && !session)
{
ERROR_LOG() << "No Session available!";
ERROR_LOG(m_logger) << "No Session available!";
return false;
}
if (!m_session)
@@ -129,7 +129,7 @@ void DangerAreaAesItemInfo::insertAesItem(int aesItemId)
}
delete item;
WARNING_LOG() << "AesItem with id " << aesItemId << " is not of any known type!";
WARNING_LOG(m_logger) << "AesItem with id " << aesItemId << " is not of any known type!";
}
void DangerAreaAesItemInfo::setText()
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_info_dialog.cpp
+83 -83
View File
@@ -47,7 +47,7 @@ AesInfoDialog::AesInfoDialog(int aesEntityId, AesType aesType, QWidget *parent)
, m_ui(new Ui::AesInfoDialog)
, m_requestHelper(new LtsUtils::RequestHelper(this))
{
DEBUG_LOG() << "ctor AesInfoDialog() ";
DEBUG_LOG(m_logger) << "ctor AesInfoDialog() ";
m_ui->setupUi(this);
m_ui->lblAesId->setText(QString::number(aesEntityId));
@@ -80,7 +80,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
if (aesItemView.aesItemId() != m_aesEntityId)
return false;
DEBUG_LOG() << "AesItemView found for aesEntityId: " << m_aesEntityId
DEBUG_LOG(m_logger) << "AesItemView found for aesEntityId: " << m_aesEntityId
<< " AesItemView.aesTypeId(): " << aesItemView.aesTypeId();
if (aesItemView.aesTypeId() != m_aesType)
@@ -94,7 +94,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
{
handleNContamination(aesItemView);
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::nContaminationChanged, this, &AesInfoDialog::onNContaminationChanged);
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::NContaminationChanged for aesEntityId: " << m_aesEntityId;
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::NContaminationChanged for aesEntityId: " << m_aesEntityId;
setOnlineHelpFilename(QStringLiteral("Info_Dialog-N-Contamination"));
break;
}
@@ -102,7 +102,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
{
handleBCContamination(aesItemView);
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::bCContaminationChanged, this, &AesInfoDialog::onBCContaminationChanged);
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::bCContaminationChanged for aesEntityId: " << m_aesEntityId;
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::bCContaminationChanged for aesEntityId: " << m_aesEntityId;
setOnlineHelpFilename(QStringLiteral("Info_Dialog-C-Contamination"));
break;
}
@@ -111,7 +111,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
{
handleBoobyTrap(aesItemView);
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::boobyTrapChanged, this, &AesInfoDialog::onBoobyTrapChanged);
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::boobyTrapChanged for aesEntityId: " << m_aesEntityId;
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::boobyTrapChanged for aesEntityId: " << m_aesEntityId;
setOnlineHelpFilename(QStringLiteral("Info_Dialog-BoobyTrap"));
break;
}
@@ -120,7 +120,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
{
handleOffRouteMine(aesItemView);
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::offRouteMineChanged, this, &AesInfoDialog::onOffRouteMineChanged);
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::offRouteMineChanged for aesEntityId: " << m_aesEntityId;
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::offRouteMineChanged for aesEntityId: " << m_aesEntityId;
setOnlineHelpFilename(QStringLiteral("Info_Dialog-OffRouteMine"));
break;
}
@@ -128,7 +128,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
{
handleExplosionArea(aesItemView);
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::explosionAreaChanged, this, &AesInfoDialog::onExplosionAreaChanged);
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::explosionAreaChanged for aesEntityId: " << m_aesEntityId;
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::explosionAreaChanged for aesEntityId: " << m_aesEntityId;
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Area_Artillery"));
break;
}
@@ -136,7 +136,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
{
handleExplosionSingle(aesItemView);
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::explosionSingleChanged, this, &AesInfoDialog::onExplosionSingleChanged);
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::explosionSingleChanged for aesEntityId: " << m_aesEntityId;
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::explosionSingleChanged for aesEntityId: " << m_aesEntityId;
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Single_Artillery"));
break;
}
@@ -144,7 +144,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
{
handleMineArea(aesItemView);
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::mineAreaChanged, this, &AesInfoDialog::onMineAreaChanged);
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::mineAreaChanged for aesEntityId: " << m_aesEntityId;
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::mineAreaChanged for aesEntityId: " << m_aesEntityId;
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Mine_Area"));
break;
}
@@ -152,7 +152,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
{
handleMineCorridor(aesItemView);
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::mineCorridorChanged, this, &AesInfoDialog::onMineCorridorChanged);
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::mineCorridorChanged for aesEntityId: " << m_aesEntityId;
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::mineCorridorChanged for aesEntityId: " << m_aesEntityId;
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Mine_Corridor"));
break;
}
@@ -160,7 +160,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
{
handleGasPipe(aesItemView);
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::gasPipeChanged, this, &AesInfoDialog::onGasPipeChanged);
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::gasPipeChanged for aesEntityId: " << m_aesEntityId;
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::gasPipeChanged for aesEntityId: " << m_aesEntityId;
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Gas_Pipeline"));
break;
}
@@ -168,7 +168,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
{
handleDangerArea(aesItemView);
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::dangerAreaChanged, this, &AesInfoDialog::onDangerAreaChanged);
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::dangerAreaChanged for aesEntityId: " << m_aesEntityId;
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::dangerAreaChanged for aesEntityId: " << m_aesEntityId;
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Danger_Area"));
break;
}
@@ -176,7 +176,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
{
handleBorderline(aesItemView);
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::borderlineChanged, this, &AesInfoDialog::onBorderlineChanged);
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::borderlineChanged for aesEntityId: " << m_aesEntityId;
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::borderlineChanged for aesEntityId: " << m_aesEntityId;
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Borderline"));
@@ -196,7 +196,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
{
handleFunctionalArea(aesItemView);
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::functionalAreaChanged, this, &AesInfoDialog::onFunctionalAreaChanged);
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::functionalAreaChanged for aesEntityId: " << m_aesEntityId;
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::functionalAreaChanged for aesEntityId: " << m_aesEntityId;
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Functional_Area"));
break;
}
@@ -204,7 +204,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
{
handleAirSupportImpact(aesItemView);
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::airSupportImpactChanged, this, &AesInfoDialog::onAirSupportImpactChanged);
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::airSupportImpactChanged for aesEntityId: " << m_aesEntityId;
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::airSupportImpactChanged for aesEntityId: " << m_aesEntityId;
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Aerial_Ordnance"));
break;
}
@@ -212,7 +212,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
{
handleExplosionCluster(aesItemView);
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::explosionClusterChanged, this, &AesInfoDialog::onExplosionClusterChanged);
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::ExplosionCluster for aesEntityId: "<<m_aesEntityId;
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::ExplosionCluster for aesEntityId: "<<m_aesEntityId;
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Explosion_Cluster"));
break;
}
@@ -220,7 +220,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
{
handleEffectCluster(aesItemView);
connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::effectClusterChanged, this, &AesInfoDialog::onEffectClusterChanged);
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::EffectCluster for aesEntityId: " << m_aesEntityId;
DEBUG_LOG(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::EffectCluster for aesEntityId: " << m_aesEntityId;
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Explosion_Cluster"));
break;
}
@@ -237,7 +237,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
break;
case AreaEffectSimulation::AesType::AtUnknown:
WARNING_LOG() << "Unknown AesType found for aesEntityId " << m_aesEntityId << ": " << aesItemView.aesTypeId();
WARNING_LOG(m_logger) << "Unknown AesType found for aesEntityId " << m_aesEntityId << ": " << aesItemView.aesTypeId();
Q_ASSERT(false);
break;
}
@@ -308,7 +308,7 @@ bool AesInfoDialog::init(LtsSession::LtsSession *session,
void AesInfoDialog::handleNContamination(const AesItemView &aesItemView)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
handleNContamination(m_dtc->nContamination(m_aesEntityId));
@@ -317,7 +317,7 @@ void AesInfoDialog::handleNContamination(const AesItemView &aesItemView)
void AesInfoDialog::handleNContamination(const AreaEffectSimulation::NContamination &data)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::NContamination)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::NContamination)"
<< " data.id(): " << data.id();
handleAesItem(data, AesType::AtNContamination);
@@ -331,7 +331,7 @@ void AesInfoDialog::handleNContamination(const AreaEffectSimulation::NContaminat
void AesInfoDialog::handleBCContamination(const AesItemView &aesItemView)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
handleBCContamination(m_dtc->bCContamination(m_aesEntityId));
@@ -340,7 +340,7 @@ void AesInfoDialog::handleBCContamination(const AesItemView &aesItemView)
void AesInfoDialog::handleBCContamination(const AreaEffectSimulation::BCContamination &data)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::BCContamination)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::BCContamination)"
<< " data.id(): " << data.id();
handleAesItem(data, AesType::AtBCContamination);
@@ -356,7 +356,7 @@ void AesInfoDialog::handleBCContamination(const AreaEffectSimulation::BCContamin
void AesInfoDialog::handleBoobyTrap(const AesItemView &aesItemView)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
handleBoobyTrap(m_dtc->boobyTrap(m_aesEntityId));
@@ -365,7 +365,7 @@ void AesInfoDialog::handleBoobyTrap(const AesItemView &aesItemView)
void AesInfoDialog::handleBoobyTrap(const AreaEffectSimulation::BoobyTrap &data)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::BoobyTrap)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::BoobyTrap)"
<< " data.id(): " << data.id();
handleAesItem(data, AesType_def::AtBoobyTrap);
@@ -386,7 +386,7 @@ void AesInfoDialog::handleBoobyTrap(const AreaEffectSimulation::BoobyTrap &data)
void AesInfoDialog::handleOffRouteMine(const AesItemView &aesItemView)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
handleOffRouteMine(m_dtc->offRouteMine(m_aesEntityId));
@@ -395,7 +395,7 @@ void AesInfoDialog::handleOffRouteMine(const AesItemView &aesItemView)
void AesInfoDialog::handleOffRouteMine(const AreaEffectSimulation::OffRouteMine &data)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::OffRouteMine)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::OffRouteMine)"
<< " data.id(): " << data.id();
handleAesItem(data, AesType_def::AtOffRouteMine);
@@ -416,7 +416,7 @@ void AesInfoDialog::handleOffRouteMine(const AreaEffectSimulation::OffRouteMine
void AesInfoDialog::handleExplosionArea(const AesItemView &aesItemView)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
handleExplosionArea(m_dtc->explosionArea(m_aesEntityId));
@@ -425,7 +425,7 @@ void AesInfoDialog::handleExplosionArea(const AesItemView &aesItemView)
void AesInfoDialog::handleExplosionArea(const AreaEffectSimulation::ExplosionArea &data)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::ExplosionArea)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::ExplosionArea)"
<< " data.id(): " << data.id();
handleAesItem(data, AesType::AtExplosionArea);
@@ -448,7 +448,7 @@ void AesInfoDialog::handleExplosionArea(const AreaEffectSimulation::ExplosionAre
void AesInfoDialog::handleExplosionSingle(const AesItemView &aesItemView)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
handleExplosionSingle(m_dtc->explosionSingle(m_aesEntityId));
}
@@ -456,7 +456,7 @@ void AesInfoDialog::handleExplosionSingle(const AesItemView &aesItemView)
void AesInfoDialog::handleExplosionSingle(const AreaEffectSimulation::ExplosionSingle &data)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::ExplosionSingle)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::ExplosionSingle)"
<< " data.id(): " << data.id();
handleAesItem(data, AesType::AtExplosionSingle);
@@ -472,7 +472,7 @@ void AesInfoDialog::handleExplosionSingle(const AreaEffectSimulation::ExplosionS
void AesInfoDialog::handleMineArea(const AesItemView &aesItemView)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
handleMineArea(m_dtc->mineArea(m_aesEntityId));
}
@@ -480,7 +480,7 @@ void AesInfoDialog::handleMineArea(const AesItemView &aesItemView)
void AesInfoDialog::handleMineArea(const AreaEffectSimulation::MineArea &data)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::MineArea)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::MineArea)"
<< " data.id(): " << data.id();
handleAesItem(data, AesType::AtMineArea);
@@ -504,7 +504,7 @@ void AesInfoDialog::handleMineArea(const AreaEffectSimulation::MineArea &data)
void AesInfoDialog::handleMineCorridor(const AesItemView &aesItemView)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
handleMineCorridor(m_dtc->mineCorridor(m_aesEntityId));
}
@@ -512,7 +512,7 @@ void AesInfoDialog::handleMineCorridor(const AesItemView &aesItemView)
void AesInfoDialog::handleMineCorridor(const AreaEffectSimulation::MineCorridor &data)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::MineArea)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::MineArea)"
<< " data.id(): " << data.id();
handleAesItem(data, AesType::AtMineCorridor);
@@ -530,7 +530,7 @@ void AesInfoDialog::handleMineCorridor(const AreaEffectSimulation::MineCorridor
void AesInfoDialog::handleGasPipe(const AesItemView &aesItemView)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
<< " handleGasPipe: aesItemView.aesItemId(): " << aesItemView.aesItemId();
handleGasPipe(m_dtc->gasPipe(m_aesEntityId));
}
@@ -538,7 +538,7 @@ void AesInfoDialog::handleGasPipe(const AesItemView &aesItemView)
void AesInfoDialog::handleGasPipe(const AreaEffectSimulation::GasPipe &data)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::GasPipe)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::GasPipe)"
<< " data.id(): " << data.id();
handleAesItem(data, AesType::AtGasPipe);
@@ -555,7 +555,7 @@ void AesInfoDialog::handleGasPipe(const AreaEffectSimulation::GasPipe &data)
void AesInfoDialog::handleDangerArea(const AesItemView &aesItemView)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
handleDangerArea(m_dtc->dangerArea(m_aesEntityId));
}
@@ -563,7 +563,7 @@ void AesInfoDialog::handleDangerArea(const AesItemView &aesItemView)
void AesInfoDialog::handleDangerArea(const AreaEffectSimulation::DangerArea &data)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::DangerArea)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::DangerArea)"
<< " data.id(): " << data.id();
handleAesItem(data, AesType::AtDangerArea);
@@ -586,7 +586,7 @@ void AesInfoDialog::handleDangerArea(const AreaEffectSimulation::DangerArea &dat
void AesInfoDialog::handleBorderline(const AesItemView &aesItemView)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
handleBorderline(m_dtc->borderline(m_aesEntityId));
}
@@ -594,7 +594,7 @@ void AesInfoDialog::handleBorderline(const AesItemView &aesItemView)
void AesInfoDialog::handleBorderline(const AreaEffectSimulation::Borderline &data)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::Borderline)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::Borderline)"
<< " data.id(): " << data.id();
handleAesItem(data, AesType::AtBorderline);
@@ -614,7 +614,7 @@ void AesInfoDialog::handleBorderline(const AreaEffectSimulation::Borderline &dat
void AesInfoDialog::handleFunctionalArea(const AesItemView &aesItemView)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
handleFunctionalArea(m_dtc->functionalArea(m_aesEntityId));
}
@@ -623,7 +623,7 @@ void AesInfoDialog::handleFunctionalArea(const AesItemView &aesItemView)
void AesInfoDialog::handleFunctionalArea(const FunctionalArea &data)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::FunctionalArea)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::FunctionalArea)"
<< " data.id(): " << data.id();
handleAesItem(data, AesType::AtFunctionalArea);
@@ -661,7 +661,7 @@ void AesInfoDialog::handleFunctionalArea(const FunctionalArea &data)
void AesInfoDialog::handleAirSupportImpact(const AesItemView &aesItemView)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
handleAirSupportImpact(m_dtc->airSupportImpact(m_aesEntityId));
}
@@ -670,7 +670,7 @@ void AesInfoDialog::handleAirSupportImpact(const AesItemView &aesItemView)
void AesInfoDialog::handleAirSupportImpact(const AirSupportImpact &data)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::FunctionalArea)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::FunctionalArea)"
<< " data.id(): " << data.id();
handleAesItem(data, AesType::AtAirSupportImpact);
@@ -861,14 +861,14 @@ void AesInfoDialog::handleSingleDusMine()
void AesInfoDialog::handleExplosionCluster(const AesItemView &aesItemView)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
handleExplosionCluster(m_dtc->explosionCluster(m_aesEntityId));
}
void AesInfoDialog::handleExplosionCluster(const ExplosionCluster &data)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::ExplosionCluster)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::ExplosionCluster)"
<< " data.id(): " << data.id();
handleAesItem(data, AesType::AtExplosionCluster);
@@ -882,14 +882,14 @@ void AesInfoDialog::handleExplosionCluster(const ExplosionCluster &data)
void AesInfoDialog::handleEffectCluster(const AesItemView &aesItemView)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
handleEffectCluster(m_dtc->effectCluster(m_aesEntityId));
}
void AesInfoDialog::handleEffectCluster(const EffectCluster &data)
{
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::EffectCluster)"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::EffectCluster)"
<< " data.id(): " << data.id();
handleAesItem(data, AesType::AtEffectCluster);
@@ -954,18 +954,18 @@ void AesInfoDialog::handleAesItem(const AesItem &aesData, AesType aesTypeId)
void AesInfoDialog::onFindOnMap()
{
DEBUG_LOG() << "onFindOnMap()";
DEBUG_LOG(m_logger) << "onFindOnMap()";
std::shared_ptr<SituationMap::ForeignGuiInterface> ifc;
if (m_session->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(ifc))
ifc->centerMapToAesObject(m_aesEntityId);
else
WARNING_LOG() << Q_FUNC_INFO << "getForeignGuiInterface<SituationMap::ForeignGuiInterface> failed!";
WARNING_LOG(m_logger) << Q_FUNC_INFO << "getForeignGuiInterface<SituationMap::ForeignGuiInterface> failed!";
}
void AesInfoDialog::onShowDetails()
{
DEBUG_LOG() << Q_FUNC_INFO;
DEBUG_LOG(m_logger) << Q_FUNC_INFO;
switch (m_aesType.underlying())
{
@@ -979,7 +979,7 @@ void AesInfoDialog::onShowDetails()
addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
}
else
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesNContamination::ForeignGuiInterface> failed!";
WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesNContamination::ForeignGuiInterface> failed!";
break;
}
case AreaEffectSimulation::AesType::AtBCContamination:
@@ -1005,7 +1005,7 @@ void AesInfoDialog::onShowDetails()
}
}
else
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesBCContamination::ForeignGuiInterface> failed!";
WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesBCContamination::ForeignGuiInterface> failed!";
break;
}
case AreaEffectSimulation::AesType::AtBoobyTrap:
@@ -1020,7 +1020,7 @@ void AesInfoDialog::onShowDetails()
break;
}
else
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
break;
}
case AreaEffectSimulation::AesType::AtOffRouteMine:
@@ -1035,7 +1035,7 @@ void AesInfoDialog::onShowDetails()
break;
}
else
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
break;
}
case AreaEffectSimulation::AesType::AtExplosionSingle:
@@ -1058,7 +1058,7 @@ void AesInfoDialog::onShowDetails()
break;
}
else
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
break;
}
case AreaEffectSimulation::AesType::AtExplosionArea:
@@ -1080,7 +1080,7 @@ void AesInfoDialog::onShowDetails()
}
}
else
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
break;
}
case AreaEffectSimulation::AesType::AtExplosionCluster:
@@ -1095,7 +1095,7 @@ void AesInfoDialog::onShowDetails()
break;
}
else
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
break;
}
case AreaEffectSimulation::AesType::AtMineArea:
@@ -1108,7 +1108,7 @@ void AesInfoDialog::onShowDetails()
addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
}
else
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesMineArea::ForeignGuiInterface> failed!";
WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesMineArea::ForeignGuiInterface> failed!";
break;
}
case AreaEffectSimulation::AesType::AtMineCorridor:
@@ -1121,7 +1121,7 @@ void AesInfoDialog::onShowDetails()
addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
}
else
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesMineCorridor::ForeignGuiInterface> failed!";
WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesMineCorridor::ForeignGuiInterface> failed!";
break;
}
case AreaEffectSimulation::AesType::AtGasPipe:
@@ -1134,7 +1134,7 @@ void AesInfoDialog::onShowDetails()
addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
}
else
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesGasPipe::ForeignGuiInterface> failed!";
WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesGasPipe::ForeignGuiInterface> failed!";
break;
}
case AreaEffectSimulation::AesType::AtDangerArea:
@@ -1147,7 +1147,7 @@ void AesInfoDialog::onShowDetails()
addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
}
else
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesDangerArea::ForeignGuiInterface> failed!";
WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesDangerArea::ForeignGuiInterface> failed!";
break;
}
case AreaEffectSimulation::AesType::AtBorderline:
@@ -1160,7 +1160,7 @@ void AesInfoDialog::onShowDetails()
addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
}
else
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesBorderline::ForeignGuiInterface> failed!";
WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesBorderline::ForeignGuiInterface> failed!";
break;
}
case AreaEffectSimulation::AesType::AtFunctionalArea:
@@ -1173,7 +1173,7 @@ void AesInfoDialog::onShowDetails()
addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
}
else
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesFunctionalArea::ForeignGuiInterface> failed!";
WARNING_LOG(m_logger) << Q_FUNC_INFO << " getForeignGuiInterface<AesFunctionalArea::ForeignGuiInterface> failed!";
break;
}
case AreaEffectSimulation::AesType::AtAirSupportImpact:
@@ -1191,7 +1191,7 @@ void AesInfoDialog::onShowDetails()
break;
case AreaEffectSimulation::AesType::AtUnknown:
Q_ASSERT(false);
WARNING_LOG() << "Unknown AesType found for aesEntityId: " << m_aesEntityId;
WARNING_LOG(m_logger) << "Unknown AesType found for aesEntityId: " << m_aesEntityId;
break;
default:
break;
@@ -1204,7 +1204,7 @@ bool AesInfoDialog::onResetDusMines()
{
if (m_aesType == AreaEffectSimulation::AesType_def::AtMineAreaSingleMines)
{
DEBUG_LOG() << "onResetDusMines() AtMineAreaSingleMines mineId: " << m_aesEntityId;
DEBUG_LOG(m_logger) << "onResetDusMines() AtMineAreaSingleMines mineId: " << m_aesEntityId;
MineResetRequest req(0, {m_aesEntityId});
return m_requestHelper->startSingleRequest([req, this]()
@@ -1225,7 +1225,7 @@ bool AesInfoDialog::onResetDusMines()
void AesInfoDialog::onNContaminationChanged(const AreaEffectSimulation::NContamination &data, DataModification modType)
{
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
handleNContamination(data);
}
@@ -1233,7 +1233,7 @@ void AesInfoDialog::onNContaminationChanged(const AreaEffectSimulation::NContami
void AesInfoDialog::onBCContaminationChanged(const AreaEffectSimulation::BCContamination &data, DataModification modType)
{
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
handleBCContamination(data);
}
@@ -1241,7 +1241,7 @@ void AesInfoDialog::onBCContaminationChanged(const AreaEffectSimulation::BCConta
void AesInfoDialog::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap &data, DataModification modType)
{
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
handleBoobyTrap(data);
}
@@ -1249,7 +1249,7 @@ void AesInfoDialog::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap &da
void AesInfoDialog::onOffRouteMineChanged(const AreaEffectSimulation::OffRouteMine &data, DataModification modType)
{
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
handleOffRouteMine(data);
}
@@ -1257,7 +1257,7 @@ void AesInfoDialog::onOffRouteMineChanged(const AreaEffectSimulation::OffRouteMi
void AesInfoDialog::onExplosionAreaChanged(const AreaEffectSimulation::ExplosionArea &data, DataModification modType)
{
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
handleExplosionArea(data);
}
@@ -1265,7 +1265,7 @@ void AesInfoDialog::onExplosionAreaChanged(const AreaEffectSimulation::Explosion
void AesInfoDialog::onExplosionSingleChanged(const AreaEffectSimulation::ExplosionSingle &data, DataModification modType)
{
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
handleExplosionSingle(data);
}
@@ -1273,7 +1273,7 @@ void AesInfoDialog::onExplosionSingleChanged(const AreaEffectSimulation::Explosi
void AesInfoDialog::onMineAreaChanged(const AreaEffectSimulation::MineArea &data, DataModification modType)
{
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
handleMineArea(data);
}
@@ -1281,7 +1281,7 @@ void AesInfoDialog::onMineAreaChanged(const AreaEffectSimulation::MineArea &data
void AesInfoDialog::onMineCorridorChanged(const MineCorridor &data, DataModification modType)
{
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
handleMineCorridor(data);
}
@@ -1289,7 +1289,7 @@ void AesInfoDialog::onMineCorridorChanged(const MineCorridor &data, DataModifica
void AesInfoDialog::onGasPipeChanged(const GasPipe &data, DataModification modType)
{
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
handleGasPipe(data);
}
@@ -1297,7 +1297,7 @@ void AesInfoDialog::onGasPipeChanged(const GasPipe &data, DataModification modTy
void AesInfoDialog::onDangerAreaChanged(const AreaEffectSimulation::DangerArea &data, DataModification modType)
{
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
handleDangerArea(data);
}
@@ -1305,7 +1305,7 @@ void AesInfoDialog::onDangerAreaChanged(const AreaEffectSimulation::DangerArea &
void AesInfoDialog::onBorderlineChanged(const AreaEffectSimulation::Borderline &data, DataModification modType)
{
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
handleBorderline(data);
}
@@ -1313,7 +1313,7 @@ void AesInfoDialog::onBorderlineChanged(const AreaEffectSimulation::Borderline &
void AesInfoDialog::onFunctionalAreaChanged(const FunctionalArea &data, DataModification modType)
{
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
handleFunctionalArea(data);
}
@@ -1321,7 +1321,7 @@ void AesInfoDialog::onFunctionalAreaChanged(const FunctionalArea &data, DataModi
void AesInfoDialog::onAirSupportImpactChanged(const AirSupportImpact &data, DataModification modType)
{
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
handleAirSupportImpact(data);
}
@@ -1329,7 +1329,7 @@ void AesInfoDialog::onAirSupportImpactChanged(const AirSupportImpact &data, Data
void AesInfoDialog::onDusMineStateChanged(const DusMineState &data, DataModification modType)
{
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
if (modType == DataModification::eRemoved)
return;
@@ -1356,7 +1356,7 @@ void AesInfoDialog::onDusMineStateChanged(const DusMineState &data, DataModifica
void AesInfoDialog::onDusSingleMineChanged(const DusSingleMine &data, DataModification modType)
{
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
handleSingleDusMine();
}
@@ -1364,14 +1364,14 @@ void AesInfoDialog::onDusSingleMineChanged(const DusSingleMine &data, DataModifi
void AesInfoDialog::onExplosionClusterChanged(const ExplosionCluster &data, DataModification modType)
{
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
handleExplosionCluster(data);
}
void AesInfoDialog::onEffectClusterChanged(const EffectCluster &data, DataModification modType)
{
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
handleEffectCluster(data);
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_info_dialog.h
+2
View File
@@ -44,6 +44,7 @@ public:
void onMineResetReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
private:
NGL::INGLLogger &m_logger;
void retranslate() override;
void handleNContamination(const AesItemView &aesItemView);
@@ -108,6 +109,7 @@ private Q_SLOTS:
void onEffectClusterChanged(const EffectCluster &data, DataModification modType);
private:
NGL::INGLLogger &m_logger;
int m_aesEntityId;
QString m_aesEntityName;
AreaEffectSimulation::AesType m_aesType;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.cpp
+1 -1
View File
@@ -297,7 +297,7 @@ bool BaseEdit::init(int aesItemId, LtsSession::LtsSession *session)
{
if (m_session)
{
ERROR_LOG() << "double init()!";
ERROR_LOG(m_logger) << "double init()!";
return false;
}
m_session = session;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ bool AesGuiBasHelpers::initModel(LtsSession::LtsSession *session)
{
if (m_aesDtc)
{
ERROR_LOG() << "double init()!";
ERROR_LOG(m_logger) << "double init()!";
return false;
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.cpp
+4 -4
View File
@@ -50,7 +50,7 @@ bool AesItemList::init(LtsSession::LtsSession *session)
{
if (m_session)
{
ERROR_LOG() << "double init()!";
ERROR_LOG(m_logger) << "double init()!";
return false;
}
m_session = session;
@@ -170,7 +170,7 @@ void AesItemList::onAdlerBtn()
AesEffectState aesEffectState = model()->aesEffectStateId(currentRow());
ProjectDataManagement::EffectSource effectSource = model()->aesEffectSourceId(currentRow());
DEBUG_LOG() << "onAdlerBtn aesEffectState=" << aesEffectState;
DEBUG_LOG(m_logger) << "onAdlerBtn aesEffectState=" << aesEffectState;
switch (aesEffectState.underlying())
{
@@ -208,7 +208,7 @@ void AesItemList::onAdlerBtn()
AreaEffectSimulation::SetAesItemEffectorStateRequest req;
req.aesId(model()->aesId(currentRow()));
req.newEffectorState(AesEffectorState::EsReadyToFire);
DEBUG_LOG() << "Send setAesItemEffectorStateRequest with aesId: " << req.aesId() << ", AesEffectorState: " << req.newEffectorState();
DEBUG_LOG(m_logger) << "Send setAesItemEffectorStateRequest with aesId: " << req.aesId() << ", AesEffectorState: " << req.newEffectorState();
m_requestHelper->startSingleRequest([req, this]() { return m_ftc->setAesItemEffectorStateRequest(req, this); });
}
@@ -223,7 +223,7 @@ void AesItemList::onAdlerBtn()
void AesItemList::onHandleAdler()
{
AesEffectState aesEffectState = model()->aesEffectStateId(currentRow());
DEBUG_LOG() << "onHandleAdler aesEffectState=" << aesEffectState;
DEBUG_LOG(m_logger) << "onHandleAdler aesEffectState=" << aesEffectState;
auto *adlerBtn = m_buttonBox->getButton(ADLER_BTN);
switch (aesEffectState.underlying())
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_adler_list.cpp
+1 -1
View File
@@ -61,7 +61,7 @@ bool ChargeAdministrationAdlerList::init(LtsSession::LtsSession *session)
{
if (m_session)
{
ERROR_LOG() << "double init()!";
ERROR_LOG(m_logger) << "double init()!";
return false;
}
m_session = session;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_adler_model.cpp
+5 -5
View File
@@ -79,7 +79,7 @@ bool ChargeAdministrationAdlerModel::initModel(LtsSession::LtsSession *session)
QMap<qint32, ParticipantManagement::Party> parties;
if (!m_ppmDtc->visibleParties(parties, LtsSessionData::LtsSessionData::getInstance()->getVisibleParties(session->exerciseId())))
{
DEBUG_LOG() << "Could not retrieve visible Parties!";
DEBUG_LOG(m_logger) << "Could not retrieve visible Parties!";
return false;
}
@@ -104,7 +104,7 @@ void ChargeAdministrationAdlerModel::onStateChanged(const ParticipantManagement:
case DataModification::eAdded:
case DataModification::eModified:
{
DEBUG_LOG() << "+++++++++ DataModification --> " << modType;
DEBUG_LOG(m_logger) << "+++++++++ DataModification --> " << modType;
updateParticipantChargeTypeMap(data);
updateItem(m_ppmDtc->participant(data.participantId()).partyId());
@@ -188,10 +188,10 @@ void ChargeAdministrationAdlerModel::updateItem(int partyId)
{
if (participantCharges.partyId != partyId)
continue;
DEBUG_LOG() << "+++++++++ ParticipantId -> " << participantCharges.participantId << ", sampleTime ->" << sampleTime;
DEBUG_LOG(m_logger) << "+++++++++ ParticipantId -> " << participantCharges.participantId << ", sampleTime ->" << sampleTime;
for (auto it = participantCharges.chargeTypeTotalStockMap.cbegin(), end = participantCharges.chargeTypeTotalStockMap.cend(); it != end; ++it)
{
DEBUG_LOG() << "+++++++++ chargeRemain ->" << it.key() << ": " << it.value().remain
DEBUG_LOG(m_logger) << "+++++++++ chargeRemain ->" << it.key() << ": " << it.value().remain
<< it.value().lastUpdate;
GearData data;
data.lastUpdate = it.value().lastUpdate;
@@ -211,7 +211,7 @@ void ChargeAdministrationAdlerModel::updateItem(int partyId)
item.partyId = partyId;
for (auto gearData = chargeTypeGearData.cbegin(), end = chargeTypeGearData.cend(); gearData != end; ++gearData)
{
DEBUG_LOG() << "### PartyId " << item.partyId << " insert item -> chargeTypeId: " << gearData.key() << ", amount: " << gearData.value().remain
DEBUG_LOG(m_logger) << "### PartyId " << item.partyId << " insert item -> chargeTypeId: " << gearData.key() << ", amount: " << gearData.value().remain
<< ", lastUpdate:" << gearData.value().lastUpdate;
item.chargeTypeId = gearData.key();
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_list.cpp
+1 -1
View File
@@ -69,7 +69,7 @@ bool ChargeAdministrationList::init(LtsSession::LtsSession *session)
{
if (m_session)
{
ERROR_LOG() << "double init()!";
ERROR_LOG(m_logger) << "double init()!";
return false;
}
m_session = session;
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_model.cpp
+2 -2
View File
@@ -66,7 +66,7 @@ bool ChargeAdministrationModel::initModel(LtsSession::LtsSession *session, QVect
{
if (m_aesDtc)
{
ERROR_LOG() << "double init()!";
ERROR_LOG(m_logger) << "double init()!";
return false;
}
@@ -101,7 +101,7 @@ bool ChargeAdministrationModel::initModel(LtsSession::LtsSession *session, QVect
QMap<qint32, ParticipantManagement::Party> parties;
if (!ppmDtc->visibleParties(parties, LtsSessionData::LtsSessionData::getInstance()->getVisibleParties(session->exerciseId())))
{
ERROR_LOG() << "Could not retrieve visible Parties!";
ERROR_LOG(m_logger) << "Could not retrieve visible Parties!";
return false;
}