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

Fix invalidateFilter() deprecated API and add ImmutablePart includes

Browse Source 
- 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>
This commit is contained in:
torstenandCopilot committed 2026-10-13 11:35:21 +02:00
1 parent 7fa88f781f
commit adf8b0c12c
2 files changed
+10 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/terrain_profile_processor.cpp
+2
View File
@@ -24,6 +24,8 @@
#include <Polyline.h> #include <Polyline.h>
#include <Part.h> #include <Part.h>
#include <Multipart.h> #include <Multipart.h>
#include <ImmutablePart.h>
#include <ImmutablePartCollection.h>
#include <LinearUnit.h> #include <LinearUnit.h>
#include <AngularUnit.h> #include <AngularUnit.h>
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/base_symbol_model.cpp
+8 -4
View File
@@ -997,33 +997,37 @@ QSet<QString> BaseSymbolProxyModel::validBaseSymbolCodes() const
void BaseSymbolProxyModel::setValidBaseSymbolCodes(const QSet<QString> &validBaseSymbolCodes) void BaseSymbolProxyModel::setValidBaseSymbolCodes(const QSet<QString> &validBaseSymbolCodes)
{ {
beginFilterChange();
m_validBaseSymbolCodes = validBaseSymbolCodes; m_validBaseSymbolCodes = validBaseSymbolCodes;
invalidateFilter(); endFilterChange();
} }
void BaseSymbolProxyModel::onFilterPoints(bool on) void BaseSymbolProxyModel::onFilterPoints(bool on)
{ {
beginFilterChange();
if (on) if (on)
m_geometrySet.insert(AdvancedSymbology::GeometryType::Point); m_geometrySet.insert(AdvancedSymbology::GeometryType::Point);
else else
m_geometrySet.remove(AdvancedSymbology::GeometryType::Point); m_geometrySet.remove(AdvancedSymbology::GeometryType::Point);
invalidateFilter(); endFilterChange();
} }
void BaseSymbolProxyModel::onFilterLines(bool on) void BaseSymbolProxyModel::onFilterLines(bool on)
{ {
beginFilterChange();
if (on) if (on)
m_geometrySet.insert(AdvancedSymbology::GeometryType::Polyline); m_geometrySet.insert(AdvancedSymbology::GeometryType::Polyline);
else else
m_geometrySet.remove(AdvancedSymbology::GeometryType::Polyline); m_geometrySet.remove(AdvancedSymbology::GeometryType::Polyline);
invalidateFilter(); endFilterChange();
} }
void BaseSymbolProxyModel::onFilterAreas(bool on) void BaseSymbolProxyModel::onFilterAreas(bool on)
{ {
beginFilterChange();
if (on) if (on)
m_geometrySet.insert(AdvancedSymbology::GeometryType::Polygon); m_geometrySet.insert(AdvancedSymbology::GeometryType::Polygon);
else else
m_geometrySet.remove(AdvancedSymbology::GeometryType::Polygon); m_geometrySet.remove(AdvancedSymbology::GeometryType::Polygon);
invalidateFilter(); endFilterChange();
} }
bool BaseSymbolProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const bool BaseSymbolProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const