sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix WFS connection version-related GUI widget enabling/disabling

Browse Source 
Fixes:
- When saved with paging disabled, caused option to never be reenabled
- When loading settings, feaure paging now constrained to WFS version
- WFS 2.0.0 capabilities are no longer constrained to just that version,
  allowing versions above as well.
This commit is contained in:
Larry Shaffer 2019-05-23 23:55:45 -06:00
parent 4662bb9298
commit 95137dc045
No known key found for this signature in database
GPG Key ID: E113FDFD0FBCEC20
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/qgsnewhttpconnection.cpp
View File

@ -165,9 +165,9 @@ QgsNewHttpConnection::QgsNewHttpConnection( QWidget *parent, ConnectionTypes typ
void QgsNewHttpConnection::wfsVersionCurrentIndexChanged( int index )
{
cbxWfsFeaturePaging->setEnabled( index == 0 || index == 3 );
lblPageSize->setEnabled( index == 0 || index == 3 );
txtPageSize->setEnabled( index == 0 || index == 3 );
cbxWfsFeaturePaging->setEnabled( index == 0 || index >= 3 );
lblPageSize->setEnabled( cbxWfsFeaturePaging->isChecked() && ( index == 0 || index >= 3 ) );
txtPageSize->setEnabled( cbxWfsFeaturePaging->isChecked() && ( index == 0 || index >= 3 ) );
cbxWfsIgnoreAxisOrientation->setEnabled( index != 1 );
}
@ -321,9 +321,11 @@ void QgsNewHttpConnection::updateServiceSpecificSettings()
txtPageSize->setText( settings.value( wfsKey + "/pagesize" ).toString() );
cbxWfsFeaturePaging->setChecked( pagingEnabled );
txtPageSize->setEnabled( pagingEnabled );
lblPageSize->setEnabled( pagingEnabled );
cbxWfsFeaturePaging->setEnabled( pagingEnabled );
// Enable/disable these items per WFS versions
txtPageSize->setEnabled( pagingEnabled && ( versionIdx == 0 || versionIdx >= 3 ) );
lblPageSize->setEnabled( pagingEnabled && ( versionIdx == 0 || versionIdx >= 3 ) );
cbxWfsFeaturePaging->setEnabled( versionIdx == 0 || versionIdx >= 3 );
cbxWfsIgnoreAxisOrientation->setEnabled( versionIdx != 1 );
}
QUrl QgsNewHttpConnection::urlTrimmed() const