use filters rather than list of layer types

3nids · 3nids · commit 558e0b6ce8e8 · 2020-06-06T09:22:38.000+02:00
diff --git a/python/core/auto_generated/layertree/qgslayertreefilterproxymodel.sip.in b/python/core/auto_generated/layertree/qgslayertreefilterproxymodel.sip.in
@@ -65,7 +65,7 @@ Sets the layer tree model
 This will refresh the model
 %End
 
-    void setMapLayerTypeFilter( const QList<QgsMapLayerType> &types = QList<QgsMapLayerType>() );
+    void setFilters( const QgsMapLayerProxyModel::Filters &filters );
 %Docstring
 Defines the type layers (vector, raster, etc) shown in the tree
 If the list is empty, all types are shown.
diff --git a/src/core/layertree/qgslayertreefilterproxymodel.cpp b/src/core/layertree/qgslayertreefilterproxymodel.cpp
@@ -107,10 +107,10 @@ void QgsLayerTreeFilterProxyModel::resetLayerTreeModel()
   endResetModel();
 }
 
-void QgsLayerTreeFilterProxyModel::setMapLayerTypeFilter( const QList<QgsMapLayerType> &types )
+void QgsLayerTreeFilterProxyModel::setFilters( const QgsMapLayerProxyModel::Filters &filters )
 {
   beginResetModel();
-  mLayerTypeFilter = types;
+  mFilters = filters;
   endResetModel();
 }
 
@@ -181,7 +181,7 @@ bool QgsLayerTreeFilterProxyModel::nodeShown( QgsLayerTreeNode *node ) const
       return false;
     if ( !mFilterText.isEmpty() && !layer->name().contains( mFilterText, Qt::CaseInsensitive ) )
       return false;
-    if ( !mLayerTypeFilter.isEmpty() && !mLayerTypeFilter.contains( layer->type() ) )
+    if ( !QgsMapLayerProxyModel::layerMatchesFilters( layer, mFilters ) )
       return false;
 
     return layerShown( layer );
diff --git a/src/core/layertree/qgslayertreefilterproxymodel.h b/src/core/layertree/qgslayertreefilterproxymodel.h
@@ -21,6 +21,7 @@
 
 #include "qgis_core.h"
 #include "qgsmaplayer.h"
+#include "qgsmaplayerproxymodel.h"
 
 class QgsLayerTreeModel;
 class QgsLayerTreeNode;
@@ -67,7 +68,7 @@ class CORE_EXPORT QgsLayerTreeFilterProxyModel : public QSortFilterProxyModel
      * Defines the type layers (vector, raster, etc) shown in the tree
      * If the list is empty, all types are shown.
      */
-    void setMapLayerTypeFilter( const QList<QgsMapLayerType> &types = QList<QgsMapLayerType>() );
+    void setFilters( const QgsMapLayerProxyModel::Filters &filters );
 
     virtual int columnCount( const QModelIndex &parent ) const override;
     virtual Qt::ItemFlags flags( const QModelIndex &idx ) const override;
@@ -106,7 +107,7 @@ class CORE_EXPORT QgsLayerTreeFilterProxyModel : public QSortFilterProxyModel
     QgsLayerTreeModel *mLayerTreeModel = nullptr;
     QList<QgsMapLayer *> mCheckedLayers;
     QString mFilterText;
-    QList<QgsMapLayerType> mLayerTypeFilter;
+    QgsMapLayerProxyModel::Filters mFilters = QgsMapLayerProxyModel::All;
 };
 
 #endif // QGSLAYERTREEFILTERPROXYMODEL_H

Original file line number	Diff line number	Diff line change
`@@ -107,10 +107,10 @@ void QgsLayerTreeFilterProxyModel::resetLayerTreeModel()`
`107`	`107`	`endResetModel();`
`108`	`108`	`}`
`109`	`109`
`110`		`-void QgsLayerTreeFilterProxyModel::setMapLayerTypeFilter( const QList<QgsMapLayerType> &types )`
	`110`	`+void QgsLayerTreeFilterProxyModel::setFilters( const QgsMapLayerProxyModel::Filters &filters )`
`111`	`111`	`{`
`112`	`112`	`beginResetModel();`
`113`		`- mLayerTypeFilter = types;`
	`113`	`+ mFilters = filters;`
`114`	`114`	`endResetModel();`
`115`	`115`	`}`
`116`	`116`
`@@ -181,7 +181,7 @@ bool QgsLayerTreeFilterProxyModel::nodeShown( QgsLayerTreeNode *node ) const`
`181`	`181`	`return false;`
`182`	`182`	`if ( !mFilterText.isEmpty() && !layer->name().contains( mFilterText, Qt::CaseInsensitive ) )`
`183`	`183`	`return false;`
`184`		`- if ( !mLayerTypeFilter.isEmpty() && !mLayerTypeFilter.contains( layer->type() ) )`
	`184`	`+ if ( !QgsMapLayerProxyModel::layerMatchesFilters( layer, mFilters ) )`
`185`	`185`	`return false;`
`186`	`186`
`187`	`187`	`return layerShown( layer );`