Skip to content

Commit cfe91f8

Browse files
committed
Apply FilterRect in combination with other filters
1 parent b47b9a5 commit cfe91f8

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

src/core/qgsfeaturerequest.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ QgsFeatureRequest::~QgsFeatureRequest()
8787

8888
QgsFeatureRequest& QgsFeatureRequest::setFilterRect( const QgsRectangle& rect )
8989
{
90-
mFilter = FilterRect;
9190
mFilterRect = rect;
9291
return *this;
9392
}

src/core/qgsfeaturerequest.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class CORE_EXPORT QgsFeatureRequest
7070
enum FilterType
7171
{
7272
FilterNone, //!< No filter is applied
73-
FilterRect, //!< Filter using a rectangle, no need to set NoGeometry
73+
FilterRect, //!< Obsolete, will be ignored. If a filterRect is set it will be used anyway. Filter using a rectangle, no need to set NoGeometry. Instead check for request.filterRect().isNull()
7474
FilterFid, //!< Filter using feature ID
7575
FilterExpression, //!< Filter using expression
7676
FilterFids //!< Filter using feature IDs
@@ -93,7 +93,7 @@ class CORE_EXPORT QgsFeatureRequest
9393

9494
~QgsFeatureRequest();
9595

96-
FilterType filterType() const { return mFilter; }
96+
FilterType filterType() const { if ( mFilter == FilterNone && !mFilterRect.isNull() ) return FilterRect; else return mFilter; }
9797

9898
//! Set rectangle from which features will be taken. Empty rectangle removes the filter.
9999
//!

0 commit comments

Comments
 (0)