Skip to content
Permalink
Browse files

Remove special handling for attribute table "show visible" initial state

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 5342a12c729872e7b0759bba5aea1d445539e5bd
Showing with 0 additions and 8 deletions.
  1. +0 −7 src/app/qgsattributetabledialog.cpp
  2. +0 −1 src/app/qgsattributetabledialog.h
@@ -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 )
@@ -344,7 +339,6 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *layer, QWidget
QgsAttributeTableDialog::~QgsAttributeTableDialog()
{
delete myDa;
delete mRubberBand;
}

void QgsAttributeTableDialog::updateTitle()
@@ -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 )
@@ -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;

0 comments on commit 5342a12

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