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

Adds immediate migration results in progress

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

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.cpp
+115 -116
View File
@@ -83,11 +83,10 @@
namespace SituationMap
{
AdapterDds::AdapterDds(QObject *parent)
: QObject(parent)
{
TRACE_LOG() << Q_FUNC_INFO << " START DDDDDDDD" ;
TRACE_LOG() << Q_FUNC_INFO << " END" ;
AdapterDds::AdapterDds(QObject *parent) : QObject(parent),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START DDDDDDDD" ;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
}
AdapterDds::~AdapterDds()
@@ -120,7 +119,7 @@ AdapterDds::~AdapterDds()
bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<MovementTrackManager> &movementTrackMgr, bool resourceMode)
{
TRACE_LOG() << Q_FUNC_INFO << " START" ;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START" ;
if (!map || !pluginProvider)
return false;
@@ -143,7 +142,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
participantLayername,
"Participant2SituationMap"));
if (!m_particpants->init(&m_map->layerFactory(), m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
@@ -169,7 +168,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
drawOrder,
"HitlineInfo2SituationMap"));
if (!m_hitlineInfo2SituationMap->init(m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
}
{
@@ -183,7 +182,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
drawOrder,
"BldHitlineInfo2SituationMap"));
if (!m_bldHitlineInfo2SituationMap->init(m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
}
}
@@ -243,7 +242,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if(!sim2Map->init(m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
}
@@ -274,7 +273,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
}
{
@@ -288,7 +287,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
}
{
@@ -302,7 +301,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(contIdx)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
}
{
@@ -316,7 +315,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
}
{
@@ -330,7 +329,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
}
@@ -355,7 +354,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
}
int drawOrder = 0;
@@ -374,7 +373,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
}
{
@@ -391,7 +390,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
}
@@ -403,16 +402,16 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
drawOrder++,
"ChargeEffectToMap"));
if (!m_chargeEffects->init(m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed (ChargeEffectToMap)";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed (ChargeEffectToMap)";
else
DEBUG_LOG() << Q_FUNC_INFO << " ChargeEffect2Map for ChargeEffect prepared";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " ChargeEffect2Map for ChargeEffect prepared";
}
}
if (m_map->mode() == Mode::Mode_3D)
{
INFO_LOG() << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral";
INFO_LOG(m_logger) << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral";
initRenderer3D_AesCentral_Booby(layernameAesCentral, {AreaEffectSimulation::AesType_def::AtBoobyTrap, AreaEffectSimulation::AesType_def::AtOffRouteMine});
}
@@ -427,7 +426,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG()<<Q_FUNC_INFO <<" init failed";
ERROR_LOG(m_logger)<<Q_FUNC_INFO <<" init failed";
}
{
@@ -441,7 +440,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG()<<Q_FUNC_INFO <<" init failed";
ERROR_LOG(m_logger)<<Q_FUNC_INFO <<" init failed";
}
}
@@ -460,7 +459,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
}
{
@@ -474,7 +473,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
}
{
@@ -488,7 +487,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
}
{
@@ -502,7 +501,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
}
@@ -519,7 +518,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
}
@@ -536,7 +535,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
}
@@ -554,7 +553,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
}
@@ -570,7 +569,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
m_aes2MapCont[static_cast<int>(aesType)] = sim2Map;
}
if (!sim2Map->init(m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
}
@@ -609,9 +608,9 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
emergencyCallLayername,
0, "EmergencyCallToMap"));
if (!m_emergencyCalls->init(m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed (EmergencyCallToMap)";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed (EmergencyCallToMap)";
else
DEBUG_LOG() << Q_FUNC_INFO << " EmergencyCallToMap for AlmEmergencyCalls prepared";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " EmergencyCallToMap for AlmEmergencyCalls prepared";
}
}
@@ -627,7 +626,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() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
@@ -641,7 +640,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
drawOrder++,
"TrainingAreaToSituationMap"));
if (!m_trainingAreas->init(m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
}
m_specialAreas = QSharedPointer<SpecialAreaToSituationMap>(new SpecialAreaToSituationMap(m_map->objectFactory(),
@@ -649,7 +648,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
drawOrder++,
"SpecialAreaToSituationMap"));
if (!m_specialAreas->init(m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
@@ -658,7 +657,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
drawOrder++,
"MountingPointToMap"));
if (!m_mountingPoints->init(m_pluginProvider, resourceMode))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
@@ -667,7 +666,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
drawOrder++,
"SoundAreaToMap"));
if (!m_soundAreas->init(m_pluginProvider, resourceMode))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
if (!resourceMode)
@@ -678,7 +677,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
drawOrder++,
"MsePointToMap"));
if (!m_msePoints->init(m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
m_mseBridges = QSharedPointer<MSEBridgeToMap>(new MSEBridgeToMap(m_map->objectFactory(),
@@ -686,7 +685,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
drawOrder++,
"MseBridgeToMap"));
if (!m_mseBridges->init(m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
}
@@ -695,7 +694,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
drawOrder++,
"ShootbackAreaToSituationMap"));
if (!m_shootbackAreas->init(m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
const bool bIsOfTypeOrganizer =
(m_pluginProvider->operatorId() == 99) ||
@@ -709,7 +708,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
drawOrder++,
"GuezIed2SituationMap"));
if (!m_guezIeds->init(m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
}
@@ -719,7 +718,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
drawOrder++,
"NineLiner2SituationMap"));
if (!m_guezNasat9Liner->init(m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
@@ -730,14 +729,14 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
if (m_buildingOwnership)
if (!m_buildingOwnership->init(m_map, m_pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << 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() << Q_FUNC_INFO << " init failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed";
@@ -776,7 +775,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer<Movemen
}
TRACE_LOG() << Q_FUNC_INFO << " END" ;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
return true;
}
@@ -785,7 +784,7 @@ bool AdapterDds::initRenderer3D_AesExtrusion()
if (m_map->mode() != Mode::Mode_3D)
return false;
INFO_LOG() << Q_FUNC_INFO << " START";
INFO_LOG(m_logger) << Q_FUNC_INFO << " START";
@@ -800,15 +799,15 @@ bool AdapterDds::initRenderer3D_AesExtrusion()
connect(m_map, &Map::partysChangedDelayed, this, [this] () {
DEBUG_LOG() << Q_FUNC_INFO << " partysChangedDelayed ********";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " partysChangedDelayed ********";
bool successAes = assignUniqueValueRendererAesCentral3DExtrusion(layernameAes);
if (successAes)
INFO_LOG() << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral3DExtrusion okay" << " ('" << layernameAes << "')";
INFO_LOG(m_logger) << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral3DExtrusion okay" << " ('" << layernameAes << "')";
else
for (int i=0; i<5; ++i)
ERROR_LOG() << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral3DExtrusion failed" << " ('" << layernameAes << "')";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral3DExtrusion failed" << " ('" << layernameAes << "')";
@@ -824,14 +823,14 @@ bool AdapterDds::initRenderer3D_AesExtrusion()
bool successAes = assignUniqueValueRendererAesCentral3DExtrusion(layernameAes);
if (successAes)
INFO_LOG() << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral3DExtrusion okay" << " ('" << layernameAes << "')";
INFO_LOG(m_logger) << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral3DExtrusion okay" << " ('" << layernameAes << "')";
else
for (int i=0; i<5; ++i)
ERROR_LOG() << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral3DExtrusion failed" << " ('" << layernameAes << "')";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral3DExtrusion failed" << " ('" << layernameAes << "')";
});
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
return true;
}
@@ -844,18 +843,18 @@ bool AdapterDds::initRenderer3D_AesCentral_Booby(const QString &layernameAesCent
INFO_LOG() << Q_FUNC_INFO << " START, layernameAesCentral=" << layernameAesCentral;
INFO_LOG(m_logger) << Q_FUNC_INFO << " START, layernameAesCentral=" << layernameAesCentral;
connect(m_map, &Map::partysChangedDelayed, this, [this, layernameAesCentral, aesTypesForReRunIfPartyColorChanges] () {
DEBUG_LOG() << Q_FUNC_INFO << " partysChangedDelayed ********";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " partysChangedDelayed ********";
bool successAesCentral = assignUniqueValueRendererAesCentral(layernameAesCentral);
if (successAesCentral)
DEBUG_LOG() << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral okay" << " ('" << layernameAesCentral << "')";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral okay" << " ('" << layernameAesCentral << "')";
else
for (int i=0; i<5; ++i)
ERROR_LOG() << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral failed" << " ('" << layernameAesCentral << "')";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral failed" << " ('" << layernameAesCentral << "')";
@@ -873,18 +872,18 @@ bool AdapterDds::initRenderer3D_AesCentral_Booby(const QString &layernameAesCent
bool successAesCentral = assignUniqueValueRendererAesCentral(layernameAesCentral);
if (successAesCentral)
DEBUG_LOG() << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral okay" << " ('" << layernameAesCentral << "')";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral okay" << " ('" << layernameAesCentral << "')";
else
for (int i=0; i<5; ++i)
ERROR_LOG() << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral failed" << " ('" << layernameAesCentral << "')";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral failed" << " ('" << layernameAesCentral << "')";
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
return true;
}
bool AdapterDds::assignUniqueValueRendererAesCentral(const QString &layername)
{
TRACE_LOG() << Q_FUNC_INFO << " START, layername ='" << layername << "'" ;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, layername ='" << layername << "'" ;
QVector<LayerFactory::UniqueValueDataAesCentral::TYPE> typeVec;
typeVec << LayerFactory::UniqueValueDataAesCentral::TYPE::CONE;
@@ -893,7 +892,7 @@ bool AdapterDds::assignUniqueValueRendererAesCentral(const QString &layername)
const PartyIdToColorFunctor::ColorMap &colorMap = m_map->partyIdToColorFunctor().colorMap();
if (colorMap.isEmpty())
{
ERROR_LOG() << Q_FUNC_INFO << " colorMap is empty";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " colorMap is empty";
return false;
}
QVector<QColor> colVec;
@@ -904,7 +903,7 @@ bool AdapterDds::assignUniqueValueRendererAesCentral(const QString &layername)
for (const PartyIdToColorFunctor::PartyData &partyData : std::as_const(colorMap))
{
DEBUG_LOG() << Q_FUNC_INFO << " partyName=" << partyData.m_name << "'" << " partyColor=" << partyData.m_color.name() << "'";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " partyName=" << partyData.m_name << "'" << " partyColor=" << partyData.m_color.name() << "'";
colVec << partyData.m_color;
@@ -972,7 +971,7 @@ bool AdapterDds::assignUniqueValueRendererAesCentral(const QString &layername)
}
}
INFO_LOG() << Q_FUNC_INFO
INFO_LOG(m_logger) << Q_FUNC_INFO
<< " typeVec.size() = " << typeVec.size()
<< " colVec.size() = " << colVec.size() << " (colorMap.size() = " << colorMap.size() << ")"
<< " radiuss.size() = " << radiuss.size()
@@ -990,27 +989,27 @@ bool AdapterDds::assignUniqueValueRendererAesCentral(const QString &layername)
uvCont);
}
TRACE_LOG() << Q_FUNC_INFO << " END, layername ='" << layername << "'" ;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, layername ='" << layername << "'" ;
return success;
}
bool AdapterDds::assignUniqueValueRendererAesCentral3DExtrusion(const QString &layername)
{
DEBUG_LOG() << Q_FUNC_INFO << " START, layername ='" << layername << "'" ;
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, layername ='" << layername << "'" ;
QVector<QColor> colVec;
{
const PartyIdToColorFunctor::ColorMap &colorMap = m_map->partyIdToColorFunctor().colorMap();
if (colorMap.isEmpty())
{
ERROR_LOG() << Q_FUNC_INFO << " colorMap is empty";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " colorMap is empty";
return false;
}
colVec.reserve(colorMap.size());
for (const PartyIdToColorFunctor::PartyData &partyData : colorMap)
{
DEBUG_LOG() << Q_FUNC_INFO << " partyName=" << partyData.m_name << "'" << " partyColor=" << partyData.m_color.name() << "'";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " partyName=" << partyData.m_name << "'" << " partyColor=" << partyData.m_color.name() << "'";
colVec << partyData.m_color
<< partyData.m_lightColor;
}
@@ -1062,18 +1061,18 @@ bool AdapterDds::assignUniqueValueRendererAesCentral3DExtrusion(const QString &l
fieldnames,
uvCont);
TRACE_LOG() << Q_FUNC_INFO << " END, layername ='" << layername << "'"
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, layername ='" << layername << "'"
<< " success = " << success;
return success;
}
bool AdapterDds::run()
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
if (m_isRunning)
{
ERROR_LOG() << Q_FUNC_INFO << " already running" ;
ERROR_LOG(m_logger) << Q_FUNC_INFO << " already running" ;
return false;
}
@@ -1129,11 +1128,11 @@ bool AdapterDds::run()
m_isRunning = success;
INFO_LOG() << Q_FUNC_INFO << " connect to SymbolDictionary::changed" ;
INFO_LOG(m_logger) << Q_FUNC_INFO << " connect to SymbolDictionary::changed" ;
connect(&m_map->symbolDictionary(), &AdvancedSymbology::SymbolDictionary::changed,
this, &AdapterDds::startChangedDelayTimer, Qt::UniqueConnection);
TRACE_LOG() << Q_FUNC_INFO << " END" ;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
return success;
}
@@ -1144,12 +1143,12 @@ bool AdapterDds::isRunning() const
bool AdapterDds::stop()
{
TRACE_LOG() << Q_FUNC_INFO << " START" ;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START" ;
if (m_pluginProvider && !m_pluginProvider->isSessionValid())
{
m_isRunning = false;
DEBUG_LOG() << Q_FUNC_INFO << " no session anymore: ignore 'stop' -> return";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " no session anymore: ignore 'stop' -> return";
return false;
}
@@ -1195,13 +1194,13 @@ bool AdapterDds::stop()
m_isRunning = false;
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
return true;
}
void AdapterDds::clearObjects()
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
const QList<Sim2SituationMapBase *> &sim2Map = listOfSim2Map();
for (Sim2SituationMapBase *item : std::as_const(sim2Map))
@@ -1247,23 +1246,23 @@ void AdapterDds::clearObjects()
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
}
ResourceManagerMode AdapterDds::resourceManagerMode() const
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
if (!m_mountingPoints)
return ResourceManagerMode::Undefined;
ResourceManagerMode rmm = m_mountingPoints->resourceManagerMode();
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
return rmm;
}
bool AdapterDds::setResourceManagerMode(ResourceManagerMode rmm)
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
if (!m_mountingPoints)
return false;
@@ -1272,26 +1271,26 @@ bool AdapterDds::setResourceManagerMode(ResourceManagerMode rmm)
emit resourceManagerModeChanged(m_mountingPoints->resourceManagerMode());
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
return success;
}
bool AdapterDds::showExpiredEmergencyCalls(bool bShowExpired)
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
if (!m_emergencyCalls)
return false;
m_emergencyCalls->showExpired(bShowExpired);
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
return true;
}
bool AdapterDds::uniqueMapId2SimId(UniqueMapId uniqueMapIdIn, int32_t &simIdOut)
{
TRACE_LOG() << Q_FUNC_INFO << " START"
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
<< " uniqueMapId=" << uniqueMapIdIn;
if (!SituationMap::isUniqueMapIdValid(uniqueMapIdIn))
@@ -1309,7 +1308,7 @@ bool AdapterDds::uniqueMapId2SimId(UniqueMapId uniqueMapIdIn, int32_t &simIdOut)
bool AdapterDds::unifiedMapObjectData(UniqueMapId uniqueMapIdIn, UnifiedMapObjectData &umodOut) const
{
TRACE_LOG() << Q_FUNC_INFO << " START"
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
<< " uniqueMapId=" << uniqueMapIdIn;
if (!SituationMap::isUniqueMapIdValid(uniqueMapIdIn))
@@ -1332,14 +1331,14 @@ UniqueMapId AdapterDds::simId2UniqueMapIdParticipant(int32_t simId) const
}
RefPointer<Participant> AdapterDds::simId2Participant(int32_t simId)
{
TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId ;
TRACE_LOG(m_logger) << 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() << Q_FUNC_INFO << " END" ;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
return mapObj;
}
@@ -1355,14 +1354,14 @@ UniqueMapId AdapterDds::simId2UniqueMapIdAes(int32_t simId) const
}
RefPointer<AbstractMapObject> AdapterDds::simId2Aes(int32_t simId)
{
TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId ;
TRACE_LOG(m_logger) << 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() << Q_FUNC_INFO << " END" ;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
return mapObj;
}
@@ -1375,14 +1374,14 @@ UniqueMapId AdapterDds::simId2UniqueMapIdBuilding(int32_t simId) const
}
RefPointer<BuildingOutline> AdapterDds::simId2Building(int32_t simId)
{
TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId;
TRACE_LOG(m_logger) << 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() << Q_FUNC_INFO << " END" ;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
return mapObj;
}
@@ -1394,14 +1393,14 @@ UniqueMapId AdapterDds::simId2UniqueMapIdBridge(int32_t simId) const
}
RefPointer<BuildingOutline> AdapterDds::simId2Bridge(int32_t simId)
{
TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId;
TRACE_LOG(m_logger) << 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() << Q_FUNC_INFO << " END" ;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
return mapObj;
}
@@ -1414,14 +1413,14 @@ UniqueMapId AdapterDds::simId2UniqueMapIdMountingPoint(int32_t simId) const
RefPointer<GeoImage> AdapterDds::simId2MountingPoint(int32_t simId)
{
TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId;
TRACE_LOG(m_logger) << 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() << Q_FUNC_INFO << " END" ;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
return mapObj;
}
@@ -1433,14 +1432,14 @@ UniqueMapId AdapterDds::simId2UniqueMapIdGuezIed(int32_t simId) const
}
RefPointer<Participant> AdapterDds::simId2GuezIed(int32_t simId)
{
TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId;
TRACE_LOG(m_logger) << 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() << Q_FUNC_INFO << " END" ;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
return mapObj;
}
@@ -1453,14 +1452,14 @@ UniqueMapId AdapterDds::simId2UniqueMapIdChargeEffect(int32_t simId) const
RefPointer<SingleFire> AdapterDds::simId2ChargeEffect(int32_t simId)
{
TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId;
TRACE_LOG(m_logger) << 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() << Q_FUNC_INFO << " END" ;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
return mapObj;
}
@@ -1473,7 +1472,7 @@ UniqueMapId AdapterDds::simId2UniqueMapIdTrainingArea(int32_t simId) const
RefPointer<Polygon> AdapterDds::simId2TrainingArea(int32_t simId)
{
TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, simId=" << simId;
UniqueMapId mapId = simId2UniqueMapIdTrainingArea(simId);
if (!isUniqueMapIdValid(mapId))
@@ -1481,7 +1480,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() << Q_FUNC_INFO << " END" ;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
return mapObj;
}
@@ -1494,7 +1493,7 @@ UniqueMapId AdapterDds::simId2UniqueMapIdSpecialArea(int32_t simId) const
RefPointer<Polygon> AdapterDds::simId2SpecialArea(int32_t simId)
{
TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, simId=" << simId;
UniqueMapId mapId = simId2UniqueMapIdSpecialArea(simId);
if (!isUniqueMapIdValid(mapId))
@@ -1502,7 +1501,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() << Q_FUNC_INFO << " END" ;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
return mapObj;
}
@@ -1515,7 +1514,7 @@ UniqueMapId AdapterDds::simId2UniqueMapIdShootbackArea(int32_t simId) const
RefPointer<Polygon> AdapterDds::simId2ShootbackArea(int32_t simId)
{
TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << simId;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, simId=" << simId;
UniqueMapId mapId = simId2UniqueMapIdShootbackArea(simId);
if (!isUniqueMapIdValid(mapId))
@@ -1523,7 +1522,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() << Q_FUNC_INFO << " END" ;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
return mapObj;
}
@@ -1551,7 +1550,7 @@ UniqueMapId AdapterDds::simId2UniqueMapId(MapObjectType mot, int32_t simId) cons
case MapObjectType::MOT_Aes:
case MapObjectType::MOT_GuezIed:
{
ERROR_LOG() << " not supported yet!!!";
ERROR_LOG(m_logger) << " not supported yet!!!";
Q_FALLTHROUGH();
}
default:
@@ -1589,7 +1588,7 @@ QVector<UniqueMapId> AdapterDds::simIds2UniqueMapIds(MapObjectType mot, QVector<
case MapObjectType::MOT_Aes:
case MapObjectType::MOT_GuezIed:
{
ERROR_LOG() << " not supported yet!!!";
ERROR_LOG(m_logger) << " not supported yet!!!";
Q_FALLTHROUGH();
}
default:
@@ -1614,7 +1613,7 @@ RefPointer<AbstractMapObject> AdapterDds::simId2MapObject(MapObjectType mot, int
return {};
RefPointer<AbstractMapObject> mapObj = m_map->objectFactory().get(uniqueMapId);
TRACE_LOG() << Q_FUNC_INFO << " END" ;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
return mapObj;
}
@@ -1640,7 +1639,7 @@ Sim2SituationMapBase *AdapterDds::situationMapBase(MapObjectType mot) const
case MapObjectType::MOT_Building:
case MapObjectType::MOT_GuezIed:
{
ERROR_LOG() << " not supported yet!!!";
ERROR_LOG(m_logger) << " not supported yet!!!";
Q_FALLTHROUGH();
}
default:
@@ -1778,7 +1777,7 @@ bool AdapterDds::setOwnPositionVisible(bool enable)
void AdapterDds::onSymbolDictionaryChanged()
{
INFO_LOG() << Q_FUNC_INFO << " START, workspaceId" << m_pluginProvider->workspaceId();
INFO_LOG(m_logger) << Q_FUNC_INFO << " START, workspaceId" << m_pluginProvider->workspaceId();
if (m_particpants)
m_particpants->reRenderObjects();
@@ -1798,7 +1797,7 @@ void AdapterDds::onSymbolDictionaryChanged()
INFO_LOG() << Q_FUNC_INFO << " END, workspaceId" << m_pluginProvider->workspaceId();
INFO_LOG(m_logger) << Q_FUNC_INFO << " END, workspaceId" << m_pluginProvider->workspaceId();
}
@@ -1864,7 +1863,7 @@ void AdapterDds::onMapObjectChangedUpdateDrawOrder(UniqueMapId uniqueMapId)
RefPointer<AbstractMapObject> mapObj = objFac.get<AbstractMapObject>(curUniqueMapId);
if (!mapObj)
{
WARNING_LOG() << Q_FUNC_INFO << " not found in objFac"
WARNING_LOG(m_logger) << Q_FUNC_INFO << " not found in objFac"
<< " curUniqueMapId = " << curUniqueMapId;
return;
}
@@ -1872,10 +1871,10 @@ void AdapterDds::onMapObjectChangedUpdateDrawOrder(UniqueMapId uniqueMapId)
mapObj->setDrawOrder(++drawOrderCounter);
if (!mapObj->updateView())
{
ERROR_LOG() << Q_FUNC_INFO << " debugInfo='" << mapObj->debugInfo() << "'"
ERROR_LOG(m_logger) << Q_FUNC_INFO << " debugInfo='" << mapObj->debugInfo() << "'"
<< " updateView failed";
}
INFO_LOG() << Q_FUNC_INFO << " debugInfo='" << mapObj->debugInfo() << "'"
INFO_LOG(m_logger) << Q_FUNC_INFO << " debugInfo='" << mapObj->debugInfo() << "'"
<< " set DrawOder to: " << drawOrderCounter;
}
}
@@ -1889,7 +1888,7 @@ void AdapterDds::onMapObjectRemoved(UniqueMapId uniqueMapId)
void AdapterDds::onParticipantOwnPositionChanged(const Point3D &newPos, int64_t sampleTime)
{
DEBUG_LOG() << "Own Position Changed";
DEBUG_LOG(m_logger) << "Own Position Changed";
if(!m_map)
return;
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.h
+2
View File
@@ -234,12 +234,14 @@ private slots:
void onParticipantOwnPositionChanged(const Point3D &newPos, int64_t sampleTime);
private:
NGL::INGLLogger &m_logger;
void startChangedDelayTimer();
void startOwnPositionOutdatedTimer();
QList<Sim2SituationMapBase *> listOfSim2Map() const;
QList<Sim2SituationMapBase *> listOfAes2Map() const;
private:
NGL::INGLLogger &m_logger;
bool m_isShowOwnPosition{true};
bool m_isRunning{false};
QTimer *m_changedDelayTimer{nullptr};
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.cpp
+31 -32
View File
@@ -135,22 +135,21 @@ public:
BuildingContamination::BuildingContamination(int drawOrder, QObject *parent)
: BaseClass(parent)
, d(new Private())
{
TRACE_LOG() << Q_FUNC_INFO << " START";
BuildingContamination::BuildingContamination(int drawOrder, QObject *parent) : BaseClass(parent)
, d(new Private()),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
d->m_drawOrder = drawOrder;
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
}
BuildingContamination::~BuildingContamination()
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
this->stop();
delete d;
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
}
bool BuildingContamination::init(Map *map, PluginProvider *pluginProvider)
@@ -178,17 +177,17 @@ void BuildingContamination::removeAllObjects()
bool BuildingContamination::run()
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
if (!d->m_map)
{
ERROR_LOG() << Q_FUNC_INFO << " no m_map";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " no m_map";
return false;
}
if (!m_bldDtc)
{
ERROR_LOG() << Q_FUNC_INFO << " no m_bldDtc";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " no m_bldDtc";
return false;
}
@@ -223,7 +222,7 @@ bool BuildingContamination::run()
RefPointer<Cube> cube = d->getCreateCube(buildingId, floorId);
if (!cube)
ERROR_LOG() << Q_FUNC_INFO << " no cube created";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " no cube created";
cube->setVisibility(d->m_visible);
cube->setDrawOrder(d->m_drawOrder);
@@ -234,7 +233,7 @@ bool BuildingContamination::run()
cube->setHeight(height);
bool success = cube->updateView();
INFO_LOG() << Q_FUNC_INFO << " cube->updateView " << success;
INFO_LOG(m_logger) << Q_FUNC_INFO << " cube->updateView " << success;
};
@@ -245,15 +244,15 @@ bool BuildingContamination::run()
}
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
return true;
}
void BuildingContamination::stop()
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
m_bldDtc->disconnect(this);
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
}
bool BuildingContamination::isVisible() const
@@ -269,7 +268,7 @@ bool BuildingContamination::setVisible(bool visible)
void BuildingContamination::onBuildingStateChanged(const Buildings::BuildingState &data, DataModification modType)
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
const int buildingId = data.id();
@@ -286,19 +285,19 @@ void BuildingContamination::onBuildingStateChanged(const Buildings::BuildingStat
break;
}
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
}
void BuildingContamination::onResetBuildingState()
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
d->removeCube();
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
}
void BuildingContamination::updateBuilding(int buildingId)
{
DEBUG_LOG() << "update Building " << buildingId;
DEBUG_LOG(m_logger) << "update Building " << buildingId;
const Buildings::BuildingState &bos = m_bldDtc->buildingState(buildingId);
@@ -307,7 +306,7 @@ void BuildingContamination::updateBuilding(int buildingId)
const auto contaminations = bos.contaminationStates();
DEBUG_LOG() << "Statecount " << contaminations.size();
DEBUG_LOG(m_logger) << "Statecount " << contaminations.size();
QSet<int> contaminatedFloors;
@@ -320,7 +319,7 @@ void BuildingContamination::updateBuilding(int buildingId)
rooms.insert(room);
}
DEBUG_LOG() << "contaminated rooms " << rooms.size();
DEBUG_LOG(m_logger) << "contaminated rooms " << rooms.size();
for (int room : rooms)
{
@@ -331,7 +330,7 @@ void BuildingContamination::updateBuilding(int buildingId)
}
}
DEBUG_LOG() << "contaminated floors " << contaminatedFloors.size();
DEBUG_LOG(m_logger) << "contaminated floors " << contaminatedFloors.size();
@@ -357,7 +356,7 @@ void BuildingContamination::updateBuilding(int buildingId)
const bool isContaminaed = contaminatedFloors.contains(floorId);
DEBUG_LOG() << Q_FUNC_INFO
DEBUG_LOG(m_logger) << Q_FUNC_INFO
<< " floorId=" << floorId
<< " height=" << height
<< " partyId=" << isContaminaed;
@@ -383,7 +382,7 @@ void BuildingContamination::updateBuilding(int buildingId)
cube->setHeight(height);
if (!cube->updateView())
ERROR_LOG() << Q_FUNC_INFO << " cube->updateView() failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " cube->updateView() failed";
}
@@ -409,7 +408,7 @@ int BuildingContamination::findFloorIdByRoomId(int roomId) noexcept(false)
InfrastructureManagement::StructureElement roomSe;
if (!m_ismDtc->getStructureElementById(roomId, roomSe))
{
ERROR_LOG() << "getStructureElementById roomId=" << roomId << " not found";
ERROR_LOG(m_logger) << "getStructureElementById roomId=" << roomId << " not found";
return -1;
}
@@ -457,12 +456,12 @@ bool BuildingContamination::getRoom(int roomSeId, InfrastructureManagement::Stru
PositionCont BuildingContamination::retrieveBuildingGeometry(int buildingId, int floorId) const
{
TRACE_LOG() << Q_FUNC_INFO << " START"
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
<< " buildingId=" << buildingId
<< " floorId=" << floorId;
if (!m_ismDtc)
{
ERROR_LOG() << Q_FUNC_INFO << " no m_ismDtc";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " no m_ismDtc";
return PositionCont();
}
@@ -474,7 +473,7 @@ PositionCont BuildingContamination::retrieveBuildingGeometry(int buildingId, int
{
const InfrastructureManagement::MainFootprint &mainFootprint = m_ismDtc->mainFootprint(buildingId);
TRACE_LOG() << Q_FUNC_INFO << " START"
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
<< " mainFootprint.elements().size()=" << mainFootprint.elements().size();
relPositions.reserve(mainFootprint.elements().size());
@@ -581,7 +580,7 @@ PositionCont BuildingContamination::retrieveBuildingGeometry(int buildingId, int
const Esri::ArcGISRuntime::ImmutablePointCollection &pointCollection = immutablePart.points();
const int size = pointCollection.size();
INFO_LOG() << " pointCollection.size = " << pointCollection.size()
INFO_LOG(m_logger) << " pointCollection.size = " << pointCollection.size()
<< " - buildingId = " << buildingId
<< ", mse.name = " << mse.name();
@@ -597,7 +596,7 @@ PositionCont BuildingContamination::retrieveBuildingGeometry(int buildingId, int
}
#endif
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
return absPositionsGeo;
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.h
+1
View File
@@ -56,6 +56,7 @@ protected Q_SLOTS:
protected:
NGL::INGLLogger &m_logger;
void updateBuilding(int buildingId);
int findFloorIdByRoomId(int roomId);
bool getRoom(int roomSeId, InfrastructureManagement::StructureElement &roomSe);
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_ownership.cpp
+25 -26
View File
@@ -211,22 +211,21 @@ public:
BuildingOwnership::BuildingOwnership(int drawOrder, QObject *parent)
: BaseClass(parent)
, d(new Private())
{
TRACE_LOG() << Q_FUNC_INFO << " START";
BuildingOwnership::BuildingOwnership(int drawOrder, QObject *parent) : BaseClass(parent)
, d(new Private()),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
d->m_drawOrder = drawOrder;
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
}
BuildingOwnership::~BuildingOwnership()
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
this->stop();
delete d;
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
}
bool BuildingOwnership::init(Map *map, PluginProvider *pluginProvider)
@@ -256,17 +255,17 @@ void BuildingOwnership::removeAllObjects()
bool BuildingOwnership::run()
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
if (!d->m_map)
{
ERROR_LOG() << Q_FUNC_INFO << " no m_map";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " no m_map";
return false;
}
if (!m_cesDtc)
{
ERROR_LOG() << Q_FUNC_INFO << " no m_cesDtc";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " no m_cesDtc";
return false;
}
@@ -301,7 +300,7 @@ bool BuildingOwnership::run()
RefPointer<Cube> cube = d->getCreateCube(buildingId, floorId);
if (!cube)
ERROR_LOG() << Q_FUNC_INFO << " no cube created";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " no cube created";
cube->setVisibility(d->m_visible);
cube->setDrawOrder(d->m_drawOrder);
@@ -312,7 +311,7 @@ bool BuildingOwnership::run()
cube->setHeight(height);
bool success = cube->updateView();
INFO_LOG() << Q_FUNC_INFO << " cube->updateView " << success;
INFO_LOG(m_logger) << Q_FUNC_INFO << " cube->updateView " << success;
};
@@ -323,15 +322,15 @@ bool BuildingOwnership::run()
}
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
return true;
}
void BuildingOwnership::stop()
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
m_cesDtc->disconnect(this);
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
}
bool BuildingOwnership::isVisible() const
@@ -347,7 +346,7 @@ bool BuildingOwnership::setVisible(bool visible)
void BuildingOwnership::onBuildingOwnershipChanged(const CentralEffectSimulation::BuildingOwnership &data, DataModification modType)
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
const int buildingId = data.buildingId();
@@ -364,14 +363,14 @@ void BuildingOwnership::onBuildingOwnershipChanged(const CentralEffectSimulation
break;
}
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
}
void BuildingOwnership::onResetBuildingOwnership()
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
d->removeCube();
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
}
void BuildingOwnership::updateBuilding(int buildingId)
@@ -416,7 +415,7 @@ void BuildingOwnership::updateBuilding(int buildingId)
const int partyId = floor2Party.value(floorId, -1);
DEBUG_LOG() << Q_FUNC_INFO
DEBUG_LOG(m_logger) << Q_FUNC_INFO
<< " floorId=" << floorId
<< " height=" << height
<< " partyId=" << partyId;
@@ -436,7 +435,7 @@ void BuildingOwnership::updateBuilding(int buildingId)
cube->setHeight(height);
if (!cube->updateView())
ERROR_LOG() << Q_FUNC_INFO << " cube->updateView() failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " cube->updateView() failed";
}
}
@@ -447,12 +446,12 @@ PositionCont BuildingOwnership::retrieveBuildingGeometry(int buildingId, int flo
PositionCont BuildingOwnership::retrieveBuildingGeometryInternal(int buildingId, int floorId) const
{
TRACE_LOG() << Q_FUNC_INFO << " START"
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
<< " buildingId=" << buildingId
<< " floorId=" << floorId;
if (!m_ismDtc)
{
ERROR_LOG() << Q_FUNC_INFO << " no m_ismDtc";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " no m_ismDtc";
return PositionCont();
}
@@ -464,7 +463,7 @@ PositionCont BuildingOwnership::retrieveBuildingGeometryInternal(int buildingId,
{
const InfrastructureManagement::MainFootprint &mainFootprint = m_ismDtc->mainFootprint(buildingId);
TRACE_LOG() << Q_FUNC_INFO << " START"
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
<< " mainFootprint.elements().size()=" << mainFootprint.elements().size();
relPositions.reserve(mainFootprint.elements().size());
@@ -588,7 +587,7 @@ PositionCont BuildingOwnership::retrieveBuildingGeometryInternal(int buildingId,
}
#endif
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
return absPositionsGeo;
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_ownership.h
+1
View File
@@ -56,6 +56,7 @@ protected Q_SLOTS:
protected:
NGL::INGLLogger &m_logger;
friend class BuildingGeometryCache;
void updateBuilding(int buildingId);
PositionCont retrieveBuildingGeometry(int buildingId, int floorId) const;
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_null_to_map.cpp
+22 -22
View File
@@ -33,10 +33,10 @@ bool DusMineStateProxy::init(PluginProvider *pluginProvider)
bool DusMineStateProxy::run()
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
if (!m_aesDtc)
{
ERROR_LOG() << Q_FUNC_INFO << " no dtc";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " no dtc";
return false;
}
@@ -59,9 +59,9 @@ bool DusMineStateProxy::run()
void DusMineStateProxy::stop()
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
this->disconnect();
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
}
bool DusMineStateProxy::dusMineStateAndPositionDatas(const std::function<void (const DusMineStateAndPositionData &)> &cb)
@@ -94,7 +94,7 @@ bool DusMineStateProxy::handleChanged(const AreaEffectSimulation::DusMineState &
if (ddsData.id() != 0)
return false;
TRACE_LOG() << Q_FUNC_INFO << " START, ddsData.id()=" << ddsData.id()
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, ddsData.id()=" << ddsData.id()
<< " ddsData.mines().size() = " << ddsData.mines().size();
if (modType == DataModification::eRemoved)
@@ -112,7 +112,7 @@ bool DusMineStateProxy::handleChanged(const AreaEffectSimulation::AesItemView &d
if (ddsData.id() != AreaEffectSimulation::AesType::AtMineAreaSingleMines)
return false;
TRACE_LOG() << Q_FUNC_INFO << " START, ddsData.id()=" << ddsData.id()
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, ddsData.id()=" << ddsData.id()
<< " ddsData.form().size() = " << ddsData.form().size();
if (modType == DataModification::eRemoved)
@@ -158,14 +158,14 @@ bool DusMineStateProxy::publishNewMap()
m_map = mapContVeryNew;
DEBUG_LOG() << "Publishing new dus-mine map to situationMap adapter";
DEBUG_LOG(m_logger) << "Publishing new dus-mine map to situationMap adapter";
return true;
}
const QMap<int32_t, DusMineStateAndPositionData> DusMineStateProxy::getFromDds()
{
TRACE_LOG() << Q_FUNC_INFO << " START, ddsData.id()=" << m_lastDusMineState.id()
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, ddsData.id()=" << m_lastDusMineState.id()
<< " ddsData.mines().size() = " << m_lastDusMineState.mines().size();
QMap<int32_t, DusMineStateAndPositionData> mapCont;
@@ -178,7 +178,7 @@ const QMap<int32_t, DusMineStateAndPositionData> DusMineStateProxy::getFromDds()
int idx = 0;
for (const AreaEffectSimulation::DusMine &mine : mines)
{
DEBUG_LOG() << Q_FUNC_INFO
DEBUG_LOG(m_logger) << Q_FUNC_INFO
<< " idx=" << idx++
<< ", eqId=" << mine.eqId()
<< ", chargeTypeId=" << mine.chargeTypeId();
@@ -188,14 +188,14 @@ const QMap<int32_t, DusMineStateAndPositionData> DusMineStateProxy::getFromDds()
if (size != m_lastItemView.form().size())
{
ERROR_LOG() << Q_FUNC_INFO << " ddsData.id()=" << m_lastDusMineState.id()
ERROR_LOG(m_logger) << 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() << Q_FUNC_INFO << " ddsData.id()=" << m_lastDusMineState.id()
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " ddsData.id()=" << m_lastDusMineState.id()
<< " size ::"
<< " ddsData.mines().size() = " << mines.size()
<< " itemView.form().size() = " << m_lastItemView.form().size();
@@ -211,7 +211,7 @@ const QMap<int32_t, DusMineStateAndPositionData> DusMineStateProxy::getFromDds()
pos
);
DEBUG_LOG() << Q_FUNC_INFO << " i=" << i << ", id/eqId=" << dusMine.eqId() << ", pos=" << pos;
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " i=" << i << ", id/eqId=" << dusMine.eqId() << ", pos=" << pos;
mapCont.insert(dusMine.eqId(), dmsDdsData);
}
@@ -248,7 +248,7 @@ bool MineAreaNull2SituationMap::init(PluginProvider *pluginProvider)
{
m_dusMineStateProxy = new DusMineStateProxy(this);
if (!m_dusMineStateProxy->init(pluginProvider))
ERROR_LOG() << Q_FUNC_INFO << " init failed for DusMineStateProxy";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " init failed for DusMineStateProxy";
}
return true;
}
@@ -256,11 +256,11 @@ bool MineAreaNull2SituationMap::init(PluginProvider *pluginProvider)
bool MineAreaNull2SituationMap::run()
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
if (!m_dusMineStateProxy)
{
ERROR_LOG() << Q_FUNC_INFO << " no DusMineStateProxy";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " no DusMineStateProxy";
return false;
}
@@ -275,7 +275,7 @@ bool MineAreaNull2SituationMap::run()
handleChanged(data, DataModification::eAdded);
});
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
return true;
}
@@ -330,10 +330,10 @@ bool MineAreaNull2SituationMap::unifiedMapObjectData(UniqueMapId uniqueMapId, Un
bool MineAreaNull2SituationMap::updateVisibility(const Aes2SituationMap::DDS_TYPE &ddsData, RefPointer<Aes2SituationMap::MAP_TYPE> mapObj)
{
TRACE_LOG() << Q_FUNC_INFO << " START, simId=" << getSimId(ddsData);
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, simId=" << getSimId(ddsData);
if (!BaseClass::updateVisibility(ddsData, mapObj))
{
ERROR_LOG() << Q_FUNC_INFO << " BaseClass::updateVisibility failed, simId=" << getSimId(ddsData);
ERROR_LOG(m_logger) << Q_FUNC_INFO << " BaseClass::updateVisibility failed, simId=" << getSimId(ddsData);
return false;
}
@@ -350,9 +350,9 @@ bool MineAreaNull2SituationMap::updateVisibility(const Aes2SituationMap::DDS_TYP
}
if (bUpdateView && !mapObj->updateView())
ERROR_LOG()<< Q_FUNC_INFO << " simId = " << getSimId(ddsData) << " XXXX updateView failed";
ERROR_LOG(m_logger)<< Q_FUNC_INFO << " simId = " << getSimId(ddsData) << " XXXX updateView failed";
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
return true;
}
@@ -378,7 +378,7 @@ void MineAreaNull2SituationMap::onAesDisplayFilterChanged(AreaEffectSimulation::
bool MineAreaNull2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsData,
RefPointer<MAP_T> mapObj)
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
mapObj->setVisibility(ObjectAppearance::Tactical, false);
@@ -413,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() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << 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
@@ -69,6 +69,8 @@ public:
Core::GeoPosition2D position() const { return m_form_param; }
private:
NGL::INGLLogger &m_logger;
int32_t m_id_param;
AreaEffectSimulation::ChargeStruct m_chargeStruct;
Core::GeoPosition2D m_form_param;
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/pdm_handler.cpp
+3 -4
View File
@@ -25,9 +25,8 @@ QString toString(SpecialChargeType value)
return QStringLiteral("SpecialChargeTypeERROR");
}
PdmHandler::PdmHandler(const std::shared_ptr<ProjectDataManagement::Interface::Dtc> &dtcPdm)
: m_dtcPdm(dtcPdm)
{}
PdmHandler::PdmHandler(const std::shared_ptr<ProjectDataManagement::Interface::Dtc> &dtcPdm) : m_dtcPdm(dtcPdm),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
void PdmHandler::initializePdm()
@@ -85,7 +84,7 @@ ProjectDataManagement::ChargeType PdmHandler::chargeTypeFromId(int chargeTypeId)
auto it = m_chargeTypes.constFind(chargeTypeId);
if (it == m_chargeTypes.cend())
{
WARNING_LOG() << "Could not find charge type with id " << chargeTypeId;
WARNING_LOG(m_logger) << "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
@@ -67,11 +67,13 @@ public:
QVector<ProjectDataManagement::CasEffect> casEffects(const AreaEffectSimulation::ChargeStruct &chargeStruct);
private:
NGL::INGLLogger &m_logger;
void initializePdm();
void onChargeTypeChanged(const ProjectDataManagement::ChargeType &data, DataModification mod);
void onGearTypeChargeTypeChanged(const ProjectDataManagement::GearTypeChargeType &data, DataModification mod);
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_dtcPdm;
QMap<int, ProjectDataManagement::ChargeType> m_chargeTypes;
QMap<int, ProjectDataManagement::GearTypeChargeType> m_gearTypeChargeTypes;
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/sim_to_situation_map_tmpl.h
+19 -19
View File
@@ -161,7 +161,7 @@ public:
mapObj->updateView();
if (!mapObj->updateView())
ERROR_LOG() << Q_FUNC_INFO << " updateElement failed, "
ERROR_LOG(m_logger) << Q_FUNC_INFO << " updateElement failed, "
<< " uniqueMapId = " << uniqueMapId
<< " debugInfo='" << mapObj->debugInfo() << "'";
}
@@ -265,7 +265,7 @@ protected:
virtual bool createElement(const DDS_T &ddsData)
{
TRACE_LOG() << Q_FUNC_INFO << " START"
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
<< " simId = " << getSimId(ddsData);
const int32_t simId = getSimId(ddsData);
@@ -273,7 +273,7 @@ protected:
if (m_simId2UniqueMapId.contains(simId))
{
DEBUG_LOG() << Q_FUNC_INFO << " mapObject already exists"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " mapObject already exists"
<< " simId = " << simId;
return true;
}
@@ -283,7 +283,7 @@ protected:
RefPointer<MAP_T> mapObj = m_objFac.create<MAP_T>(layername, debugInfo);
if (!mapObj)
{
ERROR_LOG() << Q_FUNC_INFO << " creation failed"
ERROR_LOG(m_logger) << Q_FUNC_INFO << " creation failed"
<< " simId = " << simId;
return false;
}
@@ -297,14 +297,14 @@ protected:
const UniqueMapId uniqueMapId = mapObj->uniqueMapId();
if (!isUniqueMapIdValid(uniqueMapId))
{
ERROR_LOG() << Q_FUNC_INFO << " uniqueMapId invalid"
ERROR_LOG(m_logger) << Q_FUNC_INFO << " uniqueMapId invalid"
<< " simId = " << simId;
return false;
}
m_simId2UniqueMapId[simId] = uniqueMapId;
m_uniqueMapId2SimId[uniqueMapId] = simId;
DEBUG_LOG() << Q_FUNC_INFO << " END";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
return true;
}
@@ -312,7 +312,7 @@ protected:
bool updateElement(const DDS_T &ddsData)
{
DEBUG_LOG() << Q_FUNC_INFO << " START"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START"
<< " simId = " << getSimId(ddsData);
const int32_t simId = getSimId(ddsData);
@@ -320,14 +320,14 @@ protected:
const UniqueMapId uniqueMapId = m_simId2UniqueMapId.value(simId, INVALID_MAP_ID);
if (!isUniqueMapIdValid(uniqueMapId))
{
ERROR_LOG() << Q_FUNC_INFO << " not found" << " simId = " << simId;
ERROR_LOG(m_logger) << Q_FUNC_INFO << " not found" << " simId = " << simId;
return false;
}
RefPointer<MAP_T> mapObj = m_objFac.get<MAP_T>(uniqueMapId);
if (!mapObj)
{
ERROR_LOG() << Q_FUNC_INFO << " not found in objFac"
ERROR_LOG(m_logger) << Q_FUNC_INFO << " not found in objFac"
<< " simId = " << simId
<< " uniqueMapId = " << uniqueMapId;
return false;
@@ -336,7 +336,7 @@ protected:
bool success = updateElementImpl(ddsData, mapObj);
if (!success)
{
ERROR_LOG() << Q_FUNC_INFO << " updateElementImpl failed, "
ERROR_LOG(m_logger) << Q_FUNC_INFO << " updateElementImpl failed, "
<< " simId = " << getSimId(ddsData);
return false;
}
@@ -347,7 +347,7 @@ protected:
if (!mapObj->updateView())
{
ERROR_LOG() << Q_FUNC_INFO << " updateElement failed, "
ERROR_LOG(m_logger) << Q_FUNC_INFO << " updateElement failed, "
<< " simId = " << getSimId(ddsData);
return false;
}
@@ -355,26 +355,26 @@ protected:
emit mapObjectChanged(uniqueMapId);
DEBUG_LOG() << Q_FUNC_INFO << " END";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
return true;
}
bool removeElement(const DDS_T &ddsData)
{
const int32_t simId = getSimId(ddsData);
DEBUG_LOG() << Q_FUNC_INFO << " START" << " simId = " << simId;
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START" << " simId = " << simId;
return removeElement(simId);
}
virtual bool removeElement(const int32_t simId)
{
DEBUG_LOG() << Q_FUNC_INFO << " START" << " simId = " << simId;
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START" << " simId = " << simId;
const UniqueMapId uniqueMapId = m_simId2UniqueMapId.value(simId, INVALID_MAP_ID);
if (!isUniqueMapIdValid(uniqueMapId))
{
TRACE_LOG() << Q_FUNC_INFO << " not found"
TRACE_LOG(m_logger) << Q_FUNC_INFO << " not found"
<< ", simId = " << simId;
return false;
}
@@ -388,12 +388,12 @@ protected:
}
else
{
ERROR_LOG() << Q_FUNC_INFO << " not found in objFac"
ERROR_LOG(m_logger) << Q_FUNC_INFO << " not found in objFac"
<< " simId = " << simId
<< " uniqueMapId = " << uniqueMapId;
}
DEBUG_LOG() << Q_FUNC_INFO << " END";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
emit mapObjectRemoved(uniqueMapId);
@@ -422,7 +422,7 @@ protected:
bool handleChanged(const DDS_T &ddsData, DataModification modType)
{
DEBUG_LOG() << Q_FUNC_INFO << " START"
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START"
<< " modType = " << modType
<< " simId = " << getSimId(ddsData);
@@ -445,7 +445,7 @@ protected:
success = this->removeElement(ddsData);
break;
}
DEBUG_LOG() << Q_FUNC_INFO << " END";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
return success;
}