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
+16
-17
@@ -27,7 +27,6 @@ namespace AreaEffectSimulation
|
||||
|
||||
AesChargeEffectItemInfo::AesChargeEffectItemInfo(int chargeEffectId, QWidget *parent)
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
|
||||
, m_logger(getLogger("AesChargeEffectItemInfo"))
|
||||
, m_session(nullptr)
|
||||
, m_ChargeEffectId(chargeEffectId)
|
||||
, m_ui(new Ui::AesChargeEffectItemInfo)
|
||||
@@ -52,13 +51,13 @@ bool AesChargeEffectItemInfo::init(LtsSession::LtsSession *session)
|
||||
|
||||
if (!session->getDtc<ProjectDataManagement::DataInterface>(m_pdmDtc))
|
||||
{
|
||||
ERROR_LOG(m_logger) << " failed to get pdmDtc";
|
||||
ERROR_LOG() << " failed to get pdmDtc";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!session->getDtc<AreaEffectSimulation::DataInterface>(m_aesDtc))
|
||||
{
|
||||
ERROR_LOG(m_logger) << " failed to get aesDtc";
|
||||
ERROR_LOG() << " failed to get aesDtc";
|
||||
return false;
|
||||
}
|
||||
if (!m_aesDtc->isAesItemViewEnabled())
|
||||
@@ -104,12 +103,12 @@ void AesChargeEffectItemInfo::retranslate()
|
||||
|
||||
void AesChargeEffectItemInfo::onFindOnMap() const
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onFindOnMap() aesId: "<<m_ChargeEffectId;
|
||||
DEBUG_LOG() << "onFindOnMap() aesId: "<<m_ChargeEffectId;
|
||||
std::shared_ptr<SituationMap::ForeignGuiInterface> ifc;
|
||||
if (m_session->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(ifc))
|
||||
ifc->centerMapToChargeEffectObject(m_ChargeEffectId);
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << "getForeignGuiInterface<SituationMap::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << "getForeignGuiInterface<SituationMap::ForeignGuiInterface> failed!";
|
||||
}
|
||||
|
||||
template <typename InterfaceType>
|
||||
@@ -126,13 +125,13 @@ bool AesChargeEffectItemInfo::tryShowStandardEditDialog(const AesItemView& aiv)
|
||||
return true;
|
||||
}
|
||||
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface failed for specific AES interface!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface failed for specific AES interface!";
|
||||
return false;
|
||||
}
|
||||
|
||||
void AesChargeEffectItemInfo::onShowDetails()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION;
|
||||
DEBUG_LOG() << Q_FUNC_INFO;
|
||||
|
||||
const ChargeEffect item = m_aesDtc->chargeEffect(m_ChargeEffectId);
|
||||
|
||||
@@ -140,7 +139,7 @@ void AesChargeEffectItemInfo::onShowDetails()
|
||||
{
|
||||
AesItemView aiv;
|
||||
m_aesDtc->aesItemViewFromEntityId(item.originatorId(), AreaEffectSimulation::AesType::AtUnknown, aiv);
|
||||
DEBUG_LOG(m_logger) << "aiv.id():" << aiv.id() << ", aesType: " << aiv.aesTypeId();
|
||||
DEBUG_LOG() << "aiv.id():" << aiv.id() << ", aesType: " << aiv.aesTypeId();
|
||||
|
||||
|
||||
auto registerDialog = [this](AreaEffectSimulation::BaseEdit* dialog) {
|
||||
@@ -201,7 +200,7 @@ void AesChargeEffectItemInfo::onShowDetails()
|
||||
registerDialog(ifc->showEditWindow(aiv.aesItemId(), true, this));
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesBCContamination::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesBCContamination::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtBoobyTrap:
|
||||
@@ -211,7 +210,7 @@ void AesChargeEffectItemInfo::onShowDetails()
|
||||
if (m_session->getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface>(ifc))
|
||||
registerDialog(ifc->showBoobyTrapEditWindow(aiv.aesItemId(), this));
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtOffRouteMine:
|
||||
@@ -221,7 +220,7 @@ void AesChargeEffectItemInfo::onShowDetails()
|
||||
if (m_session->getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface>(ifc))
|
||||
registerDialog(ifc->showOffRouteMineEditWindow(aiv.aesItemId(), this));
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtExplosionSingle:
|
||||
@@ -245,7 +244,7 @@ void AesChargeEffectItemInfo::onShowDetails()
|
||||
}
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -261,7 +260,7 @@ void AesChargeEffectItemInfo::onShowDetails()
|
||||
registerDialog(ifc->showEditWindow(aiv.aesItemId(), ai.effectSourceId(), this));
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -284,10 +283,10 @@ void AesChargeEffectItemInfo::onShowDetails()
|
||||
break;
|
||||
case AreaEffectSimulation::AesType::AtUnknown:
|
||||
Q_ASSERT(false);
|
||||
WARNING_LOG(m_logger) << "Unknown AesType found for aesEntityId: " << aiv.aesTypeId();
|
||||
WARNING_LOG() << "Unknown AesType found for aesEntityId: " << aiv.aesTypeId();
|
||||
break;
|
||||
default:
|
||||
DEBUG_LOG(m_logger) << "Couldn't find AesItem to ChargeEffect (any more). Hiding the button";
|
||||
DEBUG_LOG() << "Couldn't find AesItem to ChargeEffect (any more). Hiding the button";
|
||||
m_ui->pbDetails->hide();
|
||||
break;
|
||||
}
|
||||
@@ -303,13 +302,13 @@ void AesChargeEffectItemInfo::onShowDetails()
|
||||
addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface ChargeEffect failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface ChargeEffect failed!";
|
||||
}
|
||||
}
|
||||
|
||||
void AesChargeEffectItemInfo::onChargeEffectChanged(const ChargeEffect &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << " [onChargeEffectChanged] id: " << data.id();
|
||||
DEBUG_LOG() << " [onChargeEffectChanged] id: " << data.id();
|
||||
if (data.id() == m_ChargeEffectId && modType != DataModification::eRemoved)
|
||||
handleChargeEffect(data);
|
||||
}
|
||||
|
||||
+3
-4
@@ -22,7 +22,6 @@ namespace AreaEffectSimulation
|
||||
DangerAreaAesItemInfo::DangerAreaAesItemInfo(QWidget *parent)
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
|
||||
, m_dtc(nullptr)
|
||||
, m_logger(getLogger("DangerArea.AesItemInfo"))
|
||||
, m_session(nullptr)
|
||||
, m_ui(new Ui::DangerAreaAesItemInfo)
|
||||
, m_aesItemId(-1)
|
||||
@@ -100,12 +99,12 @@ bool DangerAreaAesItemInfo::init(LtsSession::LtsSession *session)
|
||||
{
|
||||
if (m_session && session)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "double init()!";
|
||||
ERROR_LOG() << "double init()!";
|
||||
return false;
|
||||
}
|
||||
if (!m_session && !session)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "No Session available!";
|
||||
ERROR_LOG() << "No Session available!";
|
||||
return false;
|
||||
}
|
||||
if (!m_session)
|
||||
@@ -130,7 +129,7 @@ void DangerAreaAesItemInfo::insertAesItem(int aesItemId)
|
||||
}
|
||||
delete item;
|
||||
|
||||
WARNING_LOG(m_logger) << "AesItem with id " << aesItemId << " is not of any known type!";
|
||||
WARNING_LOG() << "AesItem with id " << aesItemId << " is not of any known type!";
|
||||
}
|
||||
|
||||
void DangerAreaAesItemInfo::setText()
|
||||
|
||||
+83
-84
@@ -46,9 +46,8 @@ AesInfoDialog::AesInfoDialog(int aesEntityId, AesType aesType, QWidget *parent)
|
||||
, m_pdmDtc(nullptr)
|
||||
, m_ui(new Ui::AesInfoDialog)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("AESInfoDialog"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "ctor AesInfoDialog() ";
|
||||
DEBUG_LOG() << "ctor AesInfoDialog() ";
|
||||
m_ui->setupUi(this);
|
||||
m_ui->lblAesId->setText(QString::number(aesEntityId));
|
||||
|
||||
@@ -81,7 +80,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
|
||||
if (aesItemView.aesItemId() != m_aesEntityId)
|
||||
return false;
|
||||
|
||||
DEBUG_LOG(m_logger) << "AesItemView found for aesEntityId: " << m_aesEntityId
|
||||
DEBUG_LOG() << "AesItemView found for aesEntityId: " << m_aesEntityId
|
||||
<< " AesItemView.aesTypeId(): " << aesItemView.aesTypeId();
|
||||
|
||||
if (aesItemView.aesTypeId() != m_aesType)
|
||||
@@ -95,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(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::NContaminationChanged for aesEntityId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::NContaminationChanged for aesEntityId: " << m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-N-Contamination"));
|
||||
break;
|
||||
}
|
||||
@@ -103,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(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::bCContaminationChanged for aesEntityId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::bCContaminationChanged for aesEntityId: " << m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-C-Contamination"));
|
||||
break;
|
||||
}
|
||||
@@ -112,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(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::boobyTrapChanged for aesEntityId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::boobyTrapChanged for aesEntityId: " << m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-BoobyTrap"));
|
||||
break;
|
||||
}
|
||||
@@ -121,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(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::offRouteMineChanged for aesEntityId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::offRouteMineChanged for aesEntityId: " << m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-OffRouteMine"));
|
||||
break;
|
||||
}
|
||||
@@ -129,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(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::explosionAreaChanged for aesEntityId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::explosionAreaChanged for aesEntityId: " << m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Area_Artillery"));
|
||||
break;
|
||||
}
|
||||
@@ -137,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(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::explosionSingleChanged for aesEntityId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::explosionSingleChanged for aesEntityId: " << m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Single_Artillery"));
|
||||
break;
|
||||
}
|
||||
@@ -145,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(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::mineAreaChanged for aesEntityId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::mineAreaChanged for aesEntityId: " << m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Mine_Area"));
|
||||
break;
|
||||
}
|
||||
@@ -153,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(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::mineCorridorChanged for aesEntityId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::mineCorridorChanged for aesEntityId: " << m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Mine_Corridor"));
|
||||
break;
|
||||
}
|
||||
@@ -161,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(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::gasPipeChanged for aesEntityId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::gasPipeChanged for aesEntityId: " << m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Gas_Pipeline"));
|
||||
break;
|
||||
}
|
||||
@@ -169,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(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::dangerAreaChanged for aesEntityId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::dangerAreaChanged for aesEntityId: " << m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Danger_Area"));
|
||||
break;
|
||||
}
|
||||
@@ -177,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(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::borderlineChanged for aesEntityId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::borderlineChanged for aesEntityId: " << m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Borderline"));
|
||||
|
||||
|
||||
@@ -197,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(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::functionalAreaChanged for aesEntityId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::functionalAreaChanged for aesEntityId: " << m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Functional_Area"));
|
||||
break;
|
||||
}
|
||||
@@ -205,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(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::airSupportImpactChanged for aesEntityId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::airSupportImpactChanged for aesEntityId: " << m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Aerial_Ordnance"));
|
||||
break;
|
||||
}
|
||||
@@ -213,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(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::ExplosionCluster for aesEntityId: "<<m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::ExplosionCluster for aesEntityId: "<<m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Explosion_Cluster"));
|
||||
break;
|
||||
}
|
||||
@@ -221,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(m_logger) << "connect AreaEffectSimulation::Interface::Dtc::EffectCluster for aesEntityId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "connect AreaEffectSimulation::Interface::Dtc::EffectCluster for aesEntityId: " << m_aesEntityId;
|
||||
setOnlineHelpFilename(QStringLiteral("Info_Dialog-Explosion_Cluster"));
|
||||
break;
|
||||
}
|
||||
@@ -238,7 +237,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView &aesItemView)
|
||||
|
||||
break;
|
||||
case AreaEffectSimulation::AesType::AtUnknown:
|
||||
WARNING_LOG(m_logger) << "Unknown AesType found for aesEntityId " << m_aesEntityId << ": " << aesItemView.aesTypeId();
|
||||
WARNING_LOG() << "Unknown AesType found for aesEntityId " << m_aesEntityId << ": " << aesItemView.aesTypeId();
|
||||
Q_ASSERT(false);
|
||||
break;
|
||||
}
|
||||
@@ -309,7 +308,7 @@ bool AesInfoDialog::init(LtsSession::LtsSession *session,
|
||||
|
||||
void AesInfoDialog::handleNContamination(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
|
||||
handleNContamination(m_dtc->nContamination(m_aesEntityId));
|
||||
@@ -318,7 +317,7 @@ void AesInfoDialog::handleNContamination(const AesItemView &aesItemView)
|
||||
|
||||
void AesInfoDialog::handleNContamination(const AreaEffectSimulation::NContamination &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::NContamination)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::NContamination)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType::AtNContamination);
|
||||
@@ -332,7 +331,7 @@ void AesInfoDialog::handleNContamination(const AreaEffectSimulation::NContaminat
|
||||
|
||||
void AesInfoDialog::handleBCContamination(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
|
||||
handleBCContamination(m_dtc->bCContamination(m_aesEntityId));
|
||||
@@ -341,7 +340,7 @@ void AesInfoDialog::handleBCContamination(const AesItemView &aesItemView)
|
||||
|
||||
void AesInfoDialog::handleBCContamination(const AreaEffectSimulation::BCContamination &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::BCContamination)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::BCContamination)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType::AtBCContamination);
|
||||
@@ -357,7 +356,7 @@ void AesInfoDialog::handleBCContamination(const AreaEffectSimulation::BCContamin
|
||||
|
||||
void AesInfoDialog::handleBoobyTrap(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
|
||||
handleBoobyTrap(m_dtc->boobyTrap(m_aesEntityId));
|
||||
@@ -366,7 +365,7 @@ void AesInfoDialog::handleBoobyTrap(const AesItemView &aesItemView)
|
||||
|
||||
void AesInfoDialog::handleBoobyTrap(const AreaEffectSimulation::BoobyTrap &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::BoobyTrap)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::BoobyTrap)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType_def::AtBoobyTrap);
|
||||
@@ -387,7 +386,7 @@ void AesInfoDialog::handleBoobyTrap(const AreaEffectSimulation::BoobyTrap &data)
|
||||
|
||||
void AesInfoDialog::handleOffRouteMine(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
|
||||
handleOffRouteMine(m_dtc->offRouteMine(m_aesEntityId));
|
||||
@@ -396,7 +395,7 @@ void AesInfoDialog::handleOffRouteMine(const AesItemView &aesItemView)
|
||||
|
||||
void AesInfoDialog::handleOffRouteMine(const AreaEffectSimulation::OffRouteMine &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::OffRouteMine)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::OffRouteMine)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType_def::AtOffRouteMine);
|
||||
@@ -417,7 +416,7 @@ void AesInfoDialog::handleOffRouteMine(const AreaEffectSimulation::OffRouteMine
|
||||
|
||||
void AesInfoDialog::handleExplosionArea(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
|
||||
handleExplosionArea(m_dtc->explosionArea(m_aesEntityId));
|
||||
@@ -426,7 +425,7 @@ void AesInfoDialog::handleExplosionArea(const AesItemView &aesItemView)
|
||||
|
||||
void AesInfoDialog::handleExplosionArea(const AreaEffectSimulation::ExplosionArea &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::ExplosionArea)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::ExplosionArea)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType::AtExplosionArea);
|
||||
@@ -449,7 +448,7 @@ void AesInfoDialog::handleExplosionArea(const AreaEffectSimulation::ExplosionAre
|
||||
|
||||
void AesInfoDialog::handleExplosionSingle(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
handleExplosionSingle(m_dtc->explosionSingle(m_aesEntityId));
|
||||
}
|
||||
@@ -457,7 +456,7 @@ void AesInfoDialog::handleExplosionSingle(const AesItemView &aesItemView)
|
||||
|
||||
void AesInfoDialog::handleExplosionSingle(const AreaEffectSimulation::ExplosionSingle &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::ExplosionSingle)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::ExplosionSingle)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType::AtExplosionSingle);
|
||||
@@ -473,7 +472,7 @@ void AesInfoDialog::handleExplosionSingle(const AreaEffectSimulation::ExplosionS
|
||||
|
||||
void AesInfoDialog::handleMineArea(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
handleMineArea(m_dtc->mineArea(m_aesEntityId));
|
||||
}
|
||||
@@ -481,7 +480,7 @@ void AesInfoDialog::handleMineArea(const AesItemView &aesItemView)
|
||||
|
||||
void AesInfoDialog::handleMineArea(const AreaEffectSimulation::MineArea &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::MineArea)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::MineArea)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType::AtMineArea);
|
||||
@@ -505,7 +504,7 @@ void AesInfoDialog::handleMineArea(const AreaEffectSimulation::MineArea &data)
|
||||
|
||||
void AesInfoDialog::handleMineCorridor(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
handleMineCorridor(m_dtc->mineCorridor(m_aesEntityId));
|
||||
}
|
||||
@@ -513,7 +512,7 @@ void AesInfoDialog::handleMineCorridor(const AesItemView &aesItemView)
|
||||
|
||||
void AesInfoDialog::handleMineCorridor(const AreaEffectSimulation::MineCorridor &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::MineArea)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::MineArea)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType::AtMineCorridor);
|
||||
@@ -531,7 +530,7 @@ void AesInfoDialog::handleMineCorridor(const AreaEffectSimulation::MineCorridor
|
||||
|
||||
void AesInfoDialog::handleGasPipe(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " handleGasPipe: aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
handleGasPipe(m_dtc->gasPipe(m_aesEntityId));
|
||||
}
|
||||
@@ -539,7 +538,7 @@ void AesInfoDialog::handleGasPipe(const AesItemView &aesItemView)
|
||||
|
||||
void AesInfoDialog::handleGasPipe(const AreaEffectSimulation::GasPipe &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::GasPipe)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::GasPipe)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType::AtGasPipe);
|
||||
@@ -556,7 +555,7 @@ void AesInfoDialog::handleGasPipe(const AreaEffectSimulation::GasPipe &data)
|
||||
|
||||
void AesInfoDialog::handleDangerArea(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
handleDangerArea(m_dtc->dangerArea(m_aesEntityId));
|
||||
}
|
||||
@@ -564,7 +563,7 @@ void AesInfoDialog::handleDangerArea(const AesItemView &aesItemView)
|
||||
|
||||
void AesInfoDialog::handleDangerArea(const AreaEffectSimulation::DangerArea &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::DangerArea)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::DangerArea)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType::AtDangerArea);
|
||||
@@ -587,7 +586,7 @@ void AesInfoDialog::handleDangerArea(const AreaEffectSimulation::DangerArea &dat
|
||||
|
||||
void AesInfoDialog::handleBorderline(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
handleBorderline(m_dtc->borderline(m_aesEntityId));
|
||||
}
|
||||
@@ -595,7 +594,7 @@ void AesInfoDialog::handleBorderline(const AesItemView &aesItemView)
|
||||
|
||||
void AesInfoDialog::handleBorderline(const AreaEffectSimulation::Borderline &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::Borderline)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::Borderline)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType::AtBorderline);
|
||||
@@ -615,7 +614,7 @@ void AesInfoDialog::handleBorderline(const AreaEffectSimulation::Borderline &dat
|
||||
|
||||
void AesInfoDialog::handleFunctionalArea(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
handleFunctionalArea(m_dtc->functionalArea(m_aesEntityId));
|
||||
}
|
||||
@@ -624,7 +623,7 @@ void AesInfoDialog::handleFunctionalArea(const AesItemView &aesItemView)
|
||||
|
||||
void AesInfoDialog::handleFunctionalArea(const FunctionalArea &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::FunctionalArea)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::FunctionalArea)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType::AtFunctionalArea);
|
||||
@@ -662,7 +661,7 @@ void AesInfoDialog::handleFunctionalArea(const FunctionalArea &data)
|
||||
|
||||
void AesInfoDialog::handleAirSupportImpact(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
handleAirSupportImpact(m_dtc->airSupportImpact(m_aesEntityId));
|
||||
}
|
||||
@@ -671,7 +670,7 @@ void AesInfoDialog::handleAirSupportImpact(const AesItemView &aesItemView)
|
||||
|
||||
void AesInfoDialog::handleAirSupportImpact(const AirSupportImpact &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::FunctionalArea)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::FunctionalArea)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType::AtAirSupportImpact);
|
||||
@@ -862,14 +861,14 @@ void AesInfoDialog::handleSingleDusMine()
|
||||
|
||||
void AesInfoDialog::handleExplosionCluster(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
handleExplosionCluster(m_dtc->explosionCluster(m_aesEntityId));
|
||||
}
|
||||
|
||||
void AesInfoDialog::handleExplosionCluster(const ExplosionCluster &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::ExplosionCluster)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::ExplosionCluster)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType::AtExplosionCluster);
|
||||
@@ -883,14 +882,14 @@ void AesInfoDialog::handleExplosionCluster(const ExplosionCluster &data)
|
||||
|
||||
void AesInfoDialog::handleEffectCluster(const AesItemView &aesItemView)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AesItemView)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AesItemView)"
|
||||
<< " aesItemView.aesItemId(): " << aesItemView.aesItemId();
|
||||
handleEffectCluster(m_dtc->effectCluster(m_aesEntityId));
|
||||
}
|
||||
|
||||
void AesInfoDialog::handleEffectCluster(const EffectCluster &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "(AreaEffectSimulation::EffectCluster)"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "(AreaEffectSimulation::EffectCluster)"
|
||||
<< " data.id(): " << data.id();
|
||||
|
||||
handleAesItem(data, AesType::AtEffectCluster);
|
||||
@@ -955,18 +954,18 @@ void AesInfoDialog::handleAesItem(const AesItem &aesData, AesType aesTypeId)
|
||||
|
||||
void AesInfoDialog::onFindOnMap()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onFindOnMap()";
|
||||
DEBUG_LOG() << "onFindOnMap()";
|
||||
std::shared_ptr<SituationMap::ForeignGuiInterface> ifc;
|
||||
if (m_session->getForeignGuiInterface<SituationMap::ForeignGuiInterface>(ifc))
|
||||
ifc->centerMapToAesObject(m_aesEntityId);
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << "getForeignGuiInterface<SituationMap::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << "getForeignGuiInterface<SituationMap::ForeignGuiInterface> failed!";
|
||||
}
|
||||
|
||||
|
||||
void AesInfoDialog::onShowDetails()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION;
|
||||
DEBUG_LOG() << Q_FUNC_INFO;
|
||||
|
||||
switch (m_aesType.underlying())
|
||||
{
|
||||
@@ -980,7 +979,7 @@ void AesInfoDialog::onShowDetails()
|
||||
addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesNContamination::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesNContamination::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtBCContamination:
|
||||
@@ -1006,7 +1005,7 @@ void AesInfoDialog::onShowDetails()
|
||||
}
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesBCContamination::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesBCContamination::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtBoobyTrap:
|
||||
@@ -1021,7 +1020,7 @@ void AesInfoDialog::onShowDetails()
|
||||
break;
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtOffRouteMine:
|
||||
@@ -1036,7 +1035,7 @@ void AesInfoDialog::onShowDetails()
|
||||
break;
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtExplosionSingle:
|
||||
@@ -1059,7 +1058,7 @@ void AesInfoDialog::onShowDetails()
|
||||
break;
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtExplosionArea:
|
||||
@@ -1081,7 +1080,7 @@ void AesInfoDialog::onShowDetails()
|
||||
}
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtExplosionCluster:
|
||||
@@ -1096,7 +1095,7 @@ void AesInfoDialog::onShowDetails()
|
||||
break;
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesExplosion::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtMineArea:
|
||||
@@ -1109,7 +1108,7 @@ void AesInfoDialog::onShowDetails()
|
||||
addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesMineArea::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesMineArea::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtMineCorridor:
|
||||
@@ -1122,7 +1121,7 @@ void AesInfoDialog::onShowDetails()
|
||||
addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesMineCorridor::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesMineCorridor::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtGasPipe:
|
||||
@@ -1135,7 +1134,7 @@ void AesInfoDialog::onShowDetails()
|
||||
addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesGasPipe::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesGasPipe::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtDangerArea:
|
||||
@@ -1148,7 +1147,7 @@ void AesInfoDialog::onShowDetails()
|
||||
addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesDangerArea::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesDangerArea::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtBorderline:
|
||||
@@ -1161,7 +1160,7 @@ void AesInfoDialog::onShowDetails()
|
||||
addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesBorderline::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesBorderline::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtFunctionalArea:
|
||||
@@ -1174,7 +1173,7 @@ void AesInfoDialog::onShowDetails()
|
||||
addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " getForeignGuiInterface<AesFunctionalArea::ForeignGuiInterface> failed!";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " getForeignGuiInterface<AesFunctionalArea::ForeignGuiInterface> failed!";
|
||||
break;
|
||||
}
|
||||
case AreaEffectSimulation::AesType::AtAirSupportImpact:
|
||||
@@ -1192,7 +1191,7 @@ void AesInfoDialog::onShowDetails()
|
||||
break;
|
||||
case AreaEffectSimulation::AesType::AtUnknown:
|
||||
Q_ASSERT(false);
|
||||
WARNING_LOG(m_logger) << "Unknown AesType found for aesEntityId: " << m_aesEntityId;
|
||||
WARNING_LOG() << "Unknown AesType found for aesEntityId: " << m_aesEntityId;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@@ -1205,7 +1204,7 @@ bool AesInfoDialog::onResetDusMines()
|
||||
{
|
||||
if (m_aesType == AreaEffectSimulation::AesType_def::AtMineAreaSingleMines)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onResetDusMines() AtMineAreaSingleMines mineId: " << m_aesEntityId;
|
||||
DEBUG_LOG() << "onResetDusMines() AtMineAreaSingleMines mineId: " << m_aesEntityId;
|
||||
MineResetRequest req(0, {m_aesEntityId});
|
||||
|
||||
return m_requestHelper->startSingleRequest([req, this]()
|
||||
@@ -1226,7 +1225,7 @@ bool AesInfoDialog::onResetDusMines()
|
||||
|
||||
void AesInfoDialog::onNContaminationChanged(const AreaEffectSimulation::NContamination &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleNContamination(data);
|
||||
}
|
||||
@@ -1234,7 +1233,7 @@ void AesInfoDialog::onNContaminationChanged(const AreaEffectSimulation::NContami
|
||||
|
||||
void AesInfoDialog::onBCContaminationChanged(const AreaEffectSimulation::BCContamination &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleBCContamination(data);
|
||||
}
|
||||
@@ -1242,7 +1241,7 @@ void AesInfoDialog::onBCContaminationChanged(const AreaEffectSimulation::BCConta
|
||||
|
||||
void AesInfoDialog::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleBoobyTrap(data);
|
||||
}
|
||||
@@ -1250,7 +1249,7 @@ void AesInfoDialog::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap &da
|
||||
|
||||
void AesInfoDialog::onOffRouteMineChanged(const AreaEffectSimulation::OffRouteMine &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleOffRouteMine(data);
|
||||
}
|
||||
@@ -1258,7 +1257,7 @@ void AesInfoDialog::onOffRouteMineChanged(const AreaEffectSimulation::OffRouteMi
|
||||
|
||||
void AesInfoDialog::onExplosionAreaChanged(const AreaEffectSimulation::ExplosionArea &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleExplosionArea(data);
|
||||
}
|
||||
@@ -1266,7 +1265,7 @@ void AesInfoDialog::onExplosionAreaChanged(const AreaEffectSimulation::Explosion
|
||||
|
||||
void AesInfoDialog::onExplosionSingleChanged(const AreaEffectSimulation::ExplosionSingle &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleExplosionSingle(data);
|
||||
}
|
||||
@@ -1274,7 +1273,7 @@ void AesInfoDialog::onExplosionSingleChanged(const AreaEffectSimulation::Explosi
|
||||
|
||||
void AesInfoDialog::onMineAreaChanged(const AreaEffectSimulation::MineArea &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleMineArea(data);
|
||||
}
|
||||
@@ -1282,7 +1281,7 @@ void AesInfoDialog::onMineAreaChanged(const AreaEffectSimulation::MineArea &data
|
||||
|
||||
void AesInfoDialog::onMineCorridorChanged(const MineCorridor &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleMineCorridor(data);
|
||||
}
|
||||
@@ -1290,7 +1289,7 @@ void AesInfoDialog::onMineCorridorChanged(const MineCorridor &data, DataModifica
|
||||
|
||||
void AesInfoDialog::onGasPipeChanged(const GasPipe &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleGasPipe(data);
|
||||
}
|
||||
@@ -1298,7 +1297,7 @@ void AesInfoDialog::onGasPipeChanged(const GasPipe &data, DataModification modTy
|
||||
|
||||
void AesInfoDialog::onDangerAreaChanged(const AreaEffectSimulation::DangerArea &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleDangerArea(data);
|
||||
}
|
||||
@@ -1306,7 +1305,7 @@ void AesInfoDialog::onDangerAreaChanged(const AreaEffectSimulation::DangerArea &
|
||||
|
||||
void AesInfoDialog::onBorderlineChanged(const AreaEffectSimulation::Borderline &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleBorderline(data);
|
||||
}
|
||||
@@ -1314,7 +1313,7 @@ void AesInfoDialog::onBorderlineChanged(const AreaEffectSimulation::Borderline &
|
||||
|
||||
void AesInfoDialog::onFunctionalAreaChanged(const FunctionalArea &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleFunctionalArea(data);
|
||||
}
|
||||
@@ -1322,7 +1321,7 @@ void AesInfoDialog::onFunctionalAreaChanged(const FunctionalArea &data, DataModi
|
||||
|
||||
void AesInfoDialog::onAirSupportImpactChanged(const AirSupportImpact &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleAirSupportImpact(data);
|
||||
}
|
||||
@@ -1330,7 +1329,7 @@ void AesInfoDialog::onAirSupportImpactChanged(const AirSupportImpact &data, Data
|
||||
|
||||
void AesInfoDialog::onDusMineStateChanged(const DusMineState &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
|
||||
if (modType == DataModification::eRemoved)
|
||||
return;
|
||||
@@ -1357,7 +1356,7 @@ void AesInfoDialog::onDusMineStateChanged(const DusMineState &data, DataModifica
|
||||
|
||||
void AesInfoDialog::onDusSingleMineChanged(const DusSingleMine &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleSingleDusMine();
|
||||
}
|
||||
@@ -1365,14 +1364,14 @@ void AesInfoDialog::onDusSingleMineChanged(const DusSingleMine &data, DataModifi
|
||||
|
||||
void AesInfoDialog::onExplosionClusterChanged(const ExplosionCluster &data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << 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(m_logger) << LOGFUNCTION << " id: " << data.id();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: " << data.id();
|
||||
if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
|
||||
handleEffectCluster(data);
|
||||
}
|
||||
|
||||
-1
@@ -125,6 +125,5 @@ private:
|
||||
|
||||
Ui::AesInfoDialog* m_ui;
|
||||
LtsUtils::RequestHelper *m_requestHelper;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
+1
-1
@@ -27,7 +27,7 @@ NGL_WRAP_UI(aes_base_gui_SRCS
|
||||
InfoView/aes_base_info.ui
|
||||
)
|
||||
|
||||
NGL_ADD_LIBRARY(WS AesBaseGui SHARED ${aes_base_gui_SRCS})
|
||||
NGL_ADD_LIBRARY2(WS AesBaseGui SHARED ${aes_base_gui_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(AesBaseGui
|
||||
PRIVATE
|
||||
ExmDataPluginInterface
|
||||
|
||||
+1
-1
@@ -297,7 +297,7 @@ bool BaseEdit::init(int aesItemId, LtsSession::LtsSession *session)
|
||||
{
|
||||
if (m_session)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "double init()!";
|
||||
ERROR_LOG() << "double init()!";
|
||||
return false;
|
||||
}
|
||||
m_session = session;
|
||||
|
||||
+1
-2
@@ -25,14 +25,13 @@ AesGuiBasHelpers::AesGuiBasHelpers()
|
||||
: m_aesDtc(nullptr)
|
||||
, m_pdmDtc(nullptr)
|
||||
, m_ppmDtc(nullptr)
|
||||
, m_logger(getLogger("AesGuiBase"))
|
||||
{}
|
||||
|
||||
bool AesGuiBasHelpers::initModel(LtsSession::LtsSession *session)
|
||||
{
|
||||
if (m_aesDtc)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "double init()!";
|
||||
ERROR_LOG() << "double init()!";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
+4
-5
@@ -35,7 +35,6 @@ AesItemList::AesItemList(const QString &menuGroup, QWidget *parent)
|
||||
, m_bHasAddAdlerOperatorRights(false)
|
||||
, m_session(nullptr)
|
||||
, m_ui(new Ui::AesItemList)
|
||||
, m_logger(getLogger("AesItemList"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -51,7 +50,7 @@ bool AesItemList::init(LtsSession::LtsSession *session)
|
||||
{
|
||||
if (m_session)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "double init()!";
|
||||
ERROR_LOG() << "double init()!";
|
||||
return false;
|
||||
}
|
||||
m_session = session;
|
||||
@@ -171,7 +170,7 @@ void AesItemList::onAdlerBtn()
|
||||
AesEffectState aesEffectState = model()->aesEffectStateId(currentRow());
|
||||
ProjectDataManagement::EffectSource effectSource = model()->aesEffectSourceId(currentRow());
|
||||
|
||||
DEBUG_LOG(m_logger) << "onAdlerBtn aesEffectState=" << aesEffectState;
|
||||
DEBUG_LOG() << "onAdlerBtn aesEffectState=" << aesEffectState;
|
||||
|
||||
switch (aesEffectState.underlying())
|
||||
{
|
||||
@@ -209,7 +208,7 @@ void AesItemList::onAdlerBtn()
|
||||
AreaEffectSimulation::SetAesItemEffectorStateRequest req;
|
||||
req.aesId(model()->aesId(currentRow()));
|
||||
req.newEffectorState(AesEffectorState::EsReadyToFire);
|
||||
DEBUG_LOG(m_logger) << "Send setAesItemEffectorStateRequest with aesId: " << req.aesId() << ", AesEffectorState: " << req.newEffectorState();
|
||||
DEBUG_LOG() << "Send setAesItemEffectorStateRequest with aesId: " << req.aesId() << ", AesEffectorState: " << req.newEffectorState();
|
||||
|
||||
m_requestHelper->startSingleRequest([req, this]() { return m_ftc->setAesItemEffectorStateRequest(req, this); });
|
||||
}
|
||||
@@ -224,7 +223,7 @@ void AesItemList::onAdlerBtn()
|
||||
void AesItemList::onHandleAdler()
|
||||
{
|
||||
AesEffectState aesEffectState = model()->aesEffectStateId(currentRow());
|
||||
DEBUG_LOG(m_logger) << "onHandleAdler aesEffectState=" << aesEffectState;
|
||||
DEBUG_LOG() << "onHandleAdler aesEffectState=" << aesEffectState;
|
||||
auto *adlerBtn = m_buttonBox->getButton(ADLER_BTN);
|
||||
|
||||
switch (aesEffectState.underlying())
|
||||
|
||||
+1
-2
@@ -27,7 +27,6 @@ ChargeAdministrationAdlerList::ChargeAdministrationAdlerList(QWidget *parent)
|
||||
, m_session(nullptr)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_ui(new Ui::ChargeAdministrationList)
|
||||
, m_logger(getLogger("ChargeAdministrationAdlerList"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -62,7 +61,7 @@ bool ChargeAdministrationAdlerList::init(LtsSession::LtsSession *session)
|
||||
{
|
||||
if (m_session)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "double init()!";
|
||||
ERROR_LOG() << "double init()!";
|
||||
return false;
|
||||
}
|
||||
m_session = session;
|
||||
|
||||
+5
-6
@@ -58,7 +58,6 @@ ChargeAdministrationAdlerModel::ChargeAdministrationAdlerModel(QObject *parent)
|
||||
tr("Total Stock"),
|
||||
tr("Gear Class")},
|
||||
parent)
|
||||
, m_logger(getLogger("ChargeAdministration"))
|
||||
{}
|
||||
|
||||
bool ChargeAdministrationAdlerModel::initModel(LtsSession::LtsSession *session)
|
||||
@@ -80,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 (m_logger) << "Could not retrieve visible Parties!";
|
||||
DEBUG_LOG() << "Could not retrieve visible Parties!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -105,7 +104,7 @@ void ChargeAdministrationAdlerModel::onStateChanged(const ParticipantManagement:
|
||||
case DataModification::eAdded:
|
||||
case DataModification::eModified:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "+++++++++ DataModification --> " << modType;
|
||||
DEBUG_LOG() << "+++++++++ DataModification --> " << modType;
|
||||
updateParticipantChargeTypeMap(data);
|
||||
|
||||
updateItem(m_ppmDtc->participant(data.participantId()).partyId());
|
||||
@@ -189,10 +188,10 @@ void ChargeAdministrationAdlerModel::updateItem(int partyId)
|
||||
{
|
||||
if (participantCharges.partyId != partyId)
|
||||
continue;
|
||||
DEBUG_LOG(m_logger) << "+++++++++ ParticipantId -> " << participantCharges.participantId << ", sampleTime ->" << sampleTime;
|
||||
DEBUG_LOG() << "+++++++++ ParticipantId -> " << participantCharges.participantId << ", sampleTime ->" << sampleTime;
|
||||
for (auto it = participantCharges.chargeTypeTotalStockMap.cbegin(), end = participantCharges.chargeTypeTotalStockMap.cend(); it != end; ++it)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "+++++++++ chargeRemain ->" << it.key() << ": " << it.value().remain
|
||||
DEBUG_LOG() << "+++++++++ chargeRemain ->" << it.key() << ": " << it.value().remain
|
||||
<< it.value().lastUpdate;
|
||||
GearData data;
|
||||
data.lastUpdate = it.value().lastUpdate;
|
||||
@@ -212,7 +211,7 @@ void ChargeAdministrationAdlerModel::updateItem(int partyId)
|
||||
item.partyId = partyId;
|
||||
for (auto gearData = chargeTypeGearData.cbegin(), end = chargeTypeGearData.cend(); gearData != end; ++gearData)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "### PartyId " << item.partyId << " insert item -> chargeTypeId: " << gearData.key() << ", amount: " << gearData.value().remain
|
||||
DEBUG_LOG() << "### PartyId " << item.partyId << " insert item -> chargeTypeId: " << gearData.key() << ", amount: " << gearData.value().remain
|
||||
<< ", lastUpdate:" << gearData.value().lastUpdate;
|
||||
|
||||
item.chargeTypeId = gearData.key();
|
||||
|
||||
+1
-2
@@ -31,7 +31,6 @@ ChargeAdministrationList::ChargeAdministrationList(QWidget *parent)
|
||||
, m_ftc(nullptr)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_ui(new Ui::ChargeAdministrationList)
|
||||
, m_logger(getLogger("ChargeAdministrationList"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -70,7 +69,7 @@ bool ChargeAdministrationList::init(LtsSession::LtsSession *session)
|
||||
{
|
||||
if (m_session)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "double init()!";
|
||||
ERROR_LOG() << "double init()!";
|
||||
return false;
|
||||
}
|
||||
m_session = session;
|
||||
|
||||
+2
-3
@@ -59,7 +59,6 @@ ChargeAdministrationModel::ChargeAdministrationModel(QObject *parent)
|
||||
tr("Used"),
|
||||
tr("Gear Class")},
|
||||
parent)
|
||||
, m_logger(getLogger("ChargeAdministration"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -67,7 +66,7 @@ bool ChargeAdministrationModel::initModel(LtsSession::LtsSession *session, QVect
|
||||
{
|
||||
if (m_aesDtc)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "double init()!";
|
||||
ERROR_LOG() << "double init()!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -102,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(m_logger) << "Could not retrieve visible Parties!";
|
||||
ERROR_LOG() << "Could not retrieve visible Parties!";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
|
||||
#include <Plugins/AreaEffectSimulation/Gui/Explosion/aeseffectclustermodel_export.h>
|
||||
#include <Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aeseffectclustermodel_export.h>
|
||||
|
||||
namespace AreaEffectSimulation
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user