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

Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen

Browse Source 
- 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:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.cpp
+115 -116
View File
@@ -85,17 +85,16 @@ namespace SituationMap
AdapterDds::AdapterDds(QObject *parent)
: QObject(parent)
, m_logger(getLogger("AdapterDds"))
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START DDDDDDDD" ;
TRACE_LOG(m_logger) << LOGFUNCTION << " END" ;
TRACE_LOG() << Q_FUNC_INFO << " START DDDDDDDD" ;
TRACE_LOG() << Q_FUNC_INFO << " END" ;
}
AdapterDds::~AdapterDds()
{
qDebug() << LOGFUNCTION << " START";
qDebug() << Q_FUNC_INFO << " START";
stop();
qDeleteAll(m_aes2MapCont);
@@ -116,12 +115,12 @@ AdapterDds::~AdapterDds()
delete m_pdmHandler;
qDebug() << LOGFUNCTION << " END";
qDebug() << Q_FUNC_INFO << " END";
}
bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<MovementTrackManager> &movementTrackMgr, bool resourceMode)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START" ;
TRACE_LOG() << Q_FUNC_INFO << " START" ;
if (!map || !pluginProvider)
return false;
@@ -144,7 +143,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
participantLayername,
"Participant2SituationMap"));
if (!m_particpants->init(&m_map->layerFactory(), m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
@@ -170,7 +169,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
drawOrder,
"HitlineInfo2SituationMap"));
if (!m_hitlineInfo2SituationMap->init(m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
}
{
@@ -184,7 +183,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
drawOrder,
"BldHitlineInfo2SituationMap"));
if (!m_bldHitlineInfo2SituationMap->init(m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
}
}
@@ -244,7 +243,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if(!sim2Map->init(m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
}
@@ -275,7 +274,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
}
{
@@ -289,7 +288,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
}
{
@@ -303,7 +302,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(contIdx)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
}
{
@@ -317,7 +316,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
}
{
@@ -331,7 +330,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
}
@@ -356,7 +355,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
}
int drawOrder = 0;
@@ -375,7 +374,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
}
{
@@ -392,7 +391,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
}
@@ -404,16 +403,16 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
drawOrder++,
"ChargeEffectToMap"));
if (!m_chargeEffects->init(m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed (ChargeEffectToMap)";
ERROR_LOG() << Q_FUNC_INFO << " init failed (ChargeEffectToMap)";
else
DEBUG_LOG(m_logger) << LOGFUNCTION << " ChargeEffect2Map for ChargeEffect prepared";
DEBUG_LOG() << Q_FUNC_INFO << " ChargeEffect2Map for ChargeEffect prepared";
}
}
if (m_map->mode() == Mode::Mode_3D)
{
INFO_LOG(m_logger) << LOGFUNCTION << " assignUniqueValueRendererAesCentral";
INFO_LOG() << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral";
initRenderer3D_AesCentral_Booby(layernameAesCentral, {AreaEffectSimulation::AesType_def::AtBoobyTrap, AreaEffectSimulation::AesType_def::AtOffRouteMine});
}
@@ -428,7 +427,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG(m_logger)<<LOGFUNCTION <<" init failed";
ERROR_LOG()<<Q_FUNC_INFO <<" init failed";
}
{
@@ -442,7 +441,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG(m_logger)<<LOGFUNCTION <<" init failed";
ERROR_LOG()<<Q_FUNC_INFO <<" init failed";
}
}
@@ -461,7 +460,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
}
{
@@ -475,7 +474,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
}
{
@@ -489,7 +488,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
}
{
@@ -503,7 +502,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
}
@@ -520,7 +519,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
}
@@ -537,7 +536,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
}
@@ -555,7 +554,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
}
@@ -571,7 +570,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
}
@@ -610,9 +609,9 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
emergencyCallLayername,
0, "EmergencyCallToMap"));
if (!m_emergencyCalls->init(m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed (EmergencyCallToMap)";
ERROR_LOG() << Q_FUNC_INFO << " init failed (EmergencyCallToMap)";
else
DEBUG_LOG(m_logger) << LOGFUNCTION << " EmergencyCallToMap for AlmEmergencyCalls prepared";
DEBUG_LOG() << Q_FUNC_INFO << " EmergencyCallToMap for AlmEmergencyCalls prepared";
}
}
@@ -628,7 +627,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
const bool enableDamageVisualization =
ps->value(QStringLiteral("SituationMap"), QStringLiteral("enableDamageVisualizationAtBuilding2Map")).toBool();
if (!m_buildings->init(m_pluginProvider, enableDamageVisualization))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
@@ -642,7 +641,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
drawOrder++,
"TrainingAreaToSituationMap"));
if (!m_trainingAreas->init(m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
}
m_specialAreas = QSharedPointer<SpecialAreaToSituationMap>(new SpecialAreaToSituationMap(m_map->objectFactory(),
@@ -650,7 +649,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
drawOrder++,
"SpecialAreaToSituationMap"));
if (!m_specialAreas->init(m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
@@ -659,7 +658,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
drawOrder++,
"MountingPointToMap"));
if (!m_mountingPoints->init(m_pluginProvider, resourceMode))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
@@ -668,7 +667,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
drawOrder++,
"SoundAreaToMap"));
if (!m_soundAreas->init(m_pluginProvider, resourceMode))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
if (!resourceMode)
@@ -679,7 +678,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
drawOrder++,
"MsePointToMap"));
if (!m_msePoints->init(m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
m_mseBridges = QSharedPointer<MSEBridgeToMap>(new MSEBridgeToMap(m_map->objectFactory(),
@@ -687,7 +686,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
drawOrder++,
"MseBridgeToMap"));
if (!m_mseBridges->init(m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
}
@@ -696,7 +695,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
drawOrder++,
"ShootbackAreaToSituationMap"));
if (!m_shootbackAreas->init(m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
const bool bIsOfTypeOrganizer =
(m_pluginProvider->operatorId() == 99) ||
@@ -710,7 +709,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
drawOrder++,
"GuezIed2SituationMap"));
if (!m_guezIeds->init(m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
}
@@ -720,7 +719,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
drawOrder++,
"NineLiner2SituationMap"));
if (!m_guezNasat9Liner->init(m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
@@ -731,14 +730,14 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
if (m_buildingOwnership)
if (!m_buildingOwnership->init(m_map, m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
if ((m_map->mode() == Mode::Mode_3D) && (m_buildingContamination.isNull()))
m_buildingContamination = QSharedPointer<BuildingContamination>(new BuildingContamination(drawOrder++, this));
if (m_buildingContamination)
if (!m_buildingContamination->init(m_map, m_pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed";
ERROR_LOG() << Q_FUNC_INFO << " init failed";
@@ -777,7 +776,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
}
TRACE_LOG(m_logger) << LOGFUNCTION << " END" ;
TRACE_LOG() << Q_FUNC_INFO << " END" ;
return true;
}
@@ -786,7 +785,7 @@ bool AdapterDds::initRenderer3D_AesExtrusion()
if (m_map->mode() != Mode::Mode_3D)
return false;
INFO_LOG(m_logger) << LOGFUNCTION << " START";
INFO_LOG() << Q_FUNC_INFO << " START";
@@ -801,15 +800,15 @@ bool AdapterDds::initRenderer3D_AesExtrusion()
connect(m_map, &Map::partysChangedDelayed, this, [this] () {
DEBUG_LOG(m_logger) << LOGFUNCTION << " partysChangedDelayed ********";
DEBUG_LOG() << Q_FUNC_INFO << " partysChangedDelayed ********";
bool successAes = assignUniqueValueRendererAesCentral3DExtrusion(layernameAes);
if (successAes)
INFO_LOG(m_logger) << LOGFUNCTION << " assignUniqueValueRendererAesCentral3DExtrusion okay" << " ('" << layernameAes << "')";
INFO_LOG() << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral3DExtrusion okay" << " ('" << layernameAes << "')";
else
for (int i=0; i<5; ++i)
ERROR_LOG(m_logger) << LOGFUNCTION << " assignUniqueValueRendererAesCentral3DExtrusion failed" << " ('" << layernameAes << "')";
ERROR_LOG() << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral3DExtrusion failed" << " ('" << layernameAes << "')";
@@ -825,14 +824,14 @@ bool AdapterDds::initRenderer3D_AesExtrusion()
bool successAes = assignUniqueValueRendererAesCentral3DExtrusion(layernameAes);
if (successAes)
INFO_LOG(m_logger) << LOGFUNCTION << " assignUniqueValueRendererAesCentral3DExtrusion okay" << " ('" << layernameAes << "')";
INFO_LOG() << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral3DExtrusion okay" << " ('" << layernameAes << "')";
else
for (int i=0; i<5; ++i)
ERROR_LOG(m_logger) << LOGFUNCTION << " assignUniqueValueRendererAesCentral3DExtrusion failed" << " ('" << layernameAes << "')";
ERROR_LOG() << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral3DExtrusion failed" << " ('" << layernameAes << "')";
});
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
return true;
}
@@ -845,18 +844,18 @@ bool AdapterDds::initRenderer3D_AesCentral_Booby(const QString &layernameAesCent
INFO_LOG(m_logger) << LOGFUNCTION << " START, layernameAesCentral=" << layernameAesCentral;
INFO_LOG() << Q_FUNC_INFO << " START, layernameAesCentral=" << layernameAesCentral;
connect(m_map, &Map::partysChangedDelayed, this, [this, layernameAesCentral, aesTypesForReRunIfPartyColorChanges] () {
DEBUG_LOG(m_logger) << LOGFUNCTION << " partysChangedDelayed ********";
DEBUG_LOG() << Q_FUNC_INFO << " partysChangedDelayed ********";
bool successAesCentral = assignUniqueValueRendererAesCentral(layernameAesCentral);
if (successAesCentral)
DEBUG_LOG(m_logger) << LOGFUNCTION << " assignUniqueValueRendererAesCentral okay" << " ('" << layernameAesCentral << "')";
DEBUG_LOG() << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral okay" << " ('" << layernameAesCentral << "')";
else
for (int i=0; i<5; ++i)
ERROR_LOG(m_logger) << LOGFUNCTION << " assignUniqueValueRendererAesCentral failed" << " ('" << layernameAesCentral << "')";
ERROR_LOG() << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral failed" << " ('" << layernameAesCentral << "')";
@@ -874,18 +873,18 @@ bool AdapterDds::initRenderer3D_AesCentral_Booby(const QString &layernameAesCent
bool successAesCentral = assignUniqueValueRendererAesCentral(layernameAesCentral);
if (successAesCentral)
DEBUG_LOG(m_logger) << LOGFUNCTION << " assignUniqueValueRendererAesCentral okay" << " ('" << layernameAesCentral << "')";
DEBUG_LOG() << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral okay" << " ('" << layernameAesCentral << "')";
else
for (int i=0; i<5; ++i)
ERROR_LOG(m_logger) << LOGFUNCTION << " assignUniqueValueRendererAesCentral failed" << " ('" << layernameAesCentral << "')";
ERROR_LOG() << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral failed" << " ('" << layernameAesCentral << "')";
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
return true;
}
bool AdapterDds::assignUniqueValueRendererAesCentral(const QString &layername)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, layername ='" << layername << "'" ;
TRACE_LOG() << Q_FUNC_INFO << " START, layername ='" << layername << "'" ;
QVector<LayerFactory::UniqueValueDataAesCentral::TYPE> typeVec;
typeVec << LayerFactory::UniqueValueDataAesCentral::TYPE::CONE;
@@ -894,7 +893,7 @@ bool AdapterDds::assignUniqueValueRendererAesCentral(const QString &layername)
const PartyIdToColorFunctor::ColorMap &colorMap = m_map->partyIdToColorFunctor().colorMap();
if (colorMap.isEmpty())
{
ERROR_LOG(m_logger) << LOGFUNCTION << " colorMap is empty";
ERROR_LOG() << Q_FUNC_INFO << " colorMap is empty";
return false;
}
QVector<QColor> colVec;
@@ -905,7 +904,7 @@ bool AdapterDds::assignUniqueValueRendererAesCentral(const QString &layername)
for (const PartyIdToColorFunctor::PartyData &partyData : std::as_const(colorMap))
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " partyName=" << partyData.m_name << "'" << " partyColor=" << partyData.m_color.name() << "'";
DEBUG_LOG() << Q_FUNC_INFO << " partyName=" << partyData.m_name << "'" << " partyColor=" << partyData.m_color.name() << "'";
colVec << partyData.m_color;
@@ -973,7 +972,7 @@ bool AdapterDds::assignUniqueValueRendererAesCentral(const QString &layername)
}
}
INFO_LOG(m_logger) << LOGFUNCTION
INFO_LOG() << Q_FUNC_INFO
<< " typeVec.size() = " << typeVec.size()
<< " colVec.size() = " << colVec.size() << " (colorMap.size() = " << colorMap.size() << ")"
<< " radiuss.size() = " << radiuss.size()
@@ -991,27 +990,27 @@ bool AdapterDds::assignUniqueValueRendererAesCentral(const QString &layername)
uvCont);
}
TRACE_LOG(m_logger) << LOGFUNCTION << " END, layername ='" << layername << "'" ;
TRACE_LOG() << Q_FUNC_INFO << " END, layername ='" << layername << "'" ;
return success;
}
bool AdapterDds::assignUniqueValueRendererAesCentral3DExtrusion(const QString &layername)
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " START, layername ='" << layername << "'" ;
DEBUG_LOG() << Q_FUNC_INFO << " START, layername ='" << layername << "'" ;
QVector<QColor> colVec;
{
const PartyIdToColorFunctor::ColorMap &colorMap = m_map->partyIdToColorFunctor().colorMap();
if (colorMap.isEmpty())
{
ERROR_LOG(m_logger) << LOGFUNCTION << " colorMap is empty";
ERROR_LOG() << Q_FUNC_INFO << " colorMap is empty";
return false;
}
colVec.reserve(colorMap.size());
for (const PartyIdToColorFunctor::PartyData &partyData : colorMap)
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " partyName=" << partyData.m_name << "'" << " partyColor=" << partyData.m_color.name() << "'";
DEBUG_LOG() << Q_FUNC_INFO << " partyName=" << partyData.m_name << "'" << " partyColor=" << partyData.m_color.name() << "'";
colVec << partyData.m_color
<< partyData.m_lightColor;
}
@@ -1063,18 +1062,18 @@ bool AdapterDds::assignUniqueValueRendererAesCentral3DExtrusion(const QString &l
fieldnames,
uvCont);
TRACE_LOG(m_logger) << LOGFUNCTION << " END, layername ='" << layername << "'"
TRACE_LOG() << Q_FUNC_INFO << " END, layername ='" << layername << "'"
<< " success = " << success;
return success;
}
bool AdapterDds::run()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (m_isRunning)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " already running" ;
ERROR_LOG() << Q_FUNC_INFO << " already running" ;
return false;
}
@@ -1130,11 +1129,11 @@ bool AdapterDds::run()
m_isRunning = success;
INFO_LOG(m_logger) << LOGFUNCTION << " connect to SymbolDictionary::changed" ;
INFO_LOG() << Q_FUNC_INFO << " connect to SymbolDictionary::changed" ;
connect(&m_map->symbolDictionary(), &AdvancedSymbology::SymbolDictionary::changed,
this, &AdapterDds::startChangedDelayTimer, Qt::UniqueConnection);
TRACE_LOG(m_logger) << LOGFUNCTION << " END" ;
TRACE_LOG() << Q_FUNC_INFO << " END" ;
return success;
}
@@ -1145,12 +1144,12 @@ bool AdapterDds::isRunning() const
bool AdapterDds::stop()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START" ;
TRACE_LOG() << Q_FUNC_INFO << " START" ;
if (m_pluginProvider && !m_pluginProvider->isSessionValid())
{
m_isRunning = false;
DEBUG_LOG(m_logger) << LOGFUNCTION << " no session anymore: ignore 'stop' -> return";
DEBUG_LOG() << Q_FUNC_INFO << " no session anymore: ignore 'stop' -> return";
return false;
}
@@ -1196,13 +1195,13 @@ bool AdapterDds::stop()
m_isRunning = false;
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
return true;
}
void AdapterDds::clearObjects()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
const QList<Sim2SituationMapBase *> &sim2Map = listOfSim2Map();
for (Sim2SituationMapBase *item : std::as_const(sim2Map))
@@ -1248,23 +1247,23 @@ void AdapterDds::clearObjects()
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
ResourceManagerMode AdapterDds::resourceManagerMode() const
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (!m_mountingPoints)
return ResourceManagerMode::Undefined;
ResourceManagerMode rmm = m_mountingPoints->resourceManagerMode();
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
return rmm;
}
bool AdapterDds::setResourceManagerMode(ResourceManagerMode rmm)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (!m_mountingPoints)
return false;
@@ -1273,26 +1272,26 @@ bool AdapterDds::setResourceManagerMode(ResourceManagerMode rmm)
emit resourceManagerModeChanged(m_mountingPoints->resourceManagerMode());
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
return success;
}
bool AdapterDds::showExpiredEmergencyCalls(bool bShowExpired)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (!m_emergencyCalls)
return false;
m_emergencyCalls->showExpired(bShowExpired);
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
return true;
}
bool AdapterDds::uniqueMapId2SimId(UniqueMapId uniqueMapIdIn, int32_t &simIdOut)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START"
TRACE_LOG() << Q_FUNC_INFO << " START"
<< " uniqueMapId=" << uniqueMapIdIn;
if (!SituationMap::isUniqueMapIdValid(uniqueMapIdIn))
@@ -1310,7 +1309,7 @@ bool AdapterDds::uniqueMapId2SimId(UniqueMapId uniqueMapIdIn, int32_t &simIdOut)
bool AdapterDds::unifiedMapObjectData(UniqueMapId uniqueMapIdIn, UnifiedMapObjectData &umodOut) const
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START"
TRACE_LOG() << Q_FUNC_INFO << " START"
<< " uniqueMapId=" << uniqueMapIdIn;
if (!SituationMap::isUniqueMapIdValid(uniqueMapIdIn))
@@ -1333,14 +1332,14 @@ UniqueMapId AdapterDds::simId2UniqueMapIdParticipant(int32_t simId) const
}
RefPointer<Participant> AdapterDds::simId2Participant(int32_t simId)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, simId=" << simId ;
TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId ;
UniqueMapId mapId = simId2UniqueMapIdParticipant(simId);
if (!isUniqueMapIdValid(mapId))
return RefPointer<Participant>();
RefPointer<Participant> mapObj = m_map->objectFactory().get<Participant>(mapId);
TRACE_LOG(m_logger) << LOGFUNCTION << " END" ;
TRACE_LOG() << Q_FUNC_INFO << " END" ;
return mapObj;
}
@@ -1356,14 +1355,14 @@ UniqueMapId AdapterDds::simId2UniqueMapIdAes(int32_t simId) const
}
RefPointer<AbstractMapObject> AdapterDds::simId2Aes(int32_t simId)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, simId=" << simId ;
TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId ;
UniqueMapId mapId = simId2UniqueMapIdAes(simId);
if (!isUniqueMapIdValid(mapId))
return RefPointer<AbstractMapObject>();
RefPointer<AbstractMapObject> mapObj = m_map->objectFactory().get(mapId);
TRACE_LOG(m_logger) << LOGFUNCTION << " END" ;
TRACE_LOG() << Q_FUNC_INFO << " END" ;
return mapObj;
}
@@ -1376,14 +1375,14 @@ UniqueMapId AdapterDds::simId2UniqueMapIdBuilding(int32_t simId) const
}
RefPointer<BuildingOutline> AdapterDds::simId2Building(int32_t simId)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, simId=" << simId;
TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId;
UniqueMapId mapId = simId2UniqueMapIdBuilding(simId);
if (!isUniqueMapIdValid(mapId))
return RefPointer<BuildingOutline>();
RefPointer<BuildingOutline> mapObj = m_map->objectFactory().get<BuildingOutline>(mapId);
TRACE_LOG(m_logger) << LOGFUNCTION << " END" ;
TRACE_LOG() << Q_FUNC_INFO << " END" ;
return mapObj;
}
@@ -1395,14 +1394,14 @@ UniqueMapId AdapterDds::simId2UniqueMapIdBridge(int32_t simId) const
}
RefPointer<BuildingOutline> AdapterDds::simId2Bridge(int32_t simId)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, simId=" << simId;
TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId;
UniqueMapId mapId = simId2UniqueMapIdBridge(simId);
if (!isUniqueMapIdValid(mapId))
return RefPointer<BuildingOutline>();
RefPointer<BuildingOutline> mapObj = m_map->objectFactory().get<BuildingOutline>(mapId);
TRACE_LOG(m_logger) << LOGFUNCTION << " END" ;
TRACE_LOG() << Q_FUNC_INFO << " END" ;
return mapObj;
}
@@ -1415,14 +1414,14 @@ UniqueMapId AdapterDds::simId2UniqueMapIdMountingPoint(int32_t simId) const
RefPointer<GeoImage> AdapterDds::simId2MountingPoint(int32_t simId)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, simId=" << simId;
TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId;
UniqueMapId mapId = simId2UniqueMapIdMountingPoint(simId);
if (!isUniqueMapIdValid(mapId))
return RefPointer<GeoImage>();
RefPointer<GeoImage> mapObj = m_map->objectFactory().get<GeoImage>(mapId);
TRACE_LOG(m_logger) << LOGFUNCTION << " END" ;
TRACE_LOG() << Q_FUNC_INFO << " END" ;
return mapObj;
}
@@ -1434,14 +1433,14 @@ UniqueMapId AdapterDds::simId2UniqueMapIdGuezIed(int32_t simId) const
}
RefPointer<Participant> AdapterDds::simId2GuezIed(int32_t simId)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, simId=" << simId;
TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId;
UniqueMapId mapId = simId2UniqueMapIdGuezIed(simId);
if (!isUniqueMapIdValid(mapId))
return RefPointer<Participant>();
RefPointer<Participant> mapObj = m_map->objectFactory().get<Participant>(mapId);
TRACE_LOG(m_logger) << LOGFUNCTION << " END" ;
TRACE_LOG() << Q_FUNC_INFO << " END" ;
return mapObj;
}
@@ -1454,14 +1453,14 @@ UniqueMapId AdapterDds::simId2UniqueMapIdChargeEffect(int32_t simId) const
RefPointer<SingleFire> AdapterDds::simId2ChargeEffect(int32_t simId)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, simId=" << simId;
TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId;
UniqueMapId mapId = simId2UniqueMapIdChargeEffect(simId);
if (!isUniqueMapIdValid(mapId))
return RefPointer<SingleFire>();
RefPointer<SingleFire> mapObj = m_map->objectFactory().get<SingleFire>(mapId);
TRACE_LOG(m_logger) << LOGFUNCTION << " END" ;
TRACE_LOG() << Q_FUNC_INFO << " END" ;
return mapObj;
}
@@ -1474,7 +1473,7 @@ UniqueMapId AdapterDds::simId2UniqueMapIdTrainingArea(int32_t simId) const
RefPointer<Polygon> AdapterDds::simId2TrainingArea(int32_t simId)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, simId=" << simId;
TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId;
UniqueMapId mapId = simId2UniqueMapIdTrainingArea(simId);
if (!isUniqueMapIdValid(mapId))
@@ -1482,7 +1481,7 @@ RefPointer<Polygon> AdapterDds::simId2TrainingArea(int32_t simId)
using MAP_T = TrainingAreaToSituationMap::MAP_T;
RefPointer<MAP_T> mapObj = m_map->objectFactory().get<MAP_T>(mapId);
TRACE_LOG(m_logger) << LOGFUNCTION << " END" ;
TRACE_LOG() << Q_FUNC_INFO << " END" ;
return mapObj;
}
@@ -1495,7 +1494,7 @@ UniqueMapId AdapterDds::simId2UniqueMapIdSpecialArea(int32_t simId) const
RefPointer<Polygon> AdapterDds::simId2SpecialArea(int32_t simId)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, simId=" << simId;
TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId;
UniqueMapId mapId = simId2UniqueMapIdSpecialArea(simId);
if (!isUniqueMapIdValid(mapId))
@@ -1503,7 +1502,7 @@ RefPointer<Polygon> AdapterDds::simId2SpecialArea(int32_t simId)
using MAP_T = SpecialAreaToSituationMap::MAP_T;
RefPointer<MAP_T> mapObj = m_map->objectFactory().get<MAP_T>(mapId);
TRACE_LOG(m_logger) << LOGFUNCTION << " END" ;
TRACE_LOG() << Q_FUNC_INFO << " END" ;
return mapObj;
}
@@ -1516,7 +1515,7 @@ UniqueMapId AdapterDds::simId2UniqueMapIdShootbackArea(int32_t simId) const
RefPointer<Polygon> AdapterDds::simId2ShootbackArea(int32_t simId)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, simId=" << simId;
TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId;
UniqueMapId mapId = simId2UniqueMapIdShootbackArea(simId);
if (!isUniqueMapIdValid(mapId))
@@ -1524,7 +1523,7 @@ RefPointer<Polygon> AdapterDds::simId2ShootbackArea(int32_t simId)
using MAP_T = ShootbackAreaToSituationMap::MAP_T;
RefPointer<MAP_T> mapObj = m_map->objectFactory().get<MAP_T>(mapId);
TRACE_LOG(m_logger) << LOGFUNCTION << " END" ;
TRACE_LOG() << Q_FUNC_INFO << " END" ;
return mapObj;
}
@@ -1552,7 +1551,7 @@ UniqueMapId AdapterDds::simId2UniqueMapId(MapObjectType mot, int32_t simId) cons
case MapObjectType::MOT_Aes:
case MapObjectType::MOT_GuezIed:
{
ERROR_LOG(m_logger) << " not supported yet!!!";
ERROR_LOG() << " not supported yet!!!";
Q_FALLTHROUGH();
}
default:
@@ -1590,7 +1589,7 @@ QVector<UniqueMapId> AdapterDds::simIds2UniqueMapIds(MapObjectType mot, QVector<
case MapObjectType::MOT_Aes:
case MapObjectType::MOT_GuezIed:
{
ERROR_LOG(m_logger) << " not supported yet!!!";
ERROR_LOG() << " not supported yet!!!";
Q_FALLTHROUGH();
}
default:
@@ -1615,7 +1614,7 @@ RefPointer<AbstractMapObject> AdapterDds::simId2MapObject(MapObjectType mot, int
return {};
RefPointer<AbstractMapObject> mapObj = m_map->objectFactory().get(uniqueMapId);
TRACE_LOG(m_logger) << LOGFUNCTION << " END" ;
TRACE_LOG() << Q_FUNC_INFO << " END" ;
return mapObj;
}
@@ -1641,7 +1640,7 @@ Sim2SituationMapBase *AdapterDds::situationMapBase(MapObjectType mot) const
case MapObjectType::MOT_Building:
case MapObjectType::MOT_GuezIed:
{
ERROR_LOG(m_logger) << " not supported yet!!!";
ERROR_LOG() << " not supported yet!!!";
Q_FALLTHROUGH();
}
default:
@@ -1779,7 +1778,7 @@ bool AdapterDds::setOwnPositionVisible(bool enable)
void AdapterDds::onSymbolDictionaryChanged()
{
INFO_LOG(m_logger) << LOGFUNCTION << " START, workspaceId" << m_pluginProvider->workspaceId();
INFO_LOG() << Q_FUNC_INFO << " START, workspaceId" << m_pluginProvider->workspaceId();
if (m_particpants)
m_particpants->reRenderObjects();
@@ -1799,7 +1798,7 @@ void AdapterDds::onSymbolDictionaryChanged()
INFO_LOG(m_logger) << LOGFUNCTION << " END, workspaceId" << m_pluginProvider->workspaceId();
INFO_LOG() << Q_FUNC_INFO << " END, workspaceId" << m_pluginProvider->workspaceId();
}
@@ -1865,7 +1864,7 @@ void AdapterDds::onMapObjectChangedUpdateDrawOrder(UniqueMapId uniqueMapId)
RefPointer<AbstractMapObject> mapObj = objFac.get<AbstractMapObject>(curUniqueMapId);
if (!mapObj)
{
WARNING_LOG(m_logger) << LOGFUNCTION << " not found in objFac"
WARNING_LOG() << Q_FUNC_INFO << " not found in objFac"
<< " curUniqueMapId = " << curUniqueMapId;
return;
}
@@ -1873,10 +1872,10 @@ void AdapterDds::onMapObjectChangedUpdateDrawOrder(UniqueMapId uniqueMapId)
mapObj->setDrawOrder(++drawOrderCounter);
if (!mapObj->updateView())
{
ERROR_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << mapObj->debugInfo() << "'"
ERROR_LOG() << Q_FUNC_INFO << " debugInfo='" << mapObj->debugInfo() << "'"
<< " updateView failed";
}
INFO_LOG(m_logger) << LOGFUNCTION << " debugInfo='" << mapObj->debugInfo() << "'"
INFO_LOG() << Q_FUNC_INFO << " debugInfo='" << mapObj->debugInfo() << "'"
<< " set DrawOder to: " << drawOrderCounter;
}
}
@@ -1890,7 +1889,7 @@ void AdapterDds::onMapObjectRemoved(UniqueMapId uniqueMapId)
void AdapterDds::onParticipantOwnPositionChanged(const Point3D &newPos, int64_t sampleTime)
{
DEBUG_LOG(m_logger) << "Own Position Changed";
DEBUG_LOG() << "Own Position Changed";
if(!m_map)
return;
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.h
-2
View File
@@ -291,8 +291,6 @@ private:
QSharedPointer<ShootbackAreaToSituationMap> m_shootbackAreas;
LOGGER_T m_logger;
};
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.cpp
+28 -29
View File
@@ -137,21 +137,20 @@ public:
BuildingContamination::BuildingContamination(int drawOrder, QObject *parent)
: BaseClass(parent)
, m_logger(getLogger("BuildingContamination"))
, d(new Private())
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
d->m_drawOrder = drawOrder;
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
BuildingContamination::~BuildingContamination()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
this->stop();
delete d;
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
bool BuildingContamination::init(Map *map, PluginProvider *pluginProvider)
@@ -179,17 +178,17 @@ void BuildingContamination::removeAllObjects()
bool BuildingContamination::run()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (!d->m_map)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " no m_map";
ERROR_LOG() << Q_FUNC_INFO << " no m_map";
return false;
}
if (!m_bldDtc)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " no m_bldDtc";
ERROR_LOG() << Q_FUNC_INFO << " no m_bldDtc";
return false;
}
@@ -224,7 +223,7 @@ bool BuildingContamination::run()
RefPointer<Cube> cube = d->getCreateCube(buildingId, floorId);
if (!cube)
ERROR_LOG(m_logger) << LOGFUNCTION << " no cube created";
ERROR_LOG() << Q_FUNC_INFO << " no cube created";
cube->setVisibility(d->m_visible);
cube->setDrawOrder(d->m_drawOrder);
@@ -235,7 +234,7 @@ bool BuildingContamination::run()
cube->setHeight(height);
bool success = cube->updateView();
INFO_LOG(m_logger) << LOGFUNCTION << " cube->updateView " << success;
INFO_LOG() << Q_FUNC_INFO << " cube->updateView " << success;
};
@@ -246,15 +245,15 @@ bool BuildingContamination::run()
}
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
return true;
}
void BuildingContamination::stop()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
m_bldDtc->disconnect(this);
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
bool BuildingContamination::isVisible() const
@@ -270,7 +269,7 @@ bool BuildingContamination::setVisible(bool visible)
void BuildingContamination::onBuildingStateChanged(const Buildings::BuildingState &data, DataModification modType)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
const int buildingId = data.id();
@@ -287,19 +286,19 @@ void BuildingContamination::onBuildingStateChanged(const Buildings::BuildingStat
break;
}
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
void BuildingContamination::onResetBuildingState()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
d->removeCube();
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
void BuildingContamination::updateBuilding(int buildingId)
{
DEBUG_LOG(m_logger) << "update Building " << buildingId;
DEBUG_LOG() << "update Building " << buildingId;
const Buildings::BuildingState &bos = m_bldDtc->buildingState(buildingId);
@@ -308,7 +307,7 @@ void BuildingContamination::updateBuilding(int buildingId)
const auto contaminations = bos.contaminationStates();
DEBUG_LOG(m_logger) << "Statecount " << contaminations.size();
DEBUG_LOG() << "Statecount " << contaminations.size();
QSet<int> contaminatedFloors;
@@ -321,7 +320,7 @@ void BuildingContamination::updateBuilding(int buildingId)
rooms.insert(room);
}
DEBUG_LOG(m_logger) << "contaminated rooms " << rooms.size();
DEBUG_LOG() << "contaminated rooms " << rooms.size();
for (int room : rooms)
{
@@ -332,7 +331,7 @@ void BuildingContamination::updateBuilding(int buildingId)
}
}
DEBUG_LOG(m_logger) << "contaminated floors " << contaminatedFloors.size();
DEBUG_LOG() << "contaminated floors " << contaminatedFloors.size();
@@ -358,7 +357,7 @@ void BuildingContamination::updateBuilding(int buildingId)
const bool isContaminaed = contaminatedFloors.contains(floorId);
DEBUG_LOG(m_logger) << LOGFUNCTION
DEBUG_LOG() << Q_FUNC_INFO
<< " floorId=" << floorId
<< " height=" << height
<< " partyId=" << isContaminaed;
@@ -384,7 +383,7 @@ void BuildingContamination::updateBuilding(int buildingId)
cube->setHeight(height);
if (!cube->updateView())
ERROR_LOG(m_logger) << LOGFUNCTION << " cube->updateView() failed";
ERROR_LOG() << Q_FUNC_INFO << " cube->updateView() failed";
}
@@ -410,7 +409,7 @@ int BuildingContamination::findFloorIdByRoomId(int roomId) noexcept(false)
InfrastructureManagement::StructureElement roomSe;
if (!m_ismDtc->getStructureElementById(roomId, roomSe))
{
ERROR_LOG(m_logger) << "getStructureElementById roomId=" << roomId << " not found";
ERROR_LOG() << "getStructureElementById roomId=" << roomId << " not found";
return -1;
}
@@ -458,12 +457,12 @@ bool BuildingContamination::getRoom(int roomSeId, InfrastructureManagement::Stru
PositionCont BuildingContamination::retrieveBuildingGeometry(int buildingId, int floorId) const
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START"
TRACE_LOG() << Q_FUNC_INFO << " START"
<< " buildingId=" << buildingId
<< " floorId=" << floorId;
if (!m_ismDtc)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " no m_ismDtc";
ERROR_LOG() << Q_FUNC_INFO << " no m_ismDtc";
return PositionCont();
}
@@ -475,7 +474,7 @@ PositionCont BuildingContamination::retrieveBuildingGeometry(int buildingId, int
{
const InfrastructureManagement::MainFootprint &mainFootprint = m_ismDtc->mainFootprint(buildingId);
TRACE_LOG(m_logger) << LOGFUNCTION << " START"
TRACE_LOG() << Q_FUNC_INFO << " START"
<< " mainFootprint.elements().size()=" << mainFootprint.elements().size();
relPositions.reserve(mainFootprint.elements().size());
@@ -582,7 +581,7 @@ PositionCont BuildingContamination::retrieveBuildingGeometry(int buildingId, int
const Esri::ArcGISRuntime::ImmutablePointCollection &pointCollection = immutablePart.points();
const int size = pointCollection.size();
INFO_LOG(m_logger) << " pointCollection.size = " << pointCollection.size()
INFO_LOG() << " pointCollection.size = " << pointCollection.size()
<< " - buildingId = " << buildingId
<< ", mse.name = " << mse.name();
@@ -598,7 +597,7 @@ PositionCont BuildingContamination::retrieveBuildingGeometry(int buildingId, int
}
#endif
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
return absPositionsGeo;
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.h
-1
View File
@@ -64,7 +64,6 @@ protected:
private:
LOGGER_T m_logger;
QMap<int , int > m_roomToFloorCache;
QMap<int , InfrastructureManagement::StructureElement > m_roomStructureElementCache;
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_ownership.cpp
+22 -23
View File
@@ -213,21 +213,20 @@ public:
BuildingOwnership::BuildingOwnership(int drawOrder, QObject *parent)
: BaseClass(parent)
, m_logger(getLogger("BuildingOwnership"))
, d(new Private())
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
d->m_drawOrder = drawOrder;
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
BuildingOwnership::~BuildingOwnership()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
this->stop();
delete d;
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
bool BuildingOwnership::init(Map *map, PluginProvider *pluginProvider)
@@ -257,17 +256,17 @@ void BuildingOwnership::removeAllObjects()
bool BuildingOwnership::run()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (!d->m_map)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " no m_map";
ERROR_LOG() << Q_FUNC_INFO << " no m_map";
return false;
}
if (!m_cesDtc)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " no m_cesDtc";
ERROR_LOG() << Q_FUNC_INFO << " no m_cesDtc";
return false;
}
@@ -302,7 +301,7 @@ bool BuildingOwnership::run()
RefPointer<Cube> cube = d->getCreateCube(buildingId, floorId);
if (!cube)
ERROR_LOG(m_logger) << LOGFUNCTION << " no cube created";
ERROR_LOG() << Q_FUNC_INFO << " no cube created";
cube->setVisibility(d->m_visible);
cube->setDrawOrder(d->m_drawOrder);
@@ -313,7 +312,7 @@ bool BuildingOwnership::run()
cube->setHeight(height);
bool success = cube->updateView();
INFO_LOG(m_logger) << LOGFUNCTION << " cube->updateView " << success;
INFO_LOG() << Q_FUNC_INFO << " cube->updateView " << success;
};
@@ -324,15 +323,15 @@ bool BuildingOwnership::run()
}
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
return true;
}
void BuildingOwnership::stop()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
m_cesDtc->disconnect(this);
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
bool BuildingOwnership::isVisible() const
@@ -348,7 +347,7 @@ bool BuildingOwnership::setVisible(bool visible)
void BuildingOwnership::onBuildingOwnershipChanged(const CentralEffectSimulation::BuildingOwnership &data, DataModification modType)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
const int buildingId = data.buildingId();
@@ -365,14 +364,14 @@ void BuildingOwnership::onBuildingOwnershipChanged(const CentralEffectSimulation
break;
}
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
void BuildingOwnership::onResetBuildingOwnership()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
d->removeCube();
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
void BuildingOwnership::updateBuilding(int buildingId)
@@ -417,7 +416,7 @@ void BuildingOwnership::updateBuilding(int buildingId)
const int partyId = floor2Party.value(floorId, -1);
DEBUG_LOG(m_logger) << LOGFUNCTION
DEBUG_LOG() << Q_FUNC_INFO
<< " floorId=" << floorId
<< " height=" << height
<< " partyId=" << partyId;
@@ -437,7 +436,7 @@ void BuildingOwnership::updateBuilding(int buildingId)
cube->setHeight(height);
if (!cube->updateView())
ERROR_LOG(m_logger) << LOGFUNCTION << " cube->updateView() failed";
ERROR_LOG() << Q_FUNC_INFO << " cube->updateView() failed";
}
}
@@ -448,12 +447,12 @@ PositionCont BuildingOwnership::retrieveBuildingGeometry(int buildingId, int flo
PositionCont BuildingOwnership::retrieveBuildingGeometryInternal(int buildingId, int floorId) const
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START"
TRACE_LOG() << Q_FUNC_INFO << " START"
<< " buildingId=" << buildingId
<< " floorId=" << floorId;
if (!m_ismDtc)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " no m_ismDtc";
ERROR_LOG() << Q_FUNC_INFO << " no m_ismDtc";
return PositionCont();
}
@@ -465,7 +464,7 @@ PositionCont BuildingOwnership::retrieveBuildingGeometryInternal(int buildingId,
{
const InfrastructureManagement::MainFootprint &mainFootprint = m_ismDtc->mainFootprint(buildingId);
TRACE_LOG(m_logger) << LOGFUNCTION << " START"
TRACE_LOG() << Q_FUNC_INFO << " START"
<< " mainFootprint.elements().size()=" << mainFootprint.elements().size();
relPositions.reserve(mainFootprint.elements().size());
@@ -589,7 +588,7 @@ PositionCont BuildingOwnership::retrieveBuildingGeometryInternal(int buildingId,
}
#endif
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
return absPositionsGeo;
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_ownership.h
-2
View File
@@ -66,8 +66,6 @@ protected:
private:
LOGGER_T m_logger;
class Private;
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/buildinghitlineinfo_to_map.h
-1
View File
@@ -12,7 +12,6 @@
#include <Plugins/Buildings/bld_info_gui_plugin_interface.h>
#include <Plugins/FilterManagement/flt_data_plugin_interface.h>
#include <FilterManagement/flt_dtc.h>
#include <memory>
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/hitlineinfo_to_map.h
-1
View File
@@ -8,7 +8,6 @@
#include <MapObjects/hit_line.h>
#include <Buildings/bld_dtc.h>
#include <FilterManagement/flt_dtc.h>
#include <ParticipantManagement/ppm_dtc.h>
#include <ParticipantManagement/ppm_participant_info_gui_plugin_interface.h>
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_null_to_map.cpp
+22 -23
View File
@@ -17,7 +17,6 @@ DusMineStateProxy::DusMineStateProxy(QObject *parent)
: BaseClass(parent)
, m_lastDusMineState()
, m_lastItemView()
, m_logger(getLogger("DusMineStateProxy"))
{
}
@@ -34,10 +33,10 @@ bool DusMineStateProxy::init(PluginProvider *pluginProvider)
bool DusMineStateProxy::run()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (!m_aesDtc)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " no dtc";
ERROR_LOG() << Q_FUNC_INFO << " no dtc";
return false;
}
@@ -60,9 +59,9 @@ bool DusMineStateProxy::run()
void DusMineStateProxy::stop()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
this->disconnect();
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
bool DusMineStateProxy::dusMineStateAndPositionDatas(const std::function<void (const DusMineStateAndPositionData &)> &cb)
@@ -95,7 +94,7 @@ bool DusMineStateProxy::handleChanged(const AreaEffectSimulation::DusMineState &
if (ddsData.id() != 0)
return false;
TRACE_LOG(m_logger) << LOGFUNCTION << " START, ddsData.id()=" << ddsData.id()
TRACE_LOG() << Q_FUNC_INFO << " START, ddsData.id()=" << ddsData.id()
<< " ddsData.mines().size() = " << ddsData.mines().size();
if (modType == DataModification::eRemoved)
@@ -113,7 +112,7 @@ bool DusMineStateProxy::handleChanged(const AreaEffectSimulation::AesItemView &d
if (ddsData.id() != AreaEffectSimulation::AesType::AtMineAreaSingleMines)
return false;
TRACE_LOG(m_logger) << LOGFUNCTION << " START, ddsData.id()=" << ddsData.id()
TRACE_LOG() << Q_FUNC_INFO << " START, ddsData.id()=" << ddsData.id()
<< " ddsData.form().size() = " << ddsData.form().size();
if (modType == DataModification::eRemoved)
@@ -159,14 +158,14 @@ bool DusMineStateProxy::publishNewMap()
m_map = mapContVeryNew;
DEBUG_LOG(m_logger) << "Publishing new dus-mine map to situationMap adapter";
DEBUG_LOG() << "Publishing new dus-mine map to situationMap adapter";
return true;
}
const QMap<int32_t, DusMineStateAndPositionData> DusMineStateProxy::getFromDds()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, ddsData.id()=" << m_lastDusMineState.id()
TRACE_LOG() << Q_FUNC_INFO << " START, ddsData.id()=" << m_lastDusMineState.id()
<< " ddsData.mines().size() = " << m_lastDusMineState.mines().size();
QMap<int32_t, DusMineStateAndPositionData> mapCont;
@@ -179,7 +178,7 @@ const QMap<int32_t, DusMineStateAndPositionData> DusMineStateProxy::getFromDds()
int idx = 0;
for (const AreaEffectSimulation::DusMine &mine : mines)
{
DEBUG_LOG(m_logger) << LOGFUNCTION
DEBUG_LOG() << Q_FUNC_INFO
<< " idx=" << idx++
<< ", eqId=" << mine.eqId()
<< ", chargeTypeId=" << mine.chargeTypeId();
@@ -189,14 +188,14 @@ const QMap<int32_t, DusMineStateAndPositionData> DusMineStateProxy::getFromDds()
if (size != m_lastItemView.form().size())
{
ERROR_LOG(m_logger) << LOGFUNCTION << " ddsData.id()=" << m_lastDusMineState.id()
ERROR_LOG() << Q_FUNC_INFO << " ddsData.id()=" << m_lastDusMineState.id()
<< " size does not match"
<< " ddsData.mines().size() = " << mines.size()
<< " itemView.form().size() = " << m_lastItemView.form().size();
return mapCont;
}
DEBUG_LOG(m_logger) << LOGFUNCTION << " ddsData.id()=" << m_lastDusMineState.id()
DEBUG_LOG() << Q_FUNC_INFO << " ddsData.id()=" << m_lastDusMineState.id()
<< " size ::"
<< " ddsData.mines().size() = " << mines.size()
<< " itemView.form().size() = " << m_lastItemView.form().size();
@@ -212,7 +211,7 @@ const QMap<int32_t, DusMineStateAndPositionData> DusMineStateProxy::getFromDds()
pos
);
DEBUG_LOG(m_logger) << LOGFUNCTION << " i=" << i << ", id/eqId=" << dusMine.eqId() << ", pos=" << pos;
DEBUG_LOG() << Q_FUNC_INFO << " i=" << i << ", id/eqId=" << dusMine.eqId() << ", pos=" << pos;
mapCont.insert(dusMine.eqId(), dmsDdsData);
}
@@ -249,7 +248,7 @@ bool MineAreaNull2SituationMap::init(PluginProvider *pluginProvider)
{
m_dusMineStateProxy = new DusMineStateProxy(this);
if (!m_dusMineStateProxy->init(pluginProvider))
ERROR_LOG(m_logger) << LOGFUNCTION << " init failed for DusMineStateProxy";
ERROR_LOG() << Q_FUNC_INFO << " init failed for DusMineStateProxy";
}
return true;
}
@@ -257,11 +256,11 @@ bool MineAreaNull2SituationMap::init(PluginProvider *pluginProvider)
bool MineAreaNull2SituationMap::run()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (!m_dusMineStateProxy)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " no DusMineStateProxy";
ERROR_LOG() << Q_FUNC_INFO << " no DusMineStateProxy";
return false;
}
@@ -276,7 +275,7 @@ bool MineAreaNull2SituationMap::run()
handleChanged(data, DataModification::eAdded);
});
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
return true;
}
@@ -331,10 +330,10 @@ bool MineAreaNull2SituationMap::unifiedMapObjectData(UniqueMapId uniqueMapId, Un
bool MineAreaNull2SituationMap::updateVisibility(const Aes2SituationMap::DDS_TYPE &ddsData, RefPointer<Aes2SituationMap::MAP_TYPE> mapObj)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, simId=" << getSimId(ddsData);
TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << getSimId(ddsData);
if (!BaseClass::updateVisibility(ddsData, mapObj))
{
ERROR_LOG(m_logger) << LOGFUNCTION << " BaseClass::updateVisibility failed, simId=" << getSimId(ddsData);
ERROR_LOG() << Q_FUNC_INFO << " BaseClass::updateVisibility failed, simId=" << getSimId(ddsData);
return false;
}
@@ -351,9 +350,9 @@ bool MineAreaNull2SituationMap::updateVisibility(const Aes2SituationMap::DDS_TYP
}
if (bUpdateView && !mapObj->updateView())
ERROR_LOG(m_logger)<< LOGFUNCTION << " simId = " << getSimId(ddsData) << " XXXX updateView failed";
ERROR_LOG()<< Q_FUNC_INFO << " simId = " << getSimId(ddsData) << " XXXX updateView failed";
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
return true;
}
@@ -379,7 +378,7 @@ void MineAreaNull2SituationMap::onAesDisplayFilterChanged(AreaEffectSimulation::
bool MineAreaNull2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsData,
RefPointer<MAP_T> mapObj)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
mapObj->setVisibility(ObjectAppearance::Tactical, false);
@@ -414,7 +413,7 @@ bool MineAreaNull2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T
mapObj->setTextModifier(Participant::TextModifier::M_HigherFormation, QString::number(simId_eqId));
updateVisibility(ddsData, mapObj);
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
return true;
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_null_to_map.h
-2
View File
@@ -150,8 +150,6 @@ protected:
QMap<int32_t, DusMineStateAndPositionData> m_map;
QSharedPointer<MineAreaNull2SituationMap> m_mineAreaNull2SituationMap;
LOGGER_T m_logger;
};
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/pdm_handler.cpp
+1 -2
View File
@@ -27,7 +27,6 @@ QString toString(SpecialChargeType value)
PdmHandler::PdmHandler(const std::shared_ptr<ProjectDataManagement::Interface::Dtc> &dtcPdm)
: m_dtcPdm(dtcPdm)
, m_logger(getLogger("PdmHandler"))
{}
@@ -86,7 +85,7 @@ ProjectDataManagement::ChargeType PdmHandler::chargeTypeFromId(int chargeTypeId)
auto it = m_chargeTypes.constFind(chargeTypeId);
if (it == m_chargeTypes.cend())
{
WARNING_LOG(m_logger) << "Could not find charge type with id " << chargeTypeId;
WARNING_LOG() << "Could not find charge type with id " << chargeTypeId;
return ProjectDataManagement::ChargeType();
}
return it.value();
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/pdm_handler.h
-2
View File
@@ -76,7 +76,5 @@ private:
QMap<int, ProjectDataManagement::ChargeType> m_chargeTypes;
QMap<int, ProjectDataManagement::GearTypeChargeType> m_gearTypeChargeTypes;
bool m_bPdmInitialized{false};
LOGGER_T m_logger;
};
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/plugin_provider.h
+1 -1
View File
@@ -5,7 +5,7 @@
#include <memory>
#include <QObject>
#include <SituationMap/sitmapdds_export.h>
#include "sitmapdds_export.h"
namespace LtsAppDescriptor
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/sim_to_situation_map_tmpl.h
+28 -29
View File
@@ -161,7 +161,7 @@ public:
mapObj->updateView();
if (!mapObj->updateView())
ERROR_LOG(m_logger) << LOGFUNCTION << " updateElement failed, "
ERROR_LOG() << Q_FUNC_INFO << " updateElement failed, "
<< " uniqueMapId = " << uniqueMapId
<< " debugInfo='" << mapObj->debugInfo() << "'";
}
@@ -194,7 +194,6 @@ protected:
QMap<UniqueMapId, int32_t> m_uniqueMapId2SimId;
QString m_loggerName;
LOGGER_T m_logger;
};
@@ -266,7 +265,7 @@ protected:
virtual bool createElement(const DDS_T &ddsData)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START"
TRACE_LOG() << Q_FUNC_INFO << " START"
<< " simId = " << getSimId(ddsData);
const int32_t simId = getSimId(ddsData);
@@ -274,7 +273,7 @@ protected:
if (m_simId2UniqueMapId.contains(simId))
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " mapObject already exists"
DEBUG_LOG() << Q_FUNC_INFO << " mapObject already exists"
<< " simId = " << simId;
return true;
}
@@ -284,7 +283,7 @@ protected:
RefPointer<MAP_T> mapObj = m_objFac.create<MAP_T>(layername, debugInfo);
if (!mapObj)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " creation failed"
ERROR_LOG() << Q_FUNC_INFO << " creation failed"
<< " simId = " << simId;
return false;
}
@@ -298,14 +297,14 @@ protected:
const UniqueMapId uniqueMapId = mapObj->uniqueMapId();
if (!isUniqueMapIdValid(uniqueMapId))
{
ERROR_LOG(m_logger) << LOGFUNCTION << " uniqueMapId invalid"
ERROR_LOG() << Q_FUNC_INFO << " uniqueMapId invalid"
<< " simId = " << simId;
return false;
}
m_simId2UniqueMapId[simId] = uniqueMapId;
m_uniqueMapId2SimId[uniqueMapId] = simId;
DEBUG_LOG(m_logger) << LOGFUNCTION << " END";
DEBUG_LOG() << Q_FUNC_INFO << " END";
return true;
}
@@ -313,7 +312,7 @@ protected:
bool updateElement(const DDS_T &ddsData)
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " START"
DEBUG_LOG() << Q_FUNC_INFO << " START"
<< " simId = " << getSimId(ddsData);
const int32_t simId = getSimId(ddsData);
@@ -321,14 +320,14 @@ protected:
const UniqueMapId uniqueMapId = m_simId2UniqueMapId.value(simId, INVALID_MAP_ID);
if (!isUniqueMapIdValid(uniqueMapId))
{
ERROR_LOG(m_logger) << LOGFUNCTION << " not found" << " simId = " << simId;
ERROR_LOG() << Q_FUNC_INFO << " not found" << " simId = " << simId;
return false;
}
RefPointer<MAP_T> mapObj = m_objFac.get<MAP_T>(uniqueMapId);
if (!mapObj)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " not found in objFac"
ERROR_LOG() << Q_FUNC_INFO << " not found in objFac"
<< " simId = " << simId
<< " uniqueMapId = " << uniqueMapId;
return false;
@@ -337,7 +336,7 @@ protected:
bool success = updateElementImpl(ddsData, mapObj);
if (!success)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " updateElementImpl failed, "
ERROR_LOG() << Q_FUNC_INFO << " updateElementImpl failed, "
<< " simId = " << getSimId(ddsData);
return false;
}
@@ -348,7 +347,7 @@ protected:
if (!mapObj->updateView())
{
ERROR_LOG(m_logger) << LOGFUNCTION << " updateElement failed, "
ERROR_LOG() << Q_FUNC_INFO << " updateElement failed, "
<< " simId = " << getSimId(ddsData);
return false;
}
@@ -356,26 +355,26 @@ protected:
emit mapObjectChanged(uniqueMapId);
DEBUG_LOG(m_logger) << LOGFUNCTION << " END";
DEBUG_LOG() << Q_FUNC_INFO << " END";
return true;
}
bool removeElement(const DDS_T &ddsData)
{
const int32_t simId = getSimId(ddsData);
DEBUG_LOG(m_logger) << LOGFUNCTION << " START" << " simId = " << simId;
DEBUG_LOG() << Q_FUNC_INFO << " START" << " simId = " << simId;
return removeElement(simId);
}
virtual bool removeElement(const int32_t simId)
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " START" << " simId = " << simId;
DEBUG_LOG() << Q_FUNC_INFO << " START" << " simId = " << simId;
const UniqueMapId uniqueMapId = m_simId2UniqueMapId.value(simId, INVALID_MAP_ID);
if (!isUniqueMapIdValid(uniqueMapId))
{
TRACE_LOG(m_logger) << LOGFUNCTION << " not found"
TRACE_LOG() << Q_FUNC_INFO << " not found"
<< ", simId = " << simId;
return false;
}
@@ -389,12 +388,12 @@ protected:
}
else
{
ERROR_LOG(m_logger) << LOGFUNCTION << " not found in objFac"
ERROR_LOG() << Q_FUNC_INFO << " not found in objFac"
<< " simId = " << simId
<< " uniqueMapId = " << uniqueMapId;
}
DEBUG_LOG(m_logger) << LOGFUNCTION << " END";
DEBUG_LOG() << Q_FUNC_INFO << " END";
emit mapObjectRemoved(uniqueMapId);
@@ -423,7 +422,7 @@ protected:
bool handleChanged(const DDS_T &ddsData, DataModification modType)
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " START"
DEBUG_LOG() << Q_FUNC_INFO << " START"
<< " modType = " << modType
<< " simId = " << getSimId(ddsData);
@@ -446,7 +445,7 @@ protected:
success = this->removeElement(ddsData);
break;
}
DEBUG_LOG(m_logger) << LOGFUNCTION << " END";
DEBUG_LOG() << Q_FUNC_INFO << " END";
return success;
}
@@ -497,7 +496,7 @@ protected:
virtual void onWorkspaceIdChanged(const QString &newWorkspaceId)
{
DEBUG_LOG(my_logger) << LOGFUNCTION << ": onWorkspaceIdChanged: " << newWorkspaceId
DEBUG_LOG(my_logger) << Q_FUNC_INFO << ": onWorkspaceIdChanged: " << newWorkspaceId
<< ", m_pluginProvider->toString: " << m_pluginProvider->toString();
removeSymbolAppearanceCallback();
@@ -512,7 +511,7 @@ protected:
m_symbolAppearanceSettings->addChangedCallback(this);
else
{
ERROR_LOG(my_logger) << LOGFUNCTION << " addChangedCallback SymAppearance failed";
ERROR_LOG(my_logger) << Q_FUNC_INFO << " addChangedCallback SymAppearance failed";
#ifdef LTS_DEBUG
Q_ASSERT(false);
#endif
@@ -520,11 +519,11 @@ protected:
onSymbolAppearanceSettingsChanged(FilterManagement::SymbolAppearanceSettings::Part::All);
}
else
ERROR_LOG(my_logger) << LOGFUNCTION << " no FilterManagement flm";
ERROR_LOG(my_logger) << Q_FUNC_INFO << " no FilterManagement flm";
if (m_symbolAppearanceSettings && !m_symbolAppearanceSettings->isChangedCallbackRegistered(this))
for (int i=0; i<20;++i)
ERROR_LOG(my_logger) << LOGFUNCTION << " isChangedCallbackRegistered SymApp failure!!!";
ERROR_LOG(my_logger) << Q_FUNC_INFO << " isChangedCallbackRegistered SymApp failure!!!";
const auto buildingComponentIfc = m_pluginProvider->fltBuildingComponentIfc();
if (buildingComponentIfc)
@@ -536,7 +535,7 @@ protected:
m_buildingComponentSettings->addChangedCallback(this);
else
{
ERROR_LOG(my_logger) << LOGFUNCTION << " addChangedCallback BldgCmpnt failed";
ERROR_LOG(my_logger) << Q_FUNC_INFO << " addChangedCallback BldgCmpnt failed";
#ifdef LTS_DEBUG
Q_ASSERT(false);
#endif
@@ -544,11 +543,11 @@ protected:
onBuildingComponentSettingsChanged();
}
else if (m_pluginProvider->appId() == LtsAppDescriptor::App::ResourceManager)
ERROR_LOG(my_logger) << LOGFUNCTION << " no FilterManagement flm (fltBuildingComponentIfc)";
ERROR_LOG(my_logger) << Q_FUNC_INFO << " no FilterManagement flm (fltBuildingComponentIfc)";
if (m_buildingComponentSettings && !m_buildingComponentSettings->isChangedCallbackRegistered(this))
for (int i=0; i<20;++i)
ERROR_LOG(my_logger) << LOGFUNCTION << " isChangedCallbackRegistered BldgCmpnt failure!!!";
ERROR_LOG(my_logger) << Q_FUNC_INFO << " isChangedCallbackRegistered BldgCmpnt failure!!!";
}
private:
@@ -601,7 +600,7 @@ protected:
{
handleSymbolAppearanceSettings(mapObj);
if (!mapObj->updateView())
WARNING_LOG(my_logger) << LOGFUNCTION << " updateView failed,"
WARNING_LOG(my_logger) << Q_FUNC_INFO << " updateView failed,"
<< " mapObj = " << mapObj->debugInfo();
};
m_smBase->iterateObjects<MAP_T>(cb);
@@ -646,7 +645,7 @@ protected:
{
handleBuildingComponentSettings(mapObj);
if (!mapObj->updateView())
WARNING_LOG(my_logger) << LOGFUNCTION << " updateView failed,"
WARNING_LOG(my_logger) << Q_FUNC_INFO << " updateView failed,"
<< " mapObj = " << mapObj->debugInfo();
};
m_smBase->iterateObjects<MAP_T>(cb);
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_url_widget.cpp
+7 -8
View File
@@ -89,9 +89,8 @@ void ConfigureSingleMapUrl::onClose()
ConfigureMapUrlsWidget::ConfigureMapUrlsWidget(QWidget *parent)
: QWidget(parent)
, m_ui(new Ui::Configure_Urls_Widget)
, m_logger(getLogger("ConfigureMapUrlsWidget"))
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
m_ui->setupUi(this);
connect(m_ui->pbUp, &QPushButton::clicked, this, &ConfigureMapUrlsWidget::onUpClicked);
@@ -100,14 +99,14 @@ ConfigureMapUrlsWidget::ConfigureMapUrlsWidget(QWidget *parent)
connect(m_ui->pbModify, &QPushButton::clicked, this, &ConfigureMapUrlsWidget::onModfiyClicked);
connect(m_ui->pbRemove, &QPushButton::clicked, this, &ConfigureMapUrlsWidget::onRemoveClicked);
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
ConfigureMapUrlsWidget::~ConfigureMapUrlsWidget()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
delete m_ui;
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
void ConfigureMapUrlsWidget::setModel(ConfigureMapUrlModel *model)
@@ -172,7 +171,7 @@ void ConfigureMapUrlsWidget::onAddClicked()
}
void ConfigureMapUrlsWidget::addSingleUrl()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (!m_configureMapUrlModel)
return;
@@ -201,7 +200,7 @@ void ConfigureMapUrlsWidget::onModfiyClicked()
}
void ConfigureMapUrlsWidget::modifySingleUrl()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (!m_configureMapUrlModel)
return;
@@ -215,7 +214,7 @@ void ConfigureMapUrlsWidget::modifySingleUrl()
void ConfigureMapUrlsWidget::onRemoveClicked()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
int currentRow = m_ui->tvLayer->currentIndex().row();
m_configureMapUrlModel->removeRow(currentRow);
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_url_widget.h
-2
View File
@@ -104,8 +104,6 @@ private:
Ui::Configure_Urls_Widget *m_ui;
ConfigureMapUrlModel *m_configureMapUrlModel = nullptr;
bool m_placeholderTextFile = false;
LOGGER_T m_logger;
};
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_urls.cpp
+38 -39
View File
@@ -21,9 +21,8 @@ ConfigureMapUrls::ConfigureMapUrls(QWidget *parent)
, m_pluginProvider(nullptr)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_ui(new Ui::Configure_Urls)
, m_logger(getLogger("ConfigureMapUrls"))
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
m_ui->setupUi(this);
@@ -57,24 +56,24 @@ ConfigureMapUrls::ConfigureMapUrls(QWidget *parent)
setOnlineHelpFilename(QStringLiteral("Configuration_of_Modells_SLPKs"));
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
ConfigureMapUrls::~ConfigureMapUrls()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
delete m_ui;
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
bool ConfigureMapUrls::init(PluginProvider *pluginProvider)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
m_pluginProvider = pluginProvider;
if (!m_pluginProvider)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " no pluginProvider";
ERROR_LOG() << Q_FUNC_INFO << " no pluginProvider";
return false;
}
@@ -82,14 +81,14 @@ bool ConfigureMapUrls::init(PluginProvider *pluginProvider)
m_asmDtc = m_pluginProvider->asmDtc();
if (!m_asmDtc)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " Can not retrieve AssetManagement::DTC";
ERROR_LOG() << Q_FUNC_INFO << " Can not retrieve AssetManagement::DTC";
bRet = false;
}
m_asmFtc = m_pluginProvider->asmFtc();
if (!m_asmFtc)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " Can not retrieve AssetManagement::FTC";
ERROR_LOG() << Q_FUNC_INFO << " Can not retrieve AssetManagement::FTC";
bRet = false;
}
@@ -101,16 +100,16 @@ bool ConfigureMapUrls::init(PluginProvider *pluginProvider)
fillTrainingAreaCbx();
syncTaToGui();
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
return bRet;
}
void ConfigureMapUrls::fillTrainingAreaCbx()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (!m_asmDtc)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " no dtc";
ERROR_LOG() << Q_FUNC_INFO << " no dtc";
return;
}
@@ -136,18 +135,18 @@ void ConfigureMapUrls::fillTrainingAreaCbx()
const int newTrainingAreaId = m_ui->cbTrainingArea->currentData().toInt();
if (!retrieveTaOfService(newTrainingAreaId))
{
ERROR_LOG(m_logger) << LOGFUNCTION << " retrieveTrainingAreaOfService failed";
ERROR_LOG() << Q_FUNC_INFO << " retrieveTrainingAreaOfService failed";
return;
}
}
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
void ConfigureMapUrls::onSelectedTrainingAreaChanged(const QString & )
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
const int newTrainingAreaId = m_ui->cbTrainingArea->currentData().toInt();
if (m_trainingArea.id() == newTrainingAreaId)
return;
@@ -160,23 +159,23 @@ void ConfigureMapUrls::onSelectedTrainingAreaChanged(const QString & )
apply();
if (!retrieveTaOfService(newTrainingAreaId))
{
ERROR_LOG(m_logger) << LOGFUNCTION << " retrieveTrainingAreaOfService failed";
ERROR_LOG() << Q_FUNC_INFO << " retrieveTrainingAreaOfService failed";
return;
}
break;
case LtsWidgets::Button::Cancel:
INFO_LOG(m_logger) << LOGFUNCTION << " set back to m_trainingArea.id() = " << m_trainingArea.id();
INFO_LOG() << Q_FUNC_INFO << " set back to m_trainingArea.id() = " << m_trainingArea.id();
m_ui->cbTrainingArea->setCurrentIndex(m_ui->cbTrainingArea->findData(QVariant(m_trainingArea.id()), Qt::UserRole));
break;
case LtsWidgets::Button::Discard:
if (!retrieveTaOfService(newTrainingAreaId))
{
ERROR_LOG(m_logger) << LOGFUNCTION << " retrieveTrainingAreaOfService failed";
ERROR_LOG() << Q_FUNC_INFO << " retrieveTrainingAreaOfService failed";
return;
}
break;
default:
ERROR_LOG(m_logger) << LOGFUNCTION << " got unexpected!!!";
ERROR_LOG() << Q_FUNC_INFO << " got unexpected!!!";
break;
}
}
@@ -184,22 +183,22 @@ void ConfigureMapUrls::onSelectedTrainingAreaChanged(const QString & )
{
if (!retrieveTaOfService(newTrainingAreaId))
{
ERROR_LOG(m_logger) << LOGFUNCTION << " retrieveTrainingAreaOfService failed";
ERROR_LOG() << Q_FUNC_INFO << " retrieveTrainingAreaOfService failed";
return;
}
}
syncTaToGui();
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
bool ConfigureMapUrls::retrieveTaOfService(int trainingAreaId)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, trainingAreaId=" << trainingAreaId;
TRACE_LOG() << Q_FUNC_INFO << " START, trainingAreaId=" << trainingAreaId;
if (!m_asmDtc)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " no dtc";
ERROR_LOG() << Q_FUNC_INFO << " no dtc";
return false;
}
@@ -211,14 +210,14 @@ bool ConfigureMapUrls::retrieveTaOfService(int trainingAreaId)
AssetManagement::TrainingArea ta = m_asmDtc->trainingArea(trainingAreaId);
if (ta.id() != trainingAreaId)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " switch to m_trainingArea failed (taId=" << trainingAreaId << ")";
ERROR_LOG() << Q_FUNC_INFO << " switch to m_trainingArea failed (taId=" << trainingAreaId << ")";
return false;
}
m_trainingArea = ta;
INFO_LOG(m_logger) << LOGFUNCTION << " switch to m_trainingArea " << m_trainingArea.id()
INFO_LOG() << Q_FUNC_INFO << " switch to m_trainingArea " << m_trainingArea.id()
<< ", ta" << ta;
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
return true;
}
@@ -252,7 +251,7 @@ void basicConfig(ConfigureMapUrlsWidget *tv, bool showTypeMinMax = true)
void ConfigureMapUrls::syncTaToGui()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
ConfigureMapUrlsWidget *w;
@@ -260,7 +259,7 @@ void ConfigureMapUrls::syncTaToGui()
if (w && w->model())
{
w->model()->setData(vecToVec(m_trainingArea.map2D()));
TRACE_LOG(m_logger) << LOGFUNCTION << " model->rowCount()" << w->model()->rowCount();
TRACE_LOG() << Q_FUNC_INFO << " model->rowCount()" << w->model()->rowCount();
}
basicConfig(w);
@@ -275,7 +274,7 @@ void ConfigureMapUrls::syncTaToGui()
if (w && w->model())
{
w->model()->setData(vecToVec(m_trainingArea.scene3D()));
TRACE_LOG(m_logger) << LOGFUNCTION << " model->rowCount()" << w->model()->rowCount();
TRACE_LOG() << Q_FUNC_INFO << " model->rowCount()" << w->model()->rowCount();
}
basicConfig(w);
@@ -289,12 +288,12 @@ void ConfigureMapUrls::syncTaToGui()
w->model()->setData(vecToVec(m_trainingArea.sceneObjects()));
basicConfig(w, false);
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
void ConfigureMapUrls::syncGuiToTa()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
ConfigureMapUrlsWidget *w;
@@ -327,7 +326,7 @@ void ConfigureMapUrls::syncGuiToTa()
item.mapDescriptionTypeId(AssetManagement::MapDescriptionType_def::SceneObj);
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
void ConfigureMapUrls::retranslate()
@@ -338,11 +337,11 @@ void ConfigureMapUrls::retranslate()
bool ConfigureMapUrls::apply()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (!m_asmFtc)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " Can not retrieve AssetManagement::FTC";
ERROR_LOG() << Q_FUNC_INFO << " Can not retrieve AssetManagement::FTC";
return false;
}
@@ -353,24 +352,24 @@ bool ConfigureMapUrls::apply()
return m_asmFtc->trainingAreaModifyRequest(m_trainingArea, this);
});
TRACE_LOG(m_logger) << LOGFUNCTION << " END, scucess=" << success;
TRACE_LOG() << Q_FUNC_INFO << " END, scucess=" << success;
return success;
}
void ConfigureMapUrls::onTrainingAreaModifyReply(const Core::FunctionReplyObject &reply)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (reply.error())
{
ERROR_LOG(m_logger) << LOGFUNCTION << "Got onTrainingAreaModifyReply error: " << reply();
ERROR_LOG() << Q_FUNC_INFO << "Got onTrainingAreaModifyReply error: " << reply();
return;
}
INFO_LOG(m_logger) << LOGFUNCTION << " Got onTrainingAreaModifyReply with id " << reply.id();
INFO_LOG() << Q_FUNC_INFO << " Got onTrainingAreaModifyReply with id " << reply.id();
m_requestHelper->requestReply(reply);
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/ConfigureUrl/sitmap_configure_urls.h
-2
View File
@@ -72,8 +72,6 @@ private:
AssetManagement::TrainingArea m_trainingArea;
Ui::Configure_Urls *m_ui;
LOGGER_T m_logger;
};
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_model.cpp
+5 -6
View File
@@ -98,16 +98,15 @@ MapObjectModel::MapObjectModel(QObject *parent)
tr("Picture")
},
parent)
, m_logger(getLogger("MapObjectModel"))
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
MapObjectModel::~MapObjectModel()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
void MapObjectModel::initModel(Map *map)
@@ -442,7 +441,7 @@ UniqueMapId MapObjectModel::uniqueMapIdOfIndex(const QModelIndex &index) const
void MapObjectModel::onDataChanged(UniqueMapId uniqueMapId)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, uniqueMapId=" << uniqueMapId;
TRACE_LOG() << Q_FUNC_INFO << " START, uniqueMapId=" << uniqueMapId;
int row = findRowForUniqueMapId(uniqueMapId);
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_model.h
+1 -4
View File
@@ -148,10 +148,7 @@ private:
QMap<int, int> m_usedPartyIds;
QSet<QString> m_usedTypeName;
QMap<int, QString> m_usedVulnerabilities;
LOGGER_T m_logger;
QMap<int, QString> m_usedVulnerabilities;
friend class MapObjectProxyModel;
};
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_selection_widget.cpp
+20 -21
View File
@@ -309,38 +309,37 @@ void MapObjectSelectionLtsDialog::onServiceMonitorRequestedAdd()
MapObjectSelectionWidget::MapObjectSelectionWidget(QWidget *parent)
: BaseClass(parent)
, m_ui(new Ui::MapObjectSelectionDialog)
, m_logger(getLogger("MapObjectSelectionWidget"))
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
m_ui->setupUi(this);
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
MapObjectSelectionWidget::~MapObjectSelectionWidget()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
clearSelectionOfMapObjects(true);
delete m_ui;
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
bool MapObjectSelectionWidget::init(Map *map, AdapterDds *adapterDds)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (!map)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " no map";
ERROR_LOG() << Q_FUNC_INFO << " no map";
return false;
}
if (!adapterDds)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " no adapterDds";
ERROR_LOG() << Q_FUNC_INFO << " no adapterDds";
return false;
}
@@ -352,7 +351,7 @@ bool MapObjectSelectionWidget::init(Map *map, AdapterDds *adapterDds)
connect(&m_map->partyIdToColorFunctor(), &PartyIdToColorFunctor::partyChanged,
this, &MapObjectSelectionWidget::onPartyIdsChanged, Qt::UniqueConnection);
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
return true;
}
@@ -418,11 +417,11 @@ void MapObjectSelectionWidget::setMapObjectsToDisplay(const Map::RefPointerMapOb
void MapObjectSelectionWidget::setMapObjectsToDisplay(const QVector<UniqueMapId> &uniqueMapIds)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, uniqueMapIds.size()=" << uniqueMapIds.size();
TRACE_LOG() << Q_FUNC_INFO << " START, uniqueMapIds.size()=" << uniqueMapIds.size();
if (m_map.isNull())
{
ERROR_LOG(m_logger) << LOGFUNCTION << " no map";
ERROR_LOG() << Q_FUNC_INFO << " no map";
return;
}
@@ -482,7 +481,7 @@ void MapObjectSelectionWidget::setMapObjectsToDisplay(const QVector<UniqueMapId>
if (m_adapterDds->unifiedMapObjectData(uniqueMapId, umodOut))
mapObjectDataVec.append(dataFromUnified(uniqueMapId, umodOut));
else
ERROR_LOG(m_logger) << LOGFUNCTION << " unifiedMapObjectData failed, uniqueMapId=" << uniqueMapId;
ERROR_LOG() << Q_FUNC_INFO << " unifiedMapObjectData failed, uniqueMapId=" << uniqueMapId;
}
@@ -492,7 +491,7 @@ void MapObjectSelectionWidget::setMapObjectsToDisplay(const QVector<UniqueMapId>
m_ui->ltsDataView->setSortIndicator(MapObjectModel::Columns::EQUIPMENT_NUMBER, Qt::AscendingOrder);
m_ui->ltsDataView->setSortIndicator(MapObjectModel::Columns::PARTY, Qt::AscendingOrder);
TRACE_LOG(m_logger) << LOGFUNCTION << " END, uniqueMapIds.size()=" << uniqueMapIds.size();
TRACE_LOG() << Q_FUNC_INFO << " END, uniqueMapIds.size()=" << uniqueMapIds.size();
}
@@ -564,7 +563,7 @@ QVector<int> MapObjectSelectionWidget::visibleBuildingIds() const
bool MapObjectSelectionWidget::addMapObject(const UniqueMapId &uniqueMapId)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, uniqueMapId=" << uniqueMapId;
TRACE_LOG() << Q_FUNC_INFO << " START, uniqueMapId=" << uniqueMapId;
if (m_map.isNull() || m_adapterDds.isNull() || m_mapObjectModel.isNull())
return false;
@@ -576,13 +575,13 @@ bool MapObjectSelectionWidget::addMapObject(const UniqueMapId &uniqueMapId)
if (m_adapterDds->unifiedMapObjectData(uniqueMapId, umodOut))
return m_mapObjectModel->addMapObjectData(dataFromUnified(uniqueMapId, umodOut));
TRACE_LOG(m_logger) << LOGFUNCTION << " END, uniqueMapId=" << uniqueMapId;
TRACE_LOG() << Q_FUNC_INFO << " END, uniqueMapId=" << uniqueMapId;
return false;
}
bool MapObjectSelectionWidget::updateMapObject(const UniqueMapId &uniqueMapId)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, uniqueMapId=" << uniqueMapId;
TRACE_LOG() << Q_FUNC_INFO << " START, uniqueMapId=" << uniqueMapId;
if (m_map.isNull() || m_adapterDds.isNull() || !m_mapObjectModel)
return false;
@@ -594,20 +593,20 @@ bool MapObjectSelectionWidget::updateMapObject(const UniqueMapId &uniqueMapId)
if (m_adapterDds->unifiedMapObjectData(uniqueMapId, umodOut))
return m_mapObjectModel->updateMapObjectData(dataFromUnified(uniqueMapId, umodOut));
ERROR_LOG(m_logger) << LOGFUNCTION << " unifiedMapObjectData failed, uniqueMapId=" << uniqueMapId;
TRACE_LOG(m_logger) << LOGFUNCTION << " END, uniqueMapId=" << uniqueMapId;
ERROR_LOG() << Q_FUNC_INFO << " unifiedMapObjectData failed, uniqueMapId=" << uniqueMapId;
TRACE_LOG() << Q_FUNC_INFO << " END, uniqueMapId=" << uniqueMapId;
return false;
}
void MapObjectSelectionWidget::onMapObjectRemoved(UniqueMapId uniqueMapId)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, uniqueMapId=" << uniqueMapId;
TRACE_LOG() << Q_FUNC_INFO << " START, uniqueMapId=" << uniqueMapId;
if (!m_mapObjectModel)
return;
m_mapObjectModel->remove(uniqueMapId);
TRACE_LOG(m_logger) << LOGFUNCTION << " END, uniqueMapId=" << uniqueMapId;
TRACE_LOG() << Q_FUNC_INFO << " END, uniqueMapId=" << uniqueMapId;
}
void MapObjectSelectionWidget::onPartyIdsChanged()
@@ -648,7 +647,7 @@ void MapObjectSelectionWidget::onMapObjectClicked(UniqueMapId uniqueMapId)
void MapObjectSelectionWidget::onMapObjectEntered(const QModelIndex &index)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (!m_mapObjectModel)
return;
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_selection_widget.h
+1 -1
View File
@@ -3,7 +3,7 @@
#pragma once
#include <SituationMap/sitmapdds_export.h>
#include "sitmapdds_export.h"
#include <Map/map.h>
#include <LtsWidgets/lts_dialog.h>
#include <Common/situation_map_logging.h>
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/layers_model.cpp
+2 -3
View File
@@ -17,7 +17,6 @@ namespace SituationMap
LayersModel::LayersModel(LtsSession::LtsSession *session, QObject *parent)
: QAbstractTableModel(parent)
, m_session(session)
, m_logger(getLogger("LayersModel"))
{}
bool LayersModel::initModel(Map *situationMap)
@@ -62,9 +61,9 @@ bool LayersModel::initModel(Map *situationMap)
insertRow(li);
}
INFO_LOG(m_logger) << "initModel - #layers: " << m_vecData.size();
INFO_LOG() << "initModel - #layers: " << m_vecData.size();
for (const LayerInfo &item : std::as_const(m_vecData))
INFO_LOG(m_logger) << "initModel - layers: " << item.layerName;
INFO_LOG() << "initModel - layers: " << item.layerName;
return true;
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/layers_model.h
-1
View File
@@ -65,7 +65,6 @@ Q_SIGNALS:
private:
LtsSession::LtsSession *m_session{nullptr};
QVector<LayerInfo> m_vecData;
LOGGER_T m_logger;
QStringList m_layerDisplayNameFilterList{};
};
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_gui_plugin.cpp
+160 -161
View File
File diff suppressed because it is too large. Load diff
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_gui_plugin.h
-3
View File
@@ -521,8 +521,5 @@ private:
qint64 m_startTimeSec;
qint64 m_durationSec;
QVector<SituationReplayTime> m_sitReplayTimes;
NGL::INGLLogger &m_logger;
};
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_layer_control.cpp
+14 -15
View File
@@ -186,22 +186,21 @@ LayerControlDialog::LayerControlDialog(QWidget *parent)
, m_situationMap(nullptr)
, m_layersModel(nullptr)
, m_ui(new Ui::LayerControlDialog)
, m_logger(getLogger("LayerControlDialog"))
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
m_ui->setupUi(this);
m_ui->tvLayer->setItemDelegate(new SpinBoxDelegate(this));
setOnlineHelpFilename(QStringLiteral("Situation-Layer_Control"));
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
LayerControlDialog::~LayerControlDialog()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
delete m_layersModel;
delete m_ui;
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
void LayerControlDialog::retranslate()
@@ -211,7 +210,7 @@ void LayerControlDialog::retranslate()
bool LayerControlDialog::init(LtsSession::LtsSession *session, SituationMap::Map *map)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START " << " map=" << map;
TRACE_LOG() << Q_FUNC_INFO << " START " << " map=" << map;
if (!session || !map)
return false;
@@ -345,7 +344,7 @@ bool LayerControlDialog::init(LtsSession::LtsSession *session, SituationMap::Map
m_ui->tbBaseSurfaceOpacity->hide();
}
TRACE_LOG(m_logger) << LOGFUNCTION << " END " << " map=" << map;
TRACE_LOG() << Q_FUNC_INFO << " END " << " map=" << map;
return true;
}
@@ -417,7 +416,7 @@ void LayerControlDialog::onLoadButtonClicked()
void LayerControlDialog::onMapReady()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
onZoomSliderInit();
@@ -426,7 +425,7 @@ void LayerControlDialog::onMapReady()
m_ui->slBaseSurfaceOpacity->setValue(static_cast<int>(m_situationMap->baseSurfaceOpacity()*100.0f));
m_ui->slBaseSurfaceOpacity->setToolTip(QString::number(m_ui->slBaseSurfaceOpacity->value()));
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
void LayerControlDialog::onMapDestroyed()
@@ -436,13 +435,13 @@ void LayerControlDialog::onMapDestroyed()
void LayerControlDialog::onLayerParamterChanged()
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " XXXXXXXXX ";
DEBUG_LOG() << Q_FUNC_INFO << " XXXXXXXXX ";
if (!m_situationMap)
return;
if (m_ignoreLayerParameterChanged)
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " skip due to m_ignoreLayerParameterChanged";
DEBUG_LOG() << Q_FUNC_INFO << " skip due to m_ignoreLayerParameterChanged";
return;
}
@@ -473,7 +472,7 @@ void LayerControlDialog::onRotationOfMapChanged(double rotation)
void LayerControlDialog::onZoomSliderInit()
{
TRACE_LOG(m_logger) << LOGFUNCTION << "'" << " START";
TRACE_LOG() << Q_FUNC_INFO << "'" << " START";
if (!m_ui || !m_ui->slZoom)
return;
@@ -484,7 +483,7 @@ void LayerControlDialog::onZoomSliderInit()
if (m_ui->slZoom->minimum() == m_ui->slZoom->maximum())
{
WARNING_LOG(m_logger) << LOGFUNCTION << " min/max value are identical"
WARNING_LOG() << Q_FUNC_INFO << " min/max value are identical"
<< " minimum=" << m_ui->slZoom->minimum()
<< " maximum=" << m_ui->slZoom->maximum()
<< " value=" << m_ui->slZoom->value();
@@ -492,7 +491,7 @@ void LayerControlDialog::onZoomSliderInit()
m_ui->slZoom->setMinimum(static_cast<int>(sqrt(500)));
m_ui->slZoom->setMaximum(static_cast<int>(sqrt(100000)));
WARNING_LOG(m_logger) << LOGFUNCTION << " min/max value are identical"
WARNING_LOG() << Q_FUNC_INFO << " min/max value are identical"
<< " minimum=" << m_ui->slZoom->minimum()
<< " maximum=" << m_ui->slZoom->maximum()
<< " value=" << m_ui->slZoom->value();
@@ -505,7 +504,7 @@ void LayerControlDialog::onZoomSliderInit()
onMapExtentChanged();
m_ui->slZoom->blockSignals(false);
TRACE_LOG(m_logger) << LOGFUNCTION << "'" << " END";
TRACE_LOG() << Q_FUNC_INFO << "'" << " END";
}
void LayerControlDialog::onZoomSliderValueChanged()
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_layer_control.h
-1
View File
@@ -79,6 +79,5 @@ private:
LayersModel *m_layersModel;
Ui::LayerControlDialog *m_ui;
LOGGER_T m_logger;
};
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_register_app_handler.cpp
+28 -29
View File
@@ -20,10 +20,9 @@ static inline bool isScreenIdValid(const OperatorManagement::ActiveApp &item)
RegisterAppHandler::RegisterAppHandler()
: BaseClass()
, m_updateTimer(new QTimer(this))
, m_logger(getLogger("RegisterAppHandler"))
{
INFO_LOG(m_logger) << "RAH c_tor";
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
INFO_LOG() << "RAH c_tor";
TRACE_LOG() << Q_FUNC_INFO << " START";
m_activeApp.id(-1);
m_activeApp.appId(-1);
@@ -36,20 +35,20 @@ RegisterAppHandler::RegisterAppHandler()
m_updateTimer->setSingleShot(true);
m_updateTimer->setInterval(5000);
connect(m_updateTimer, &QTimer::timeout, this, &RegisterAppHandler::onUpdateTimeout);
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
RegisterAppHandler::~RegisterAppHandler()
{
INFO_LOG(m_logger) << "RAH d_tor";
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
INFO_LOG() << "RAH d_tor";
TRACE_LOG() << Q_FUNC_INFO << " START";
Q_ASSERT(m_finalized);
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
void RegisterAppHandler::finalize()
{
INFO_LOG(m_logger) << "RAH finalize";
INFO_LOG() << "RAH finalize";
QMetaObject::invokeMethod(this, [this]()
@@ -57,7 +56,7 @@ void RegisterAppHandler::finalize()
if (m_updateTimer)
m_updateTimer->stop();
deRegisterApp(m_activeApp);
INFO_LOG(m_logger) << "RAH finalize DONE";
INFO_LOG() << "RAH finalize DONE";
deleteLater();
m_finalized = true;
});
@@ -123,7 +122,7 @@ void RegisterAppHandler::deRegisterApp(QObject *plugin)
void RegisterAppHandler::registerApp(const OperatorManagement::ActiveApp &item)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START " << item;
TRACE_LOG() << Q_FUNC_INFO << " START " << item;
if (m_activeApp == item)
return;
@@ -135,50 +134,50 @@ void RegisterAppHandler::registerApp(const OperatorManagement::ActiveApp &item)
if (m_activeApp.id() <= 0)
m_updateTimer->start();
TRACE_LOG(m_logger) << LOGFUNCTION << " END " << item;
TRACE_LOG() << Q_FUNC_INFO << " END " << item;
}
void RegisterAppHandler::deRegisterApp(const OperatorManagement::ActiveApp &item)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START " << item;
TRACE_LOG() << Q_FUNC_INFO << " START " << item;
if (!isScreenIdValid(item))
return;
if (m_activeApp.id() <= 0)
{
WARNING_LOG(m_logger) << LOGFUNCTION << " nothing was registered, skip DeRegister - " << m_activeApp;
WARNING_LOG() << Q_FUNC_INFO << " nothing was registered, skip DeRegister - " << m_activeApp;
return;
}
if (!removeRequest())
WARNING_LOG(m_logger) << "removeRequest failed";
TRACE_LOG(m_logger) << LOGFUNCTION << " END" << item;
WARNING_LOG() << "removeRequest failed";
TRACE_LOG() << Q_FUNC_INFO << " END" << item;
}
bool RegisterAppHandler::updateRequest()
{
if (!m_opmFtc)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " no fltFtc!";
ERROR_LOG() << Q_FUNC_INFO << " no fltFtc!";
return false;
}
INFO_LOG(m_logger) << LOGFUNCTION << " startSingleRequest " << m_activeApp;
INFO_LOG() << Q_FUNC_INFO << " startSingleRequest " << m_activeApp;
try
{
INFO_LOG(m_logger) << "RAH update";
INFO_LOG() << "RAH update";
m_activeApp.id(m_opmFtc->activeAppUpdateRequest(m_activeApp));
}
catch(const std::runtime_error &err)
{
ERROR_LOG(m_logger) << "failed to update active app: " << err.what();
ERROR_LOG() << "failed to update active app: " << err.what();
Q_ASSERT(false);
return false;
}
DEBUG_LOG(m_logger) << LOGFUNCTION << " m_requestHelper->getRepliedId() " << m_activeApp.id();
DEBUG_LOG() << Q_FUNC_INFO << " m_requestHelper->getRepliedId() " << m_activeApp.id();
return true;
}
@@ -189,7 +188,7 @@ bool RegisterAppHandler::removeRequest()
if (!m_opmFtc)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " no fltFtc!";
ERROR_LOG() << Q_FUNC_INFO << " no fltFtc!";
return false;
}
@@ -198,13 +197,13 @@ bool RegisterAppHandler::removeRequest()
try
{
INFO_LOG(m_logger) << "RAH remove";
INFO_LOG() << "RAH remove";
m_opmFtc->activeAppRemoveRequest(Core::RemoveElementRequest(m_activeApp.id()));
return true;
}
catch (const std::runtime_error &err)
{
ERROR_LOG(m_logger) << "failed to remove active app: " << err.what();
ERROR_LOG() << "failed to remove active app: " << err.what();
Q_ASSERT(false);
return false;
}
@@ -212,9 +211,9 @@ bool RegisterAppHandler::removeRequest()
void RegisterAppHandler::onUpdateTimeout()
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " START" << " m_opmFtc = " << m_opmFtc
DEBUG_LOG() << Q_FUNC_INFO << " START" << " m_opmFtc = " << m_opmFtc
<< " m_activeApp = " << m_activeApp;
INFO_LOG(m_logger) << "RAH timer";
INFO_LOG() << "RAH timer";
updateRequest();
}
@@ -227,22 +226,22 @@ void RegisterAppHandler::handleSvcStartupRequest(const OperatorManagement::Activ
if ((data.operatorId() < 0) &&
(m_activeApp.appId() >= 0))
{
INFO_LOG(m_logger) << LOGFUNCTION << " startUpRequest recognized, reDo updateRequest";
INFO_LOG() << Q_FUNC_INFO << " startUpRequest recognized, reDo updateRequest";
updateRequest();
}
}
void RegisterAppHandler::onScreenIdChanged(int screenId, int screenContainerId, int screenTypeId)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, screenId=" << screenId << ", screenContainerId=" << screenContainerId << ", screenTypeId=" << screenTypeId;
TRACE_LOG() << Q_FUNC_INFO << " START, screenId=" << screenId << ", screenContainerId=" << screenContainerId << ", screenTypeId=" << screenTypeId;
INFO_LOG(m_logger) << LOGFUNCTION << " screenId: " << m_activeApp.screenId() << " -> " << screenId;
INFO_LOG() << Q_FUNC_INFO << " screenId: " << m_activeApp.screenId() << " -> " << screenId;
m_activeApp.screenTypeId(screenTypeId);
m_activeApp.screenId(screenId);
m_activeApp.screenContainerId(screenContainerId);
updateRequest();
TRACE_LOG(m_logger) << LOGFUNCTION << " END, screenId=" << screenId;
TRACE_LOG() << Q_FUNC_INFO << " END, screenId=" << screenId;
}
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_widget_control.cpp
+14 -15
View File
@@ -28,21 +28,20 @@ MapWidgetControl::MapWidgetControl(const QString &menuGroup, QWidget *parent)
, m_tbOverviewMap(nullptr)
, m_tb2D3D(nullptr)
, m_session(nullptr)
, m_logger(getLogger("MapWidgetControl"))
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
m_ui->setupUi(this);
setOnlineHelpFilename(QStringLiteral("Situation-Map_Widgets"));
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
MapWidgetControl::~MapWidgetControl()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
delete m_ui;
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
void MapWidgetControl::retranslate()
@@ -53,7 +52,7 @@ void MapWidgetControl::retranslate()
bool MapWidgetControl::init(SituationMap::Map *map, LtsSession::LtsSession *session )
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START " << " map=" << map;
TRACE_LOG() << Q_FUNC_INFO << " START " << " map=" << map;
if (!map)
return false;
@@ -63,12 +62,12 @@ bool MapWidgetControl::init(SituationMap::Map *map, LtsSession::LtsSession *sess
if (m_situationMap == nullptr)
{
ERROR_LOG(m_logger) << "invalid situation map given";
ERROR_LOG() << "invalid situation map given";
return false;
}
reBuildUi();
TRACE_LOG(m_logger) << LOGFUNCTION << " END " << " map=" << map;
TRACE_LOG() << Q_FUNC_INFO << " END " << " map=" << map;
return true;
}
@@ -89,7 +88,7 @@ bool MapWidgetControl::isReplay() const
{
if (m_situationMap == nullptr)
{
ERROR_LOG(m_logger) << "cannot check if situation map is in replay, no situation map available";
ERROR_LOG() << "cannot check if situation map is in replay, no situation map available";
return false;
}
return m_situationMap->isReplay();
@@ -105,7 +104,7 @@ void MapWidgetControl::onChangeModeRequested()
{
if (m_tb2D3D == nullptr)
{
ERROR_LOG(m_logger) << "cannot process change mode request, no 2D/3D option available";
ERROR_LOG() << "cannot process change mode request, no 2D/3D option available";
return;
}
m_tb2D3D->setEnabled(false);
@@ -134,7 +133,7 @@ void MapWidgetControl::reBuildUi()
if (m_situationMap == nullptr)
{
ERROR_LOG(m_logger) << "cannot rebuild ui, no situation map available";
ERROR_LOG() << "cannot rebuild ui, no situation map available";
return;
}
@@ -345,12 +344,12 @@ void MapWidgetControl::enaDisa()
if (m_situationMap == nullptr)
{
ERROR_LOG(m_logger) << "cannot enable/disable ui, no situation map available";
ERROR_LOG() << "cannot enable/disable ui, no situation map available";
return;
}
if ( m_tb2D3D && !enable3dMap)
{
DEBUG_LOG(m_logger) << "m_tb2D3D->hide();"
DEBUG_LOG() << "m_tb2D3D->hide();"
<< "m_enable3dMap=" << enable3dMap;
m_tb2D3D->hide();
}
@@ -363,13 +362,13 @@ void MapWidgetControl::enaDisa()
case Mode::Mode_2D:
m_tb2D3D->setText(tr("Switch to 3D"));
m_tb2D3D->setIcon(QIcon(QLatin1String("icon:map_3d.svg")));
DEBUG_LOG(m_logger) << "m_tb2D3D Switch to 3D"
DEBUG_LOG() << "m_tb2D3D Switch to 3D"
<< "enable3dMap=" << enable3dMap;
break;
case Mode::Mode_3D:
m_tb2D3D->setText(tr("Switch to 2D"));
m_tb2D3D->setIcon(QIcon(QLatin1String("icon:map_2d.svg")));
DEBUG_LOG(m_logger) << "m_tb2D3D Switch to 2D"
DEBUG_LOG() << "m_tb2D3D Switch to 2D"
<< "enable3dMap=" << enable3dMap;
break;
default:
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/sitmap_widget_control.h
-2
View File
@@ -73,8 +73,6 @@ private:
bool m_isBtn2D3Denabled = true;
LtsSession::LtsSession *m_session;
LOGGER_T m_logger;
};
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/situation_map_init.cpp
+58 -58
View File
@@ -174,24 +174,24 @@ SituationMapInit::SituationMapInit(QObject *parent)
: QObject(parent)
, m_logger(SituationMap::getLogger("SituationMapInit"))
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
SituationMapInit::~SituationMapInit()
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " START";
DEBUG_LOG() << Q_FUNC_INFO << " START";
if (m_pluginProvider == nullptr)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " !m_pluginProvider";
ERROR_LOG() << Q_FUNC_INFO << " !m_pluginProvider";
m_adapterDds.clear();
return;
}
if (!m_pluginProvider->isSessionValid())
{
INFO_LOG(m_logger) << LOGFUNCTION << " no session anymore: return";
INFO_LOG() << Q_FUNC_INFO << " no session anymore: return";
m_adapterDds.clear();
return;
}
@@ -211,30 +211,30 @@ SituationMapInit::~SituationMapInit()
if (m_situationMap)
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " MapCache: DELETE ...., isNull = " << m_situationMap->property(MapCacheState).isNull();
DEBUG_LOG(m_logger) << LOGFUNCTION << " MapCache: DELETE ...., property = '" << (m_situationMap ? m_situationMap->property(MapCacheState).toString().toStdString() : "-") << "'";
DEBUG_LOG() << Q_FUNC_INFO << " MapCache: DELETE ...., isNull = " << m_situationMap->property(MapCacheState).isNull();
DEBUG_LOG() << Q_FUNC_INFO << " MapCache: DELETE ...., property = '" << (m_situationMap ? m_situationMap->property(MapCacheState).toString().toStdString() : "-") << "'";
if (m_situationMap->property(MapCacheState).isNull())
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " MapCache: DELETE YES";
DEBUG_LOG() << Q_FUNC_INFO << " MapCache: DELETE YES";
delete m_situationMap;
m_situationMap.clear();
} else {
DEBUG_LOG(m_logger) << LOGFUNCTION << " MapCache: DELETE NO, setParent->null";
DEBUG_LOG() << Q_FUNC_INFO << " MapCache: DELETE NO, setParent->null";
m_situationMap->setParent(nullptr, true);
m_situationMap->setProperty(MapCacheState, QVariant());
}
}
#else
DEBUG_LOG(m_logger) << LOGFUNCTION << " DELETE situationMap: YES";
DEBUG_LOG() << Q_FUNC_INFO << " DELETE situationMap: YES";
delete m_situationMap;
m_situationMap.clear();
#endif
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
@@ -244,7 +244,7 @@ ThatPartyIdToColorFunctor::ThatPartyIdToColorFunctor(const std::shared_ptr<Parti
, m_ppmDtc(ppmDtc)
, m_logger(SituationMap::getLogger("ThatPartyIdToColorFunctor"))
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
m_ppmDtc->waitForHistoricalDataParty(1000);
@@ -255,12 +255,12 @@ ThatPartyIdToColorFunctor::ThatPartyIdToColorFunctor(const std::shared_ptr<Parti
{
onPartyChanged(data);
});
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
void ThatPartyIdToColorFunctor::onPartyChanged(const ParticipantManagement::Party &data, DataModification modType)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START"
TRACE_LOG() << Q_FUNC_INFO << " START"
<< ", modType= " << modType
<< " partyId=" << data.id()
<< " partyName='" << data.name() << "'"
@@ -286,16 +286,16 @@ void ThatPartyIdToColorFunctor::onPartyChanged(const ParticipantManagement::Part
bool SituationMapInit::initPluginProvider(SituationMap::PluginProvider *pluginProvider)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START " << " session=" << pluginProvider;
TRACE_LOG() << Q_FUNC_INFO << " START " << " session=" << pluginProvider;
m_pluginProvider = pluginProvider;
if (!m_pluginProvider)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " no plugin provider!";
ERROR_LOG() << Q_FUNC_INFO << " no plugin provider!";
return false;
}
TRACE_LOG(m_logger) << LOGFUNCTION << " START " << " session=" << pluginProvider;
TRACE_LOG() << Q_FUNC_INFO << " START " << " session=" << pluginProvider;
return true;
}
@@ -303,11 +303,11 @@ bool SituationMapInit::initPluginProvider(SituationMap::PluginProvider *pluginPr
bool SituationMapInit::initAdapter(QPointer<MovementTrackManager> &movementTrackMgr, bool resourceMode)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (!m_pluginProvider)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " no plugin provider!";
ERROR_LOG() << Q_FUNC_INFO << " no plugin provider!";
return false;
}
@@ -324,7 +324,7 @@ bool SituationMapInit::initAdapter(QPointer<MovementTrackManager> &movementTrack
if (!m_adapterDds->init(m_situationMap, m_pluginProvider, movementTrackMgr, resourceMode))
{
ERROR_LOG(m_logger) << LOGFUNCTION << " m_adapterDds->init failed";
ERROR_LOG() << Q_FUNC_INFO << " m_adapterDds->init failed";
return false;
}
@@ -356,7 +356,7 @@ bool SituationMapInit::initAdapter(QPointer<MovementTrackManager> &movementTrack
connect(m_adapterDds.data(), &AdapterDds::participantPositionChanged,
this, &SituationMapInit::participantPositionChanged);
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
return true;
}
@@ -407,7 +407,7 @@ bool SituationMapInit::clearObjects()
if (remainingObjectsCount != 0)
{
WARNING_LOG(m_logger) << LOGFUNCTION << " remainingObjectsCount should be '0', is: " << remainingObjectsCount;
WARNING_LOG() << Q_FUNC_INFO << " remainingObjectsCount should be '0', is: " << remainingObjectsCount;
}
return true;
@@ -468,7 +468,7 @@ bool SituationMapInit::enableGearRanges(int participantId, bool enable)
return false;
ptr->setRangesVisibility(enable);
if (!ptr->updateView())
ERROR_LOG(m_logger) << "Couldn't updateview after setting setRangesVisibility(" << enable << ") for SimId: " << participantId;
ERROR_LOG() << "Couldn't updateview after setting setRangesVisibility(" << enable << ") for SimId: " << participantId;
return true;
}
@@ -519,7 +519,7 @@ bool SituationMapInit::centerMapToAesObject(int entityId)
if (!bbox.isValid())
{
WARNING_LOG(m_logger) << LOGFUNCTION
WARNING_LOG() << Q_FUNC_INFO
<< " boundingBox not valid: bbox=" << bbox;
return false;
}
@@ -542,7 +542,7 @@ bool SituationMapInit::centerMapToBuildingObject(int entityId)
if (!bbox.isValid())
{
WARNING_LOG(m_logger) << LOGFUNCTION
WARNING_LOG() << Q_FUNC_INFO
<< " boundingBox not valid: bbox=" << bbox;
return false;
}
@@ -587,7 +587,7 @@ bool SituationMapInit::centerMapToMapObject(MapObjectType mot, int entityId)
if (!bbox.isValid())
{
WARNING_LOG(m_logger) << LOGFUNCTION
WARNING_LOG() << Q_FUNC_INFO
<< " boundingBox not valid: bbox=" << bbox;
return false;
}
@@ -800,7 +800,7 @@ void SituationMapInit::modifyViewshed(double alpha, double innerRadius, double o
if (m_viewshedId >= 0)
m_situationMap->viewshed().modify(m_viewshedId, alpha, innerRadius, observerHeight, targetHeight, beamAngle);
else
DEBUG_LOG(m_logger) << LOGFUNCTION << " m_viewshedId invalid (" << m_viewshedId << ")";
DEBUG_LOG() << Q_FUNC_INFO << " m_viewshedId invalid (" << m_viewshedId << ")";
}
}
@@ -886,22 +886,22 @@ SituationMap::RB::RubberbandFactory &SituationMapInit::rubberbandFactory()
ResourceManagerMode SituationMapInit::resourceManagerMode() const
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (!m_adapterDds)
return ResourceManagerMode::Undefined;
ResourceManagerMode rmm = m_adapterDds->resourceManagerMode();
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
return rmm;
}
bool SituationMapInit::setResourceManagerMode(ResourceManagerMode rmm)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (!m_adapterDds)
return false;
bool success = m_adapterDds->setResourceManagerMode(rmm);
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
return success;
}
@@ -953,7 +953,7 @@ static QVector<BaseUrl> convertMapDecription2BaseUrlVec(const std::vector<AssetM
bool SituationMapInit::trainingAreaExists() const
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (!m_pluginProvider->exmDtc() || !m_pluginProvider->asmDtc())
return false;
@@ -968,7 +968,7 @@ bool SituationMapInit::trainingAreaExists() const
const AssetManagement::TrainingArea &ta = m_pluginProvider->asmDtc()->trainingArea(trainingAreaId);
TRACE_LOG(m_logger) << LOGFUNCTION << " END, trainingAreaExists = " << (ta.id() == trainingAreaId);
TRACE_LOG() << Q_FUNC_INFO << " END, trainingAreaExists = " << (ta.id() == trainingAreaId);
return (ta.id() == trainingAreaId);
}
@@ -986,7 +986,7 @@ MapSettingsJson SituationMapInit::getMapSettingsFromService() const
if (ta.id() != trainingAreaId)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " TrainingArea does not exists (yet)";
ERROR_LOG() << Q_FUNC_INFO << " TrainingArea does not exists (yet)";
return msj;
}
@@ -1002,7 +1002,7 @@ MapSettingsJson SituationMapInit::getMapSettingsFromService() const
bool SituationMapInit::initMap(bool enableSelection, SituationMap::Mode mapMode, const SituationMap::Viewpoint2D &viewPoint)
{
INFO_LOG(m_logger) << LOGFUNCTION << " START, enableSelection=" << enableSelection
INFO_LOG() << Q_FUNC_INFO << " START, enableSelection=" << enableSelection
<< ", mapMode=" << mapMode;
#ifdef USE_MAP_CACHE
@@ -1023,11 +1023,11 @@ bool SituationMapInit::initMap(bool enableSelection, SituationMap::Mode mapMode,
{
m_situationMap = mapCacheItemRef.m_mapWidget;
m_situationMap->setProperty(MapCacheState, QVariant(QStringLiteral("3D/reUsed/taken")));
DEBUG_LOG(m_logger) << LOGFUNCTION << " MapCache: ReUse Mode_3D"
DEBUG_LOG() << Q_FUNC_INFO << " MapCache: ReUse Mode_3D"
<< " (updatesEnabled()=" << m_situationMap->updatesEnabled() << ")";
reUsing = true;
} else {
DEBUG_LOG(m_logger) << LOGFUNCTION << " MapCache: CREATE Mode_3D";
DEBUG_LOG() << Q_FUNC_INFO << " MapCache: CREATE Mode_3D";
m_situationMap = SituationMap::Map::create();
mapCacheItemRef.m_mapWidget = m_situationMap;
mapCacheItemRef.m_mapWidget->setProperty(MapCacheState, QVariant(QStringLiteral("3D/created")));
@@ -1071,7 +1071,7 @@ bool SituationMapInit::initMap(bool enableSelection, SituationMap::Mode mapMode,
if (m_situationMap == nullptr)
{
FATAL_LOG(m_logger) << LOGFUNCTION << " map not available!";
FATAL_LOG(m_logger) << Q_FUNC_INFO << " map not available!";
return false;
}
@@ -1081,7 +1081,7 @@ bool SituationMapInit::initMap(bool enableSelection, SituationMap::Mode mapMode,
#endif
INFO_LOG(m_logger) << LOGFUNCTION << " ***** initMap:"
INFO_LOG() << Q_FUNC_INFO << " ***** initMap:"
<< ", mapMode=" << mapMode
<< ", m_pluginProvider->toString=" << m_pluginProvider->toString()
<< ", exerciseId()= " << m_pluginProvider->exerciseId();
@@ -1102,7 +1102,7 @@ bool SituationMapInit::initMap(bool enableSelection, SituationMap::Mode mapMode,
const bool bTrainingAreaExists = this->trainingAreaExists();
INFO_LOG(m_logger) << LOGFUNCTION << " bTrainingAreaExists=" << bTrainingAreaExists
INFO_LOG() << Q_FUNC_INFO << " bTrainingAreaExists=" << bTrainingAreaExists
<< ", m_pluginProvider->toString " << m_pluginProvider->toString();
bool bIsOfTypeOrganizer =
@@ -1130,7 +1130,7 @@ bool SituationMapInit::initMap(bool enableSelection, SituationMap::Mode mapMode,
{
int tries = waitForTa->property("tries").toInt();
INFO_LOG(m_logger) << LOGFUNCTION << " waiting for trainingAreaExists " << trainingAreaExists() << ", tries = " << tries;
INFO_LOG() << Q_FUNC_INFO << " waiting for trainingAreaExists " << trainingAreaExists() << ", tries = " << tries;
if (this->trainingAreaExists())
{
@@ -1139,7 +1139,7 @@ bool SituationMapInit::initMap(bool enableSelection, SituationMap::Mode mapMode,
const MapSettingsJson &mapSettingsFromService = getMapSettingsFromService();
if (!initMapPart2(mapMode, viewPoint, &mapSettingsFromService))
ERROR_LOG(m_logger) << LOGFUNCTION << " initMapPart2 failed";
ERROR_LOG() << Q_FUNC_INFO << " initMapPart2 failed";
}
if (tries > 30)
@@ -1148,11 +1148,11 @@ bool SituationMapInit::initMap(bool enableSelection, SituationMap::Mode mapMode,
waitForTa->stop();
NOTICE_LOG(m_logger) << LOGFUNCTION << " waiting for trainingAreaExists " << trainingAreaExists() << ", tries = " << tries
NOTICE_LOG(m_logger) << Q_FUNC_INFO << " waiting for trainingAreaExists " << trainingAreaExists() << ", tries = " << tries
<< " giving up";
if (!initMapPart2(mapMode, viewPoint))
ERROR_LOG(m_logger) << LOGFUNCTION << " initMapPart2 failed";
ERROR_LOG() << Q_FUNC_INFO << " initMapPart2 failed";
return;
}
waitForTa->setProperty("tries", ++tries);
@@ -1163,7 +1163,7 @@ bool SituationMapInit::initMap(bool enableSelection, SituationMap::Mode mapMode,
return true;
}
TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
TRACE_LOG() << Q_FUNC_INFO << " END, success=" << success;
return success;
}
@@ -1171,19 +1171,19 @@ bool SituationMapInit::initMapPart2(SituationMap::Mode mapMode,
const SituationMap::Viewpoint2D &viewPoint,
const MapSettingsJson* mapSettingJson)
{
INFO_LOG(m_logger) << LOGFUNCTION << " mapSettingJson=" << mapSettingJson;
INFO_LOG() << Q_FUNC_INFO << " mapSettingJson=" << mapSettingJson;
bool success = true;
const QString initFilePath = NGL::findFile(NGL::FileType::ConfigFile, QStringLiteral("situation_map_defaults.ini"));
if (!QFile::exists(initFilePath))
{
FATAL_LOG(m_logger) << LOGFUNCTION << " MapIniFile location failed, used path: '" << initFilePath << "'";
FATAL_LOG(m_logger) << Q_FUNC_INFO << " MapIniFile location failed, used path: '" << initFilePath << "'";
assert(false);
return false;
}
else
DEBUG_LOG(m_logger) << LOGFUNCTION << " ***** MapIniFile found: " << initFilePath;
DEBUG_LOG() << Q_FUNC_INFO << " ***** MapIniFile found: " << initFilePath;
SituationMap::MapSettings *mapSettings =
@@ -1198,7 +1198,7 @@ bool SituationMapInit::initMapPart2(SituationMap::Mode mapMode,
if (mapInitializer->hasErrors())
{
FATAL_LOG(m_logger) << LOGFUNCTION << " MapInitializer-filename='" << mapInitializer->filename()
FATAL_LOG(m_logger) << Q_FUNC_INFO << " MapInitializer-filename='" << mapInitializer->filename()
<< "'' has following errors: "
<< " exists = " << mapInitializer->exists()
<< " accessError = " << mapInitializer->accessError()
@@ -1215,13 +1215,13 @@ bool SituationMapInit::initMapPart2(SituationMap::Mode mapMode,
SituationMap::FunctionDialog::addButtonToMap(m_situationMap);
#endif
TRACE_LOG(m_logger) << LOGFUNCTION << " END, success=" << success;
TRACE_LOG() << Q_FUNC_INFO << " END, success=" << success;
return success;
}
void SituationMapInit::myMapWidgetDialogIsAboutToBeClosed()
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " START";
DEBUG_LOG() << Q_FUNC_INFO << " START";
if (m_adapterDds)
@@ -1239,7 +1239,7 @@ void SituationMapInit::myMapWidgetDialogIsAboutToBeClosed()
INFO_LOG(m_logger) << LOGFUNCTION << " MapCache: prevent destruction";
INFO_LOG() << Q_FUNC_INFO << " MapCache: prevent destruction";
m_situationMap->setParent(nullptr, true);
}
@@ -1260,7 +1260,7 @@ bool SituationMapInit::updateAll()
if (!m_situationMap->isReady())
{
INFO_LOG(m_logger) << LOGFUNCTION << " Map Not ready Yet: Skip ";
INFO_LOG() << Q_FUNC_INFO << " Map Not ready Yet: Skip ";
return false;
}
@@ -1270,19 +1270,19 @@ bool SituationMapInit::updateAll()
void SituationMapInit::onMapbeginDestroy()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (m_adapterDds)
{
m_adapterDds->stop();
m_adapterDds.clear();
}
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
void SituationMapInit::onMapObjectsClicked(const SituationMap::Map::RefPointerMapObjectList &mapObjList,
const QPointF &viewportPosition)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " ViewPort X: " << viewportPosition.x() << " Y: " << viewportPosition.y();
TRACE_LOG() << Q_FUNC_INFO << " ViewPort X: " << viewportPosition.x() << " Y: " << viewportPosition.y();
onMapObjectClickedByArea(mapObjList);
}
@@ -1323,7 +1323,7 @@ void SituationMapInit::onMapObjectClickedByArea(const SituationMap::Map::RefPoin
const auto &mapObj = mapObjList.front();
{
if (!m_adapterDds->onMapObjectClicked(mapObj))
WARNING_LOG(m_logger) << LOGFUNCTION << " Click on a map object but found no handler for it ... "
WARNING_LOG() << Q_FUNC_INFO << " Click on a map object but found no handler for it ... "
<< " mapObj: debugInfo='" << mapObj->debugInfo() << "'"
<< " uniqueMapId=" << mapObj->uniqueMapId();
}
@@ -1338,7 +1338,7 @@ void SituationMapInit::onProcessMapObjectClicked(const QVector<SituationMap::Uni
if (!m_adapterDds)
return;
if (!m_adapterDds->onMapObjectsClicked(uniqueMapIds))
WARNING_LOG(m_logger) << LOGFUNCTION << " onMapObjectsClicked failed ... ";
WARNING_LOG() << Q_FUNC_INFO << " onMapObjectsClicked failed ... ";
}
void SituationMapInit::onContextMenuRequested(const SituationMap::Map::RefPointerMapObjectList &mapObjList,
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/situation_map_init.h
+1 -4
View File
@@ -3,7 +3,7 @@
#pragma once
#include <SituationMap/sitmapdds_export.h>
#include "sitmapdds_export.h"
#include <Map/map.h>
#include <Map/viewpoint2D.h>
@@ -176,8 +176,5 @@ private:
QPointer<SituationMap::Map> m_situationMap;
long m_viewshedId{-1};
QMetaObject::Connection m_viewshedFinishedConnection;
NGL::INGLLogger &m_logger;
};
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/situation_map_init_p.h
-1
View File
@@ -120,6 +120,5 @@ protected Q_SLOTS:
private:
bool m_doRemovePartyFlag = true;
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
NGL::INGLLogger &m_logger;
};
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/terrain_profile_handler.cpp
+1 -2
View File
@@ -12,7 +12,6 @@ namespace SituationMap
{
TerrainProfileHandler::TerrainProfileHandler(const QString &menuGroup)
: m_menuGroup(menuGroup)
, m_logger(getLogger("TerrainProfileHandler"))
{}
TerrainProfileHandler::~TerrainProfileHandler()
@@ -56,7 +55,7 @@ bool TerrainProfileHandler::showTerrainProfileResults(long id, const QVector<QPa
if (!m_situationMap || !m_session)
return false;
DEBUG_LOG(m_logger) << LOGFUNCTION << " START" << " id=" << id << " results.size()=" << results.size();
DEBUG_LOG() << Q_FUNC_INFO << " START" << " id=" << id << " results.size()=" << results.size();
const LtsWidgets::LayoutArea layoutArea = LtsWidgets::LayoutArea::eDialogTab;
const QString &identifier = QStringLiteral("TerrainProfile");
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/terrain_profile_handler.h
-1
View File
@@ -35,6 +35,5 @@ private:
QPointer<SituationMap::Map> m_situationMap;
QPointer<SituationMap::TerrainProfileDialog> m_terrainProfileDialog;
QString m_menuGroup;
NGL::INGLLogger &m_logger;
};
}