From adf8b0c12c5e48b26dd659e7c4ea34fc73a88b6f Mon Sep 17 00:00:00 2001 From: twi-devel Date: Tue, 13 Oct 2026 11:35:21 +0200 Subject: [PATCH] Fix invalidateFilter() deprecated API and add ImmutablePart includes - terrain_profile_processor.cpp: Add ImmutablePart.h and ImmutablePartCollection.h includes for Qt6 ArcGIS SDK v300 - base_symbol_model.cpp: Replace 4x invalidateFilter() with beginFilterChange()/endFilterChange() for Qt6 QSortFilterProxyModel compatibility Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../MapImpl/terrain_profile_processor.cpp | 2 ++ .../SituationMap/SymbologyImpl/base_symbol_model.cpp | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/terrain_profile_processor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/terrain_profile_processor.cpp index 487da8be4..bcbf78ec4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/terrain_profile_processor.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/terrain_profile_processor.cpp @@ -24,6 +24,8 @@ #include #include #include +#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/base_symbol_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/base_symbol_model.cpp index 295ffc666..4d25fa749 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/base_symbol_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/base_symbol_model.cpp @@ -997,33 +997,37 @@ QSet BaseSymbolProxyModel::validBaseSymbolCodes() const void BaseSymbolProxyModel::setValidBaseSymbolCodes(const QSet &validBaseSymbolCodes) { + beginFilterChange(); m_validBaseSymbolCodes = validBaseSymbolCodes; - invalidateFilter(); + endFilterChange(); } void BaseSymbolProxyModel::onFilterPoints(bool on) { + beginFilterChange(); if (on) m_geometrySet.insert(AdvancedSymbology::GeometryType::Point); else m_geometrySet.remove(AdvancedSymbology::GeometryType::Point); - invalidateFilter(); + endFilterChange(); } void BaseSymbolProxyModel::onFilterLines(bool on) { + beginFilterChange(); if (on) m_geometrySet.insert(AdvancedSymbology::GeometryType::Polyline); else m_geometrySet.remove(AdvancedSymbology::GeometryType::Polyline); - invalidateFilter(); + endFilterChange(); } void BaseSymbolProxyModel::onFilterAreas(bool on) { + beginFilterChange(); if (on) m_geometrySet.insert(AdvancedSymbology::GeometryType::Polygon); else m_geometrySet.remove(AdvancedSymbology::GeometryType::Polygon); - invalidateFilter(); + endFilterChange(); } bool BaseSymbolProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const