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

Migrates residual Lts sources to generated rtiddsgen API

Browse Source 
Adds NmeaManagement tests, fixes codegen includes and Qt6 SerialPort CMake target.
This commit is contained in:
berrux-dev committed 2026-09-23 12:05:37 +02:00
1 parent 5485a90385
commit 881d44f4dd
512 files changed
+6887 -6426
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping_publisher.cpp
+15 -15
View File
@@ -21,12 +21,12 @@ namespace
bool isMountingPointOfInterest(const InfrastructureManagement::StructureElement &se)
{
if (se.structureElementTypeId() != InfrastructureManagement::StructureElementType::MountingPoint)
if (se.structureElementTypeId != InfrastructureManagement::StructureElementType::MountingPoint)
return false;
if (se.mountingPointTypeId() == InfrastructureManagement::MountingPointType::IndoorCamera ||
se.mountingPointTypeId() == InfrastructureManagement::MountingPointType::OutdoorCamera ||
se.mountingPointTypeId() == InfrastructureManagement::MountingPointType::AnnouncementUnit)
if (se.mountingPointTypeId == InfrastructureManagement::MountingPointType::IndoorCamera ||
se.mountingPointTypeId == InfrastructureManagement::MountingPointType::OutdoorCamera ||
se.mountingPointTypeId == InfrastructureManagement::MountingPointType::AnnouncementUnit)
return true;
return false;
@@ -35,10 +35,10 @@ bool isMountingPointOfInterest(const InfrastructureManagement::StructureElement
std::string displayName(const InfrastructureManagement::StructureElement &mp)
{
Q_ASSERT(isMountingPointOfInterest(mp));
if (mp.displayName().size() > 0)
return mp.displayName();
if (mp.displayName.size() > 0)
return mp.displayName;
return AudioVideoManagement::AudioVideoHandlerImpl::internalStreamName(mp.id()).toStdString();
return AudioVideoManagement::AudioVideoHandlerImpl::internalStreamName(mp.id).toStdString();
}
} // anonymous namespace
@@ -78,7 +78,7 @@ void StreamNameMappingPublisher::onMainStructureElementChanged(const Infrastruct
void StreamNameMappingPublisher::onMseChanged(const InfrastructureManagement::MainStructureElement &mse)
{
const auto &structureElements = mse.elements();
const auto &structureElements = mse.elements;
for (auto &se : structureElements)
if (isMountingPointOfInterest(se))
publish(se);
@@ -86,7 +86,7 @@ void StreamNameMappingPublisher::onMseChanged(const InfrastructureManagement::Ma
void StreamNameMappingPublisher::onMseRemoved(const InfrastructureManagement::MainStructureElement &mse)
{
const auto &structureElements = mse.elements();
const auto &structureElements = mse.elements;
for (auto &se : structureElements)
if (isMountingPointOfInterest(se))
remove(se);
@@ -95,18 +95,18 @@ void StreamNameMappingPublisher::onMseRemoved(const InfrastructureManagement::Ma
void StreamNameMappingPublisher::publish(const InfrastructureManagement::StructureElement &mountingPoint)
{
StreamName streamName;
streamName.mountingPointId(mountingPoint.id());
streamName.internalName(AudioVideoHandlerImpl::internalStreamName(mountingPoint.id()).toStdString());
streamName.displayName(displayName(mountingPoint));
streamName.mountingPointId = mountingPoint.id;
streamName.internalName = AudioVideoHandlerImpl::internalStreamName(mountingPoint.id).toStdString();
streamName.displayName = displayName(mountingPoint);
if (m_streamNames[mountingPoint.id()] != streamName)
if (m_streamNames[mountingPoint.id] != streamName)
m_dts->publish(streamName);
m_streamNames[mountingPoint.id()] = streamName;
m_streamNames[mountingPoint.id] = streamName;
}
void StreamNameMappingPublisher::remove(const InfrastructureManagement::StructureElement &mountingPoint)
{
m_dts->removeStreamNameByKey(mountingPoint.id());
m_dts->removeStreamNameByKey(mountingPoint.id);
}
} // namespace AudioVideoManagement