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

Migrates flt handlers to CorePortType and plain members

Browse Source
This commit is contained in:
berrux-dev committed 2026-09-18 17:49:15 +02:00
1 parent a3e44a5bd8
commit 7d1074588c
6 files changed
+34 -34
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/dds_handler.cpp
+1 -1
View File
@@ -65,7 +65,7 @@ void DdsHandler::setRunningState(Core::RunningState rs)
m_pacemaker->setNewState(rs); m_pacemaker->setNewState(rs);
} }
void DdsHandler::addPortToPacemaker(quint16 port, Core::PortType type) void DdsHandler::addPortToPacemaker(quint16 port, Core::CorePortType type)
{ {
if (!m_pacemaker) if (!m_pacemaker)
return; return;
qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/dds_handler.h
+1 -1
View File
@@ -33,7 +33,7 @@ public:
bool init(const QStringList &qosFileList = QStringList()); bool init(const QStringList &qosFileList = QStringList());
void setRunningState(Core::RunningState rs); void setRunningState(Core::RunningState rs);
void addPortToPacemaker(quint16 port, Core::PortType type); void addPortToPacemaker(quint16 port, Core::CorePortType type);
std::shared_ptr<FilterManagement::Interface::Dts> dts() const { return m_ddsDts; } std::shared_ptr<FilterManagement::Interface::Dts> dts() const { return m_ddsDts; }
std::shared_ptr<FilterManagement::Interface::Fts> fts() const { return m_ddsFts; } std::shared_ptr<FilterManagement::Interface::Fts> fts() const { return m_ddsFts; }
qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_aes_filter.cpp
+10 -10
View File
@@ -60,7 +60,7 @@ void HandlerAesFilter::cleanup()
auto dts = dds()->dts(); auto dts = dds()->dts();
for (auto it = m_aesFilterMap.cbegin(); it != m_aesFilterMap.cend(); ++it) for (auto it = m_aesFilterMap.cbegin(); it != m_aesFilterMap.cend(); ++it)
{ {
dts->removeAesFilterByKey(it.value()->id()); dts->removeAesFilterByKey(it.value()->id);
delete it.value(); delete it.value();
} }
m_aesFilterMap.clear(); m_aesFilterMap.clear();
@@ -79,9 +79,9 @@ void HandlerAesFilter::onAesFilterUpdateRequest(const rti::core::SampleIdentity
Core::FunctionReplyObject HandlerAesFilter::aesFilterUpdateRequest(const AesFilter &request) Core::FunctionReplyObject HandlerAesFilter::aesFilterUpdateRequest(const AesFilter &request)
{ {
Database::AesFilter dbFilter; Database::AesFilter dbFilter;
dbFilter.operatorId = request.operatorId(); dbFilter.operatorId = request.operatorId;
dbFilter.content = QString::fromStdString(request.content()); dbFilter.content = QString::fromStdString(request.content);
dbFilter.ctx = QString::fromStdString(request.ctx()); dbFilter.ctx = QString::fromStdString(request.ctx);
const key k(dbFilter.operatorId, dbFilter.ctx); const key k(dbFilter.operatorId, dbFilter.ctx);
auto it = m_aesFilterMap.find(k); auto it = m_aesFilterMap.find(k);
@@ -92,21 +92,21 @@ Core::FunctionReplyObject HandlerAesFilter::aesFilterUpdateRequest(const AesFilt
if (!db()->insert(dbFilter)) if (!db()->insert(dbFilter))
return Core::FunctionReplyObject(dbFilter.operatorId, tr_lts("dds", "Can not insert AesFilter into database")); return Core::FunctionReplyObject(dbFilter.operatorId, tr_lts("dds", "Can not insert AesFilter into database"));
AesFilter *ptr = new AesFilter(request); AesFilter *ptr = new AesFilter(request);
ptr->sampleTime(QDateTime::currentMSecsSinceEpoch()); ptr->sampleTime = QDateTime::currentMSecsSinceEpoch();
ptr->id(dbFilter.id); ptr->id = dbFilter.id;
m_aesFilterMap.insert(k, ptr); m_aesFilterMap.insert(k, ptr);
it = m_aesFilterMap.find(k); it = m_aesFilterMap.find(k);
} }
else else
{ {
// already exists // already exists
dbFilter.id = it.value()->id(); dbFilter.id = it.value()->id;
dbFilter.operatorId = it.value()->operatorId(); dbFilter.operatorId = it.value()->operatorId;
if (!db()->update(dbFilter)) if (!db()->update(dbFilter))
return Core::FunctionReplyObject(dbFilter.operatorId, tr_lts("dds", "Error updating AesFilter in database")); return Core::FunctionReplyObject(dbFilter.operatorId, tr_lts("dds", "Error updating AesFilter in database"));
it.value()->sampleTime(QDateTime::currentMSecsSinceEpoch()); it.value()->sampleTime = QDateTime::currentMSecsSinceEpoch();
it.value()->content(request.content()); it.value()->content = request.content;
} }
dds()->dts()->publish(*it.value()); dds()->dts()->publish(*it.value());
return Core::FunctionReplyObject(); return Core::FunctionReplyObject();
qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_building_component_filter.cpp
+10 -10
View File
@@ -60,7 +60,7 @@ void HandlerBuildingComponentFilter::cleanup()
auto dts = dds()->dts(); auto dts = dds()->dts();
for (auto it = m_buildingComponentFilterMap.cbegin(); it != m_buildingComponentFilterMap.cend(); ++it) for (auto it = m_buildingComponentFilterMap.cbegin(); it != m_buildingComponentFilterMap.cend(); ++it)
{ {
dts->removeBuildingComponentFilterByKey(it.value()->id()); dts->removeBuildingComponentFilterByKey(it.value()->id);
delete it.value(); delete it.value();
} }
m_buildingComponentFilterMap.clear(); m_buildingComponentFilterMap.clear();
@@ -79,9 +79,9 @@ void HandlerBuildingComponentFilter::onBuildingComponentFilterUpdateRequest(cons
Core::FunctionReplyObject HandlerBuildingComponentFilter::BuildingComponentFilterUpdateRequest(const BuildingComponentFilter &request) Core::FunctionReplyObject HandlerBuildingComponentFilter::BuildingComponentFilterUpdateRequest(const BuildingComponentFilter &request)
{ {
Database::BuildingComponentFilter dbFilter; Database::BuildingComponentFilter dbFilter;
dbFilter.operatorId = request.operatorId(); dbFilter.operatorId = request.operatorId;
dbFilter.content = QString::fromStdString(request.content()); dbFilter.content = QString::fromStdString(request.content);
dbFilter.ctx = QString::fromStdString(request.ctx()); dbFilter.ctx = QString::fromStdString(request.ctx);
const key k(dbFilter.operatorId, dbFilter.ctx); const key k(dbFilter.operatorId, dbFilter.ctx);
auto it = m_buildingComponentFilterMap.find(k); auto it = m_buildingComponentFilterMap.find(k);
@@ -92,21 +92,21 @@ Core::FunctionReplyObject HandlerBuildingComponentFilter::BuildingComponentFilte
if (!db()->insert(dbFilter)) if (!db()->insert(dbFilter))
return Core::FunctionReplyObject(dbFilter.operatorId, tr_lts("dds", "Can not insert BuildingComponentFilter into database")); return Core::FunctionReplyObject(dbFilter.operatorId, tr_lts("dds", "Can not insert BuildingComponentFilter into database"));
BuildingComponentFilter *ptr = new BuildingComponentFilter(request); BuildingComponentFilter *ptr = new BuildingComponentFilter(request);
ptr->sampleTime(QDateTime::currentMSecsSinceEpoch()); ptr->sampleTime = QDateTime::currentMSecsSinceEpoch();
ptr->id(dbFilter.id); ptr->id = dbFilter.id;
m_buildingComponentFilterMap.insert(k, ptr); m_buildingComponentFilterMap.insert(k, ptr);
it = m_buildingComponentFilterMap.find(k); it = m_buildingComponentFilterMap.find(k);
} }
else else
{ {
// already exists // already exists
dbFilter.id = it.value()->id(); dbFilter.id = it.value()->id;
dbFilter.operatorId = it.value()->operatorId(); dbFilter.operatorId = it.value()->operatorId;
if (!db()->update(dbFilter)) if (!db()->update(dbFilter))
return Core::FunctionReplyObject(dbFilter.operatorId, tr_lts("dds", "Error updating BuildingComponentFilter in database")); return Core::FunctionReplyObject(dbFilter.operatorId, tr_lts("dds", "Error updating BuildingComponentFilter in database"));
it.value()->sampleTime(QDateTime::currentMSecsSinceEpoch()); it.value()->sampleTime = QDateTime::currentMSecsSinceEpoch();
it.value()->content(request.content()); it.value()->content = request.content;
} }
dds()->dts()->publish(*it.value()); dds()->dts()->publish(*it.value());
return Core::FunctionReplyObject(); return Core::FunctionReplyObject();
qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_filter_data_update.cpp
+2 -2
View File
@@ -71,7 +71,7 @@ void HandlerFilterDataUpdate::onFilterDataUpdateRequest(const rti::core::SampleI
Core::FunctionReplyObject HandlerFilterDataUpdate::filterDataUpdateRequest(const FilterData &request) Core::FunctionReplyObject HandlerFilterDataUpdate::filterDataUpdateRequest(const FilterData &request)
{ {
DEBUG_LOG(m_logger) << LOGFUNCTION << " FilterData: " << request; DEBUG_LOG(m_logger) << LOGFUNCTION << " FilterData: " << request;
const std::tuple<int,int,int> k(request.operatorId(), request.screenId(), request.screenContainerId()); const std::tuple<int,int,int> k(request.operatorId, request.screenId, request.screenContainerId);
auto it = m_latestFilter.find(k); auto it = m_latestFilter.find(k);
if (it == m_latestFilter.end()) if (it == m_latestFilter.end())
{ {
@@ -81,7 +81,7 @@ Core::FunctionReplyObject HandlerFilterDataUpdate::filterDataUpdateRequest(const
// already exists // already exists
FilterData &currentRef = it.value(); FilterData &currentRef = it.value();
// compare age: // compare age:
if (currentRef.requestTime() <= request.requestTime()) if (currentRef.requestTime <= request.requestTime)
currentRef = request; currentRef = request;
} }
dds()->dts()->publish(request); dds()->dts()->publish(request);
qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/handler_symbol_appearance.cpp
+10 -10
View File
@@ -60,7 +60,7 @@ void HandlerSymbolAppearance::cleanup()
auto dts = dds()->dts(); auto dts = dds()->dts();
for (auto it = m_symbolAppearanceMap.cbegin(); it != m_symbolAppearanceMap.cend(); ++it) for (auto it = m_symbolAppearanceMap.cbegin(); it != m_symbolAppearanceMap.cend(); ++it)
{ {
dts->removeSymbolAppearanceByKey(it.value()->id()); dts->removeSymbolAppearanceByKey(it.value()->id);
delete it.value(); delete it.value();
} }
m_symbolAppearanceMap.clear(); m_symbolAppearanceMap.clear();
@@ -79,9 +79,9 @@ void HandlerSymbolAppearance::onSymbolAppearanceUpdateRequest(const rti::core::S
Core::FunctionReplyObject HandlerSymbolAppearance::symbolAppearanceUpdateRequest(const SymbolAppearance &request) Core::FunctionReplyObject HandlerSymbolAppearance::symbolAppearanceUpdateRequest(const SymbolAppearance &request)
{ {
Database::SymbolAppearance dbFilter; Database::SymbolAppearance dbFilter;
dbFilter.operatorId = request.operatorId(); dbFilter.operatorId = request.operatorId;
dbFilter.content = QString::fromStdString(request.content()); dbFilter.content = QString::fromStdString(request.content);
dbFilter.ctx = QString::fromStdString(request.ctx()); dbFilter.ctx = QString::fromStdString(request.ctx);
const key k(dbFilter.operatorId, dbFilter.ctx); const key k(dbFilter.operatorId, dbFilter.ctx);
auto it = m_symbolAppearanceMap.find(k); 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")); return Core::FunctionReplyObject(dbFilter.operatorId, tr_lts("dds", "Can not insert SymbolAppearanceFilter into database"));
} }
SymbolAppearance *ptr = new SymbolAppearance(request); SymbolAppearance *ptr = new SymbolAppearance(request);
ptr->sampleTime(QDateTime::currentMSecsSinceEpoch()); ptr->sampleTime = QDateTime::currentMSecsSinceEpoch();
ptr->id(dbFilter.id); ptr->id = dbFilter.id;
m_symbolAppearanceMap.insert(k, ptr); m_symbolAppearanceMap.insert(k, ptr);
it = m_symbolAppearanceMap.find(k); it = m_symbolAppearanceMap.find(k);
} }
else else
{ {
// already exists // already exists
dbFilter.id = it.value()->id(); dbFilter.id = it.value()->id;
dbFilter.operatorId = it.value()->operatorId(); dbFilter.operatorId = it.value()->operatorId;
DEBUG_LOG(m_logger) << "Update symbol filter with id " << dbFilter.id DEBUG_LOG(m_logger) << "Update symbol filter with id " << dbFilter.id
<< " for operator " << dbFilter.operatorId; << " for operator " << dbFilter.operatorId;
if (!db()->update(dbFilter)) if (!db()->update(dbFilter))
return Core::FunctionReplyObject(dbFilter.operatorId, tr_lts("dds", "Error updating SymbolAppearanceFilter in database")); return Core::FunctionReplyObject(dbFilter.operatorId, tr_lts("dds", "Error updating SymbolAppearanceFilter in database"));
it.value()->sampleTime(QDateTime::currentMSecsSinceEpoch()); it.value()->sampleTime = QDateTime::currentMSecsSinceEpoch();
it.value()->content(request.content()); it.value()->content = request.content;
} }
dds()->dts()->publish(*it.value()); dds()->dts()->publish(*it.value());
return Core::FunctionReplyObject(); return Core::FunctionReplyObject();