Skip to content
Permalink
Browse files

Remove references to QgsFeatureRequest::FilterRect

  • Loading branch information
m-kuhn committed Jul 16, 2015
1 parent 1d7a6a4 commit 75712643cd393c88882e9eff6d8b34c29e18e6a2
@@ -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;
@@ -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 ) );
}
@@ -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 );

0 comments on commit 7571264

Please sign in to comment.
You can’t perform that action at this time.