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);