Skip to content

Commit

Permalink
Remove special handling for attribute table "show visible" initial state
Browse files Browse the repository at this point in the history
This is no longer required as the show visible option now always
uses provider side filters
  • Loading branch information
nyalldawson committed Mar 5, 2017
1 parent 6cd97d8 commit 5342a12
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 8 deletions.
7 changes: 0 additions & 7 deletions src/app/qgsattributetabledialog.cpp
Expand Up @@ -141,11 +141,6 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *layer, QWidget
QgsMapCanvas *mc = QgisApp::instance()->mapCanvas();
QgsRectangle extent( mc->mapSettings().mapToLayerCoordinates( layer, mc->extent() ) );
r.setFilterRect( extent );

mRubberBand = new QgsRubberBand( mc, QgsWkbTypes::PolygonGeometry );
mRubberBand->setToGeometry( QgsGeometry::fromRect( extent ), layer );

mActionShowAllFilter->setText( tr( "Show All Features In Initial Canvas Extent" ) );
needsGeom = true;
}
else if ( initialMode == QgsAttributeTableFilterModel::ShowSelected )
Expand Down Expand Up @@ -344,7 +339,6 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *layer, QWidget
QgsAttributeTableDialog::~QgsAttributeTableDialog()
{
delete myDa;
delete mRubberBand;
}

void QgsAttributeTableDialog::updateTitle()
Expand All @@ -355,7 +349,6 @@ void QgsAttributeTableDialog::updateTitle()
.arg( mMainView->featureCount() )
.arg( mMainView->filteredFeatureCount() )
.arg( mLayer->selectedFeatureCount() )
.arg( mRubberBand ? tr( ", spatially limited" ) : QLatin1String( "" ) )
);

if ( mMainView->filterMode() == QgsAttributeTableFilterModel::ShowAll )
Expand Down
1 change: 0 additions & 1 deletion src/app/qgsattributetabledialog.h
Expand Up @@ -229,7 +229,6 @@ class APP_EXPORT QgsAttributeTableDialog : public QDialog, private Ui::QgsAttrib
QSignalMapper *mFilterActionMapper = nullptr;

QgsVectorLayer *mLayer = nullptr;
QgsRubberBand *mRubberBand = nullptr;
QgsSearchWidgetWrapper *mCurrentSearchWidgetWrapper = nullptr;
QStringList mVisibleFields;
QgsAttributeEditorContext mEditorContext;
Expand Down

0 comments on commit 5342a12

Please sign in to comment.