Skip to content

Commit 76c31db

Browse files
committedNov 10, 2018
[afs] Remove 'cached' checkbox from source select dialog
This checkbox was never hooked up to anything (caching is ALWAYS enabled for the provider). (cherry picked from commit 1066161)
1 parent 2ac6013 commit 76c31db

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed
 

‎src/providers/arcgisrest/qgsafssourceselect.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,11 @@ bool QgsAfsSourceSelect::connectToService( const QgsOwsConnection &connection )
110110
QStandardItem *nameItem = new QStandardItem( name );
111111
QStandardItem *abstractItem = new QStandardItem( description );
112112
abstractItem->setToolTip( description );
113-
QStandardItem *cachedItem = new QStandardItem();
114113
QStandardItem *filterItem = new QStandardItem();
115-
cachedItem->setCheckable( true );
116-
cachedItem->setCheckState( Qt::Checked );
117114

118115
mAvailableCRS[name] = QList<QString>() << authid;
119116

120-
layerItems.insert( layerId, QList<QStandardItem *>() << idItem << nameItem << abstractItem << cachedItem << filterItem );
117+
layerItems.insert( layerId, QList<QStandardItem *>() << idItem << nameItem << abstractItem << filterItem );
121118
}
122119
}, serviceInfoMap, baseItemUrl );
123120

@@ -158,7 +155,7 @@ void QgsAfsSourceSelect::buildQuery( const QgsOwsConnection &connection, const Q
158155
{
159156
return;
160157
}
161-
QModelIndex filterIndex = index.sibling( index.row(), 4 );
158+
QModelIndex filterIndex = index.sibling( index.row(), 3 );
162159
const QString url = index.sibling( index.row(), 0 ).data( UrlRole ).toString();
163160

164161
// Query available fields

‎src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ QgsArcGisServiceSourceSelect::QgsArcGisServiceSourceSelect( const QString &servi
7878
mModel->setHorizontalHeaderItem( 2, new QStandardItem( QStringLiteral( "Abstract" ) ) );
7979
if ( serviceType == FeatureService )
8080
{
81-
mModel->setHorizontalHeaderItem( 3, new QStandardItem( QStringLiteral( "Cache Feature" ) ) );
82-
mModel->setHorizontalHeaderItem( 4, new QStandardItem( QStringLiteral( "Filter" ) ) );
81+
mModel->setHorizontalHeaderItem( 3, new QStandardItem( QStringLiteral( "Filter" ) ) );
8382
gbImageEncoding->hide();
8483
}
8584
else
@@ -346,14 +345,13 @@ void QgsArcGisServiceSourceSelect::addButtonClicked()
346345
QString layerTitle = mModel->itemFromIndex( mModel->index( row, 0, idx.parent() ) )->text(); //layer title/id
347346
QString layerName = mModel->itemFromIndex( mModel->index( row, 1, idx.parent() ) )->text(); //layer name
348347
const QString layerUri = mModel->itemFromIndex( mModel->index( row, 0, idx.parent() ) )->data( UrlRole ).toString();
349-
bool cacheFeatures = mServiceType == FeatureService ? mModel->itemFromIndex( mModel->index( row, 3, idx.parent() ) )->checkState() == Qt::Checked : false;
350-
QString filter = mServiceType == FeatureService ? mModel->itemFromIndex( mModel->index( row, 4, idx.parent() ) )->text() : QString(); //optional filter specified by user
348+
QString filter = mServiceType == FeatureService ? mModel->itemFromIndex( mModel->index( row, 3, idx.parent() ) )->text() : QString(); //optional filter specified by user
351349
if ( cbxUseTitleLayerName->isChecked() && !layerTitle.isEmpty() )
352350
{
353351
layerName = layerTitle;
354352
}
355353
QgsRectangle layerExtent;
356-
if ( mServiceType == FeatureService && ( cbxFeatureCurrentViewExtent->isChecked() || !cacheFeatures ) )
354+
if ( mServiceType == FeatureService && ( cbxFeatureCurrentViewExtent->isChecked() ) )
357355
{
358356
layerExtent = extent;
359357
}

0 commit comments

Comments
 (0)
Please sign in to comment.