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

Migrates remaining services and plugins to generated rtiddsgen API

Browse Source 
Converts accessor calls to plain member access across the residual service set.
This commit is contained in:
berrux-dev committed 2026-09-21 02:47:48 +02:00
1 parent 6a8c31b735
commit c3eda18234
104 files changed
+2424 -2430
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_infrastructure_data.cpp
+18 -18
View File
@@ -55,7 +55,7 @@ bool HandlerInfrastructureData::init(int exerciseId)
auto predicate =
[](const InfrastructureManagement::InstrumentationAsset & a)
{
return a.mountingPointTypeId() == InfrastructureManagement::MountingPointType::IndoorCamera;
return a.mountingPointTypeId == InfrastructureManagement::MountingPointType::IndoorCamera;
};
if (!m_dtc->getAllAssetsPerRoom(predicate, assetsMap))
{
@@ -68,21 +68,21 @@ bool HandlerInfrastructureData::init(int exerciseId)
const int roomId = i.key();
for (const InfrastructureManagement::InstrumentationAsset &asset : i.value())
{
auto it = std::find(asset.availableInExercise().begin(),
asset.availableInExercise().end(), m_exerciseId);
if (it == asset.availableInExercise().end())
auto it = std::find(asset.availableInExercise.begin(),
asset.availableInExercise.end(), m_exerciseId);
if (it == asset.availableInExercise.end())
{
DEBUG_LOG(m_logger) << "Asset " << asset.id()
DEBUG_LOG(m_logger) << "Asset " << asset.id
<< " is not available in current exercise - skipping";
continue;
}
// in interne m_roomId2CameraNameMap eintragen, zur Zeit nur eine Kamera pro Raum möglich
m_roomId2CameraNameMap.insert(roomId, QString::fromStdString(asset.name()));
m_roomId2CameraNameMap.insert(roomId, QString::fromStdString(asset.name));
// und fuer subscribe in m_assetId2RoomIdMap eintragen
m_assetId2RoomIdMap.insert(asset.id(), roomId);
DEBUG_LOG(m_logger) << " assetId: " << asset.id()
<< " mountingPointTypeId: " << asset.mountingPointTypeId()
<< " name: " << asset.name();
m_assetId2RoomIdMap.insert(asset.id, roomId);
DEBUG_LOG(m_logger) << " assetId: " << asset.id
<< " mountingPointTypeId: " << asset.mountingPointTypeId
<< " name: " << asset.name;
}
} // for(auto i = assetMap...
@@ -126,24 +126,24 @@ QString HandlerInfrastructureData::getStreamNameFromRoomId(int roomId) const
void HandlerInfrastructureData::onAssetChanged(const InfrastructureManagement::InstrumentationAsset &data, DataModification modType)
{
Q_UNUSED(modType);
if (data.mountingPointTypeId() != InfrastructureManagement::MountingPointType::IndoorCamera)
if (data.mountingPointTypeId != InfrastructureManagement::MountingPointType::IndoorCamera)
return;
INFO_LOG(m_logger) << "onAssetChanged()"
<< " assetId: " << data.id()
<< " name: " << data.name();
<< " assetId: " << data.id
<< " name: " << data.name;
auto it = std::find(data.availableInExercise().begin(),
data.availableInExercise().end(), m_exerciseId);
if (it == data.availableInExercise().end())
auto it = std::find(data.availableInExercise.begin(),
data.availableInExercise.end(), m_exerciseId);
if (it == data.availableInExercise.end())
{
DEBUG_LOG(m_logger) << "Asset " << data.id()
DEBUG_LOG(m_logger) << "Asset " << data.id
<< " is not available in current exercise - skipping";
return;
}
// Hier muss aus der AssetId die zugehoerige roomid verwendet werden !!
m_roomId2CameraNameMap.insert(getRoomIdFromAssetId(data.id()), QString::fromStdString(data.name()));
m_roomId2CameraNameMap.insert(getRoomIdFromAssetId(data.id), QString::fromStdString(data.name));
for (auto i = m_roomId2CameraNameMap.begin(); i != m_roomId2CameraNameMap.end(); ++i)
{