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

Migrates InfrastructureManagement to generated rtiddsgen API

Browse Source 
Converts accessor calls to plain member access across ism service.
This commit is contained in:
berrux-dev committed 2026-09-21 02:45:09 +02:00
1 parent 472f537313
commit 82356f23e5
30 files changed
+1322 -1314
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_effect_area.cpp
+18 -18
View File
@@ -61,15 +61,15 @@ bool HandlerEffectArea::init()
int HandlerEffectArea::getSeId(const int mountPointId, const InfrastructureManagement::MainStructureElement &mse) const
{
for ( unsigned int i = 0; i < mse.elements().size(); i++)
for ( unsigned int i = 0; i < mse.elements.size(); i++)
{
ERROR_LOG(m_logger) << "mountPointId=" << mountPointId
<< " id=" << mse.elements().at(i).id()
<< " mpId="<< mse.elements().at(i).mountingPointId();
if ( mountPointId ==mse.elements().at(i).mountingPointId() )
<< " id=" << mse.elements.at(i).id
<< " mpId="<< mse.elements.at(i).mountingPointId;
if ( mountPointId ==mse.elements.at(i).mountingPointId )
{
ERROR_LOG(m_logger) << "return id=" << mse.elements().at(i).id();
return mse.elements().at(i).id();
ERROR_LOG(m_logger) << "return id=" << mse.elements.at(i).id;
return mse.elements.at(i).id;
}
}
return 0;
@@ -77,12 +77,12 @@ int HandlerEffectArea::getSeId(const int mountPointId, const InfrastructureManag
ObjectEffectArea *HandlerEffectArea::createEffectAreaForMse(const InfrastructureManagement::MainStructureElement &mse)
{
std::string properties = mse.properties();
std::string properties = mse.properties;
if (properties.find("soundArea") == std::string::npos) // building has no associated sound area
return nullptr;
DEBUG_LOG(m_logger) << "createEffectAreaForMse id=" << mse.id()
DEBUG_LOG(m_logger) << "createEffectAreaForMse id=" << mse.id
<< " propoerties=" << properties;
QJsonObject jsonObj = QJsonDocument::fromJson(QByteArray::fromStdString(properties)).object().value(QStringLiteral("soundArea")).toObject();
@@ -99,18 +99,18 @@ ObjectEffectArea *HandlerEffectArea::createEffectAreaForMse(const Infrastructure
}
EffectArea effectArea;
effectArea.id(id);
effectArea.id = id;
int seId = getSeId(mainEgcuMountpoint, mse);
effectArea.areaEgcuId(seId);
effectArea.areaEgcuId = seId;
effectArea.egcuIds(egcuIdsFromJsonObject(jsonObj, mse));
effectArea.geometry(geometryFromJsonObject(jsonObj));
effectArea.egcuIds = egcuIdsFromJsonObject(jsonObj, mse);
effectArea.geometry = geometryFromJsonObject(jsonObj);
DEBUG_LOG(m_logger) << "mainEgcuMountpoint=" << mainEgcuMountpoint
<< " effectArea.areaEgcuId()=" << effectArea.areaEgcuId()
<< " effectArea.egcuIds().size()=" << effectArea.egcuIds().size()
<< " effectArea.name()=" << effectArea.name();
<< " effectArea.areaEgcuId=" << effectArea.areaEgcuId
<< " effectArea.egcuIds.size()=" << effectArea.egcuIds.size()
<< " effectArea.name=" << effectArea.name;
ObjectEffectArea *effectAreaObj = new ObjectEffectArea(m_mainHandler);
effectAreaObj->createObject(effectArea);
@@ -161,8 +161,8 @@ std::vector<Core::GeoPosition2D> HandlerEffectArea::geometryFromJsonObject(const
{
QJsonObject pnt = point.toObject(); // 2D vertex of the polygon that defines the sound area geometry
geoPos2D.lat(pnt.value(QStringLiteral("lat")).toDouble());
geoPos2D.lon(pnt.value(QStringLiteral("lon")).toDouble());
geoPos2D.lat = pnt.value(QStringLiteral("lat")).toDouble();
geoPos2D.lon = pnt.value(QStringLiteral("lon")).toDouble();
geometry.push_back(geoPos2D);
} // for
@@ -170,7 +170,7 @@ std::vector<Core::GeoPosition2D> HandlerEffectArea::geometryFromJsonObject(const
{
DEBUG_LOG(m_logger) << "number of vertices found: " << geometry.size();
for (const auto &geoPos : geometry)
DEBUG_LOG(m_logger) << "lat = " << geoPos.lat() << " | lon = " << geoPos.lon();
DEBUG_LOG(m_logger) << "lat = " << geoPos.lat << " | lon = " << geoPos.lon;
} // if
return geometry;