sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-16 00:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove references to QgsFeatureRequest::FilterRect

Browse Source
This commit is contained in:
Matthias Kuhn 2015-07-16 08:50:42 +02:00
parent 1d7a6a4909
commit 75712643cd
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/qgsattributetabledialog.cpp
View File

@ -359,7 +359,7 @@ void QgsAttributeTableDialog::runFieldCalculation( QgsVectorLayer* layer, QStrin
bool useGeometry = exp.needsGeometry();
QgsFeatureRequest request( mMainView->masterModel()->request() );
useGeometry |= request.filterType() == QgsFeatureRequest::FilterRect;
useGeometry |= !request.filterRect().isNull();
request.setFlags( useGeometry ? QgsFeatureRequest::NoFlags : QgsFeatureRequest::NoGeometry );
int rownum = 1;

2
src/gui/attributetable/qgsattributetablefiltermodel.cpp
View File

@ -266,7 +266,7 @@ void QgsAttributeTableFilterModel::generateListOfVisibleFeatures()
renderer->startRender( renderContext, layer()->pendingFields() );
QgsFeatureRequest r( masterModel()->request() );
if ( r.filterType() == QgsFeatureRequest::FilterRect )
if ( !r.filterRect().isNull() )
{
r.setFilterRect( r.filterRect().intersect( &rect ) );
}

2
src/gui/attributetable/qgsdualview.cpp
View File

@ -65,7 +65,7 @@ void QgsDualView::init( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas, const Qg
connect( mTableView, SIGNAL( willShowContextMenu( QMenu*, QModelIndex ) ), this, SLOT( viewWillShowContextMenu( QMenu*, QModelIndex ) ) );
initLayerCache( layer, request.filterType() == QgsFeatureRequest::FilterRect );
initLayerCache( layer, !request.filterRect().isNull() );
initModels( mapCanvas, request );
mTableView->setModel( mFilterModel );