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

Migrates EffectShow and AssetManagement to generated rtiddsgen API

Browse Source 
Converts accessor calls to plain member access across esc and asm services.
This commit is contained in:
berrux-dev committed 2026-09-21 02:46:24 +02:00
1 parent a09979afdd
commit bdb2461737
39 files changed
+818 -818
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/handler_training_area.cpp
+64 -64
View File
@@ -54,21 +54,21 @@ bool HandlerTrainingArea::init()
if (mapDescriptionSeqences.contains(data.trainingAreaId))
mapDescriptionSeq = mapDescriptionSeqences.value(data.trainingAreaId);
switch (data.mapDescriptionTypeId.underlying())
switch (data.mapDescriptionTypeId)
{
case AssetManagement::MapDescriptionType_def::Map2D:
case AssetManagement::MapDescriptionType::Map2D:
mapDescriptionSeq.map2D.insert(data.objOrder, data);
INFO_LOG(m_logger) << "map2D.insert order =" << data.objOrder;
break;
case AssetManagement::MapDescriptionType_def::Scene3D:
case AssetManagement::MapDescriptionType::Scene3D:
mapDescriptionSeq.scene3D.insert(data.objOrder, data);
INFO_LOG(m_logger) << "Scene3D.insert order =" << data.objOrder;
break;
case AssetManagement::MapDescriptionType_def::Elevation:
case AssetManagement::MapDescriptionType::Elevation:
mapDescriptionSeq.elevation.insert(data.objOrder, data);
INFO_LOG(m_logger) << "Elevation.insert order =" << data.objOrder;
break;
case AssetManagement::MapDescriptionType_def::SceneObj:
case AssetManagement::MapDescriptionType::SceneObj:
mapDescriptionSeq.sceneObj.insert(data.objOrder, data);
INFO_LOG(m_logger) << "sceneObj.insert order =" << data.objOrder;
break;
@@ -100,25 +100,25 @@ bool HandlerTrainingArea::init()
ObjectTrainingArea *ifs(new ObjectTrainingArea(m_mainHandler));
TrainingArea taData = convert(data);
// insert sequences
if (mapDescriptionSeqences.contains(taData.id()) )
if (mapDescriptionSeqences.contains(taData.id) )
{
const MapDescriptionSeq mapDescriptionSeq = mapDescriptionSeqences.value(taData.id());
const MapDescriptionSeq mapDescriptionSeq = mapDescriptionSeqences.value(taData.id);
taData.map2D().reserve(mapDescriptionSeq.map2D.size());
taData.map2D.reserve(mapDescriptionSeq.map2D.size());
for (const auto &dbDesc : mapDescriptionSeq.map2D)
taData.map2D().push_back(ObjectMapDescription::toDdsData(dbDesc));
taData.map2D.push_back(ObjectMapDescription::toDdsData(dbDesc));
taData.scene3D().reserve(mapDescriptionSeq.scene3D.size());
taData.scene3D.reserve(mapDescriptionSeq.scene3D.size());
for (const auto &dbDesc : mapDescriptionSeq.scene3D)
taData.scene3D().push_back(ObjectMapDescription::toDdsData(dbDesc));
taData.scene3D.push_back(ObjectMapDescription::toDdsData(dbDesc));
taData.elevation().reserve(mapDescriptionSeq.elevation.size());
taData.elevation.reserve(mapDescriptionSeq.elevation.size());
for (const auto &dbDesc : mapDescriptionSeq.elevation)
taData.elevation().push_back(ObjectMapDescription::toDdsData(dbDesc));
taData.elevation.push_back(ObjectMapDescription::toDdsData(dbDesc));
taData.sceneObjects().reserve(mapDescriptionSeq.sceneObj.size());
taData.sceneObjects.reserve(mapDescriptionSeq.sceneObj.size());
for (const auto &dbDesc : mapDescriptionSeq.sceneObj)
taData.sceneObjects().push_back(ObjectMapDescription::toDdsData(dbDesc));
taData.sceneObjects.push_back(ObjectMapDescription::toDdsData(dbDesc));
}
// end insert sequences
Core::FunctionReplyObject ret = ifs->createObject(taData);
@@ -146,7 +146,7 @@ void HandlerTrainingArea::removeMapDescriptions(int trainingAreaId)
{
it.next();
INFO_LOG(m_logger) << "remove map description key = " << it.key();
if ( it.value()->getData().trainingAreaId() == trainingAreaId)
if ( it.value()->getData().trainingAreaId == trainingAreaId)
{
DEBUG_LOG(m_logger) << "remove id= " << it.key();
@@ -175,12 +175,12 @@ Core::FunctionReplyObject HandlerTrainingArea::trainingAreaModifyRequest(const T
ObjectTrainingArea *ifs;
Core::FunctionReplyObject ret;
if (request.id() > 0)
if (request.id > 0)
{
ifs = m_objectTrainingAreaMap.value(request.id());
ifs = m_objectTrainingAreaMap.value(request.id);
if (ifs == nullptr)
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Training area with id %1 not found")).arg(request.id());
return Core::FunctionReplyObject(request.id, tr_lts("dds", "Training area with id %1 not found")).arg(request.id);
ret = ifs->updateObject(ddsData);
if (ret.error())
return ret;
@@ -198,7 +198,7 @@ Core::FunctionReplyObject HandlerTrainingArea::trainingAreaModifyRequest(const T
else
m_objectTrainingAreaMap.insert(ifs->getId(), ifs);
}
if (request.id() > 0) // Modify
if (request.id > 0) // Modify
{
DEBUG_LOG(m_logger) << "modify: delete old entries in map_description";
removeMapDescriptions(ifs->getId());
@@ -206,19 +206,19 @@ Core::FunctionReplyObject HandlerTrainingArea::trainingAreaModifyRequest(const T
// insert new entries
auto &map2D = ddsData.map2D();
map2D.resize(request.map2D().size());
for (unsigned int i = 0; i < request.map2D().size(); i++)
auto &map2D = ddsData.map2D;
map2D.resize(request.map2D.size());
for (unsigned int i = 0; i < request.map2D.size(); i++)
{
MapDescription mdData = request.map2D().at(i);
MapDescription mdData = request.map2D.at(i);
ObjectMapDescription *md (new ObjectMapDescription(m_mainHandler));
mdData.id(0);
mdData.trainingAreaId(ifs->getId());
mdData.id = 0;
mdData.trainingAreaId = ifs->getId();
ret = md->createObject(mdData, i);
DEBUG_LOG(m_logger) << "insert topographic entries in map_description"
<< " for training area id " << ifs->getId()
<< " mapTypeId=" << mdData.mapTypeId()
<< " mapDescriptionTypeId=" << mdData.mapDescriptionTypeId();
<< " mapTypeId=" << mdData.mapTypeId
<< " mapDescriptionTypeId=" << mdData.mapDescriptionTypeId;
if (!ret.error())
{
map2D[i] = md->getData();
@@ -231,19 +231,19 @@ Core::FunctionReplyObject HandlerTrainingArea::trainingAreaModifyRequest(const T
}
}
auto &elevation = ddsData.elevation();
elevation.resize(request.elevation().size());
for (unsigned int i = 0; i < request.elevation().size(); i++)
auto &elevation = ddsData.elevation;
elevation.resize(request.elevation.size());
for (unsigned int i = 0; i < request.elevation.size(); i++)
{
MapDescription mdData = request.elevation().at(i);
MapDescription mdData = request.elevation.at(i);
ObjectMapDescription *md (new ObjectMapDescription(m_mainHandler));
mdData.id(0);
mdData.trainingAreaId(ifs->getId());
mdData.id = 0;
mdData.trainingAreaId = ifs->getId();
ret = md->createObject(mdData, i);
DEBUG_LOG(m_logger) << "insert elevation entries in map_description"
<< " for training area id " << ifs->getId()
<< " mapTypeId=" << mdData.mapTypeId()
<< " mapDescriptionTypeId=" << mdData.mapDescriptionTypeId();
<< " mapTypeId=" << mdData.mapTypeId
<< " mapDescriptionTypeId=" << mdData.mapDescriptionTypeId;
if (!ret.error())
{
elevation[i] = md->getData();
@@ -256,19 +256,19 @@ Core::FunctionReplyObject HandlerTrainingArea::trainingAreaModifyRequest(const T
}
}
auto &scene3D = ddsData.scene3D();
scene3D.resize(request.scene3D().size());
for (unsigned int i = 0; i < request.scene3D().size(); i++)
auto &scene3D = ddsData.scene3D;
scene3D.resize(request.scene3D.size());
for (unsigned int i = 0; i < request.scene3D.size(); i++)
{
MapDescription mdData = request.scene3D().at(i);
MapDescription mdData = request.scene3D.at(i);
ObjectMapDescription *md (new ObjectMapDescription(m_mainHandler));
mdData.id(0);
mdData.trainingAreaId(ifs->getId());
mdData.id = 0;
mdData.trainingAreaId = ifs->getId();
ret = md->createObject(mdData, i);
DEBUG_LOG(m_logger) << "insert scene3D entries in map_description"
<< " for training area id " << ifs->getId()
<< " mapTypeId=" << mdData.mapTypeId()
<< " mapDescriptionTypeId=" << mdData.mapDescriptionTypeId();
<< " mapTypeId=" << mdData.mapTypeId
<< " mapDescriptionTypeId=" << mdData.mapDescriptionTypeId;
if (!ret.error())
{
scene3D[i] = md->getData();
@@ -281,19 +281,19 @@ Core::FunctionReplyObject HandlerTrainingArea::trainingAreaModifyRequest(const T
}
}
auto &sceneObj = ddsData.sceneObjects();
sceneObj.resize(request.sceneObjects().size());
for (unsigned int i = 0; i < request.sceneObjects().size(); i++)
auto &sceneObj = ddsData.sceneObjects;
sceneObj.resize(request.sceneObjects.size());
for (unsigned int i = 0; i < request.sceneObjects.size(); i++)
{
MapDescription mdData = request.sceneObjects().at(i);
MapDescription mdData = request.sceneObjects.at(i);
ObjectMapDescription *md (new ObjectMapDescription(m_mainHandler));
mdData.id(0);
mdData.trainingAreaId(ifs->getId());
mdData.id = 0;
mdData.trainingAreaId = ifs->getId();
ret = md->createObject(mdData, i);
DEBUG_LOG(m_logger) << "insert sceneObjects entries in map_description"
<< " for training area id " << ifs->getId()
<< " mapTypeId=" << mdData.mapTypeId()
<< " mapDescriptionTypeId=" << mdData.mapDescriptionTypeId();
<< " mapTypeId=" << mdData.mapTypeId
<< " mapDescriptionTypeId=" << mdData.mapDescriptionTypeId;
if (!ret.error())
{
sceneObj[i] = md->getData();
@@ -306,7 +306,7 @@ Core::FunctionReplyObject HandlerTrainingArea::trainingAreaModifyRequest(const T
}
}
ddsData.id(ifs->getId());
ddsData.id = ifs->getId();
return ifs->updateObject(ddsData);
}
@@ -315,17 +315,17 @@ void HandlerTrainingArea::onTrainingAreaRemoveRequest(const rti::core::SampleIde
const Core::RemoveElementRequest &request)
{
Core::FunctionReplyObject ret;
ObjectTrainingArea *ifs = m_objectTrainingAreaMap.value(request.id());
ObjectTrainingArea *ifs = m_objectTrainingAreaMap.value(request.id);
if (ifs == nullptr)
{
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "Training area with id %1 not found")).arg(request.id());
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "Training area with id %1 not found")).arg(request.id);
m_mainHandler->dds()->fts()->trainingAreaRemoveReply(cookie, ret);
return;
}
if (m_mainHandler->dds()->topicLockMaster()->isLocked(ifs->getData(), m_mainHandler->exerciseId()))
{
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "Training area '%1' is used by another user!")).arg(ifs->getName());
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "Training area '%1' is used by another user!")).arg(ifs->getName());
m_mainHandler->dds()->fts()->trainingAreaRemoveReply(cookie, ret);
return;
}
@@ -340,8 +340,8 @@ void HandlerTrainingArea::onTrainingAreaRemoveRequest(const rti::core::SampleIde
{
// delete ObjectTrainingArea
delete ifs;
m_objectTrainingAreaMap.remove(request.id());
removeMapDescriptions(request.id());
m_objectTrainingAreaMap.remove(request.id);
removeMapDescriptions(request.id);
trans.commit();
}
@@ -362,10 +362,10 @@ void HandlerTrainingArea::onMapDescriptionModifyRequest(const rti::core::SampleI
Core::FunctionReplyObject HandlerTrainingArea::mapDescriptionModifyRequest(const MapDescription &request)
{
ObjectMapDescription *ifs = m_objectMapDescriptionMap.value(request.id());
ObjectMapDescription *ifs = m_objectMapDescriptionMap.value(request.id);
if (ifs == nullptr)
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "MapDescription with id %1 not found")).arg(request.id());
return Core::FunctionReplyObject(request.id, tr_lts("dds", "MapDescription with id %1 not found")).arg(request.id);
return ifs->updateObject(request);
}
@@ -375,17 +375,17 @@ void HandlerTrainingArea::onMapDescriptionRemoveRequest(const rti::core::SampleI
const Core::RemoveElementRequest &request)
{
Core::FunctionReplyObject ret;
ObjectMapDescription *ifs = m_objectMapDescriptionMap.value(request.id());
ObjectMapDescription *ifs = m_objectMapDescriptionMap.value(request.id);
if (ifs == nullptr)
{
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "MapDescription with id %1 not found")).arg(request.id());
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "MapDescription with id %1 not found")).arg(request.id);
m_mainHandler->dds()->fts()->mapDescriptionRemoveReply(cookie, ret);
return;
}
if (m_mainHandler->dds()->topicLockMaster()->isLocked(ifs->getData(), m_mainHandler->exerciseId()))
{
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "MapDescription '%1' is used by another user!")).arg(ifs->getName());
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "MapDescription '%1' is used by another user!")).arg(ifs->getName());
m_mainHandler->dds()->fts()->mapDescriptionRemoveReply(cookie, ret);
return;
}
@@ -398,7 +398,7 @@ void HandlerTrainingArea::onMapDescriptionRemoveRequest(const rti::core::SampleI
{
// delete ObjectMapDescription
delete ifs;
m_objectMapDescriptionMap.remove(request.id());
m_objectMapDescriptionMap.remove(request.id);
}
m_mainHandler->dds()->fts()->mapDescriptionRemoveReply(cookie, ret);