Skip to content

Commit 6765a7c

Browse files
committed
rename filters in map layer proxy model
1 parent afc2e05 commit 6765a7c

File tree

3 files changed

+21
-18
lines changed

3 files changed

+21
-18
lines changed

python/gui/qgsmaplayerproxymodel.sip

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@ class QgsMapLayerProxyModel : QSortFilterProxyModel
1212
public:
1313
enum Filter
1414
{
15-
NoFilter = 1,
16-
RasterLayer = 2,
17-
NoGeometry = 4,
18-
PointLayer = 8,
19-
LineLayer = 16,
20-
PolygonLayer = 32,
21-
HasGeometry = 56,
22-
VectorLayer = 60
15+
RasterLayer = 1,
16+
NoGeometry = 2,
17+
PointLayer = 4,
18+
LineLayer = 8,
19+
PolygonLayer = 16,
20+
HasGeometry = 28,
21+
VectorLayer = 30,
22+
PluginLayer = 32,
23+
All = 63
2324
};
2425
typedef QFlags<QgsMapLayerProxyModel::Filter> Filters;
2526

src/gui/qgsmaplayerproxymodel.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
QgsMapLayerProxyModel::QgsMapLayerProxyModel( QObject *parent )
2222
: QSortFilterProxyModel( parent )
23-
, mFilters( NoFilter )
23+
, mFilters( All )
2424
, mModel( new QgsMapLayerModel( this ) )
2525
{
2626
setSourceModel( mModel );
@@ -34,7 +34,7 @@ QgsMapLayerProxyModel *QgsMapLayerProxyModel::setFilters( Filters filters )
3434

3535
bool QgsMapLayerProxyModel::filterAcceptsRow( int source_row, const QModelIndex &source_parent ) const
3636
{
37-
if ( mFilters.testFlag( NoFilter ) )
37+
if ( mFilters.testFlag( All ) )
3838
return true;
3939

4040
QModelIndex index = sourceModel()->index( source_row, 0, source_parent );
@@ -44,7 +44,8 @@ bool QgsMapLayerProxyModel::filterAcceptsRow( int source_row, const QModelIndex
4444

4545
// layer type
4646
if (( mFilters.testFlag( RasterLayer ) && layer->type() == QgsMapLayer::RasterLayer ) ||
47-
( mFilters.testFlag( VectorLayer ) && layer->type() == QgsMapLayer::VectorLayer ) )
47+
( mFilters.testFlag( VectorLayer ) && layer->type() == QgsMapLayer::VectorLayer ) ||
48+
( mFilters.testFlag( PluginLayer ) && layer->type() == QgsMapLayer::PluginLayer ) )
4849
return true;
4950

5051
// geometry type

src/gui/qgsmaplayerproxymodel.h

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,15 @@ class GUI_EXPORT QgsMapLayerProxyModel : public QSortFilterProxyModel
3030
public:
3131
enum Filter
3232
{
33-
NoFilter = 1,
34-
RasterLayer = 2,
35-
NoGeometry = 4,
36-
PointLayer = 8,
37-
LineLayer = 16,
38-
PolygonLayer = 32,
33+
RasterLayer = 1,
34+
NoGeometry = 2,
35+
PointLayer = 4,
36+
LineLayer = 8,
37+
PolygonLayer = 16,
3938
HasGeometry = PointLayer | LineLayer | PolygonLayer,
40-
VectorLayer = NoGeometry | HasGeometry
39+
VectorLayer = NoGeometry | HasGeometry,
40+
PluginLayer = 32,
41+
All = RasterLayer | PolygonLayer | PluginLayer
4142
};
4243
Q_DECLARE_FLAGS( Filters, Filter )
4344

0 commit comments

Comments
 (0)