From 7d1074588caf147a4c9970b08bb072f376bf9f4c Mon Sep 17 00:00:00 2001 From: berrux_dev Date: Fri, 18 Sep 2026 17:49:15 +0200 Subject: [PATCH] Migrates flt handlers to CorePortType and plain members --- .../Services/FilterManagement/dds_handler.cpp | 2 +- .../Services/FilterManagement/dds_handler.h | 2 +- .../FilterManagement/handler_aes_filter.cpp | 20 +++++++++---------- .../handler_building_component_filter.cpp | 20 +++++++++---------- .../handler_filter_data_update.cpp | 4 ++-- .../handler_symbol_appearance.cpp | 20 +++++++++---------- 6 files changed, 34 insertions(+), 34 deletions(-) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/dds_handler.cpp index eb4355834..1db8c5256 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/dds_handler.cpp @@ -65,7 +65,7 @@ void DdsHandler::setRunningState(Core::RunningState rs) m_pacemaker->setNewState(rs); } -void DdsHandler::addPortToPacemaker(quint16 port, Core::PortType type) +void DdsHandler::addPortToPacemaker(quint16 port, Core::CorePortType type) { if (!m_pacemaker) return; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/dds_handler.h index 93f77d322..82125f375 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/dds_handler.h @@ -33,7 +33,7 @@ public: bool init(const QStringList &qosFileList = QStringList()); void setRunningState(Core::RunningState rs); - void addPortToPacemaker(quint16 port, Core::PortType type); + void addPortToPacemaker(quint16 port, Core::CorePortType type); std::shared_ptr dts() const { return m_ddsDts; } std::shared_ptr fts() const { return m_ddsFts; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_aes_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_aes_filter.cpp index b04cf63d8..5d15336dd 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_aes_filter.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_aes_filter.cpp @@ -60,7 +60,7 @@ void HandlerAesFilter::cleanup() auto dts = dds()->dts(); for (auto it = m_aesFilterMap.cbegin(); it != m_aesFilterMap.cend(); ++it) { - dts->removeAesFilterByKey(it.value()->id()); + dts->removeAesFilterByKey(it.value()->id); delete it.value(); } m_aesFilterMap.clear(); @@ -79,9 +79,9 @@ void HandlerAesFilter::onAesFilterUpdateRequest(const rti::core::SampleIdentity Core::FunctionReplyObject HandlerAesFilter::aesFilterUpdateRequest(const AesFilter &request) { Database::AesFilter dbFilter; - dbFilter.operatorId = request.operatorId(); - dbFilter.content = QString::fromStdString(request.content()); - dbFilter.ctx = QString::fromStdString(request.ctx()); + dbFilter.operatorId = request.operatorId; + dbFilter.content = QString::fromStdString(request.content); + dbFilter.ctx = QString::fromStdString(request.ctx); const key k(dbFilter.operatorId, dbFilter.ctx); auto it = m_aesFilterMap.find(k); @@ -92,21 +92,21 @@ Core::FunctionReplyObject HandlerAesFilter::aesFilterUpdateRequest(const AesFilt if (!db()->insert(dbFilter)) return Core::FunctionReplyObject(dbFilter.operatorId, tr_lts("dds", "Can not insert AesFilter into database")); AesFilter *ptr = new AesFilter(request); - ptr->sampleTime(QDateTime::currentMSecsSinceEpoch()); - ptr->id(dbFilter.id); + ptr->sampleTime = QDateTime::currentMSecsSinceEpoch(); + ptr->id = dbFilter.id; m_aesFilterMap.insert(k, ptr); it = m_aesFilterMap.find(k); } else { // already exists - dbFilter.id = it.value()->id(); - dbFilter.operatorId = it.value()->operatorId(); + dbFilter.id = it.value()->id; + dbFilter.operatorId = it.value()->operatorId; if (!db()->update(dbFilter)) return Core::FunctionReplyObject(dbFilter.operatorId, tr_lts("dds", "Error updating AesFilter in database")); - it.value()->sampleTime(QDateTime::currentMSecsSinceEpoch()); - it.value()->content(request.content()); + it.value()->sampleTime = QDateTime::currentMSecsSinceEpoch(); + it.value()->content = request.content; } dds()->dts()->publish(*it.value()); return Core::FunctionReplyObject(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_building_component_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_building_component_filter.cpp index 3efc8eaf8..64f8acb58 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_building_component_filter.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_building_component_filter.cpp @@ -60,7 +60,7 @@ void HandlerBuildingComponentFilter::cleanup() auto dts = dds()->dts(); for (auto it = m_buildingComponentFilterMap.cbegin(); it != m_buildingComponentFilterMap.cend(); ++it) { - dts->removeBuildingComponentFilterByKey(it.value()->id()); + dts->removeBuildingComponentFilterByKey(it.value()->id); delete it.value(); } m_buildingComponentFilterMap.clear(); @@ -79,9 +79,9 @@ void HandlerBuildingComponentFilter::onBuildingComponentFilterUpdateRequest(cons Core::FunctionReplyObject HandlerBuildingComponentFilter::BuildingComponentFilterUpdateRequest(const BuildingComponentFilter &request) { Database::BuildingComponentFilter dbFilter; - dbFilter.operatorId = request.operatorId(); - dbFilter.content = QString::fromStdString(request.content()); - dbFilter.ctx = QString::fromStdString(request.ctx()); + dbFilter.operatorId = request.operatorId; + dbFilter.content = QString::fromStdString(request.content); + dbFilter.ctx = QString::fromStdString(request.ctx); const key k(dbFilter.operatorId, dbFilter.ctx); auto it = m_buildingComponentFilterMap.find(k); @@ -92,21 +92,21 @@ Core::FunctionReplyObject HandlerBuildingComponentFilter::BuildingComponentFilte if (!db()->insert(dbFilter)) return Core::FunctionReplyObject(dbFilter.operatorId, tr_lts("dds", "Can not insert BuildingComponentFilter into database")); BuildingComponentFilter *ptr = new BuildingComponentFilter(request); - ptr->sampleTime(QDateTime::currentMSecsSinceEpoch()); - ptr->id(dbFilter.id); + ptr->sampleTime = QDateTime::currentMSecsSinceEpoch(); + ptr->id = dbFilter.id; m_buildingComponentFilterMap.insert(k, ptr); it = m_buildingComponentFilterMap.find(k); } else { // already exists - dbFilter.id = it.value()->id(); - dbFilter.operatorId = it.value()->operatorId(); + dbFilter.id = it.value()->id; + dbFilter.operatorId = it.value()->operatorId; if (!db()->update(dbFilter)) return Core::FunctionReplyObject(dbFilter.operatorId, tr_lts("dds", "Error updating BuildingComponentFilter in database")); - it.value()->sampleTime(QDateTime::currentMSecsSinceEpoch()); - it.value()->content(request.content()); + it.value()->sampleTime = QDateTime::currentMSecsSinceEpoch(); + it.value()->content = request.content; } dds()->dts()->publish(*it.value()); return Core::FunctionReplyObject(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_filter_data_update.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_filter_data_update.cpp index 5819f9c9c..f9eb629fb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_filter_data_update.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_filter_data_update.cpp @@ -71,7 +71,7 @@ void HandlerFilterDataUpdate::onFilterDataUpdateRequest(const rti::core::SampleI Core::FunctionReplyObject HandlerFilterDataUpdate::filterDataUpdateRequest(const FilterData &request) { DEBUG_LOG(m_logger) << LOGFUNCTION << " FilterData: " << request; - const std::tuple k(request.operatorId(), request.screenId(), request.screenContainerId()); + const std::tuple k(request.operatorId, request.screenId, request.screenContainerId); auto it = m_latestFilter.find(k); if (it == m_latestFilter.end()) { @@ -81,7 +81,7 @@ Core::FunctionReplyObject HandlerFilterDataUpdate::filterDataUpdateRequest(const // already exists FilterData ¤tRef = it.value(); // compare age: - if (currentRef.requestTime() <= request.requestTime()) + if (currentRef.requestTime <= request.requestTime) currentRef = request; } dds()->dts()->publish(request); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_symbol_appearance.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_symbol_appearance.cpp index 1058e2ef8..7cacb294f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_symbol_appearance.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_symbol_appearance.cpp @@ -60,7 +60,7 @@ void HandlerSymbolAppearance::cleanup() auto dts = dds()->dts(); for (auto it = m_symbolAppearanceMap.cbegin(); it != m_symbolAppearanceMap.cend(); ++it) { - dts->removeSymbolAppearanceByKey(it.value()->id()); + dts->removeSymbolAppearanceByKey(it.value()->id); delete it.value(); } m_symbolAppearanceMap.clear(); @@ -79,9 +79,9 @@ void HandlerSymbolAppearance::onSymbolAppearanceUpdateRequest(const rti::core::S Core::FunctionReplyObject HandlerSymbolAppearance::symbolAppearanceUpdateRequest(const SymbolAppearance &request) { Database::SymbolAppearance dbFilter; - dbFilter.operatorId = request.operatorId(); - dbFilter.content = QString::fromStdString(request.content()); - dbFilter.ctx = QString::fromStdString(request.ctx()); + dbFilter.operatorId = request.operatorId; + dbFilter.content = QString::fromStdString(request.content); + dbFilter.ctx = QString::fromStdString(request.ctx); const key k(dbFilter.operatorId, dbFilter.ctx); auto it = m_symbolAppearanceMap.find(k); @@ -95,24 +95,24 @@ Core::FunctionReplyObject HandlerSymbolAppearance::symbolAppearanceUpdateRequest return Core::FunctionReplyObject(dbFilter.operatorId, tr_lts("dds", "Can not insert SymbolAppearanceFilter into database")); } SymbolAppearance *ptr = new SymbolAppearance(request); - ptr->sampleTime(QDateTime::currentMSecsSinceEpoch()); - ptr->id(dbFilter.id); + ptr->sampleTime = QDateTime::currentMSecsSinceEpoch(); + ptr->id = dbFilter.id; m_symbolAppearanceMap.insert(k, ptr); it = m_symbolAppearanceMap.find(k); } else { // already exists - dbFilter.id = it.value()->id(); - dbFilter.operatorId = it.value()->operatorId(); + dbFilter.id = it.value()->id; + dbFilter.operatorId = it.value()->operatorId; DEBUG_LOG(m_logger) << "Update symbol filter with id " << dbFilter.id << " for operator " << dbFilter.operatorId; if (!db()->update(dbFilter)) return Core::FunctionReplyObject(dbFilter.operatorId, tr_lts("dds", "Error updating SymbolAppearanceFilter in database")); - it.value()->sampleTime(QDateTime::currentMSecsSinceEpoch()); - it.value()->content(request.content()); + it.value()->sampleTime = QDateTime::currentMSecsSinceEpoch(); + it.value()->content = request.content; } dds()->dts()->publish(*it.value()); return Core::FunctionReplyObject();