From c2a940a0b1d44706611601bf0e7983f700b7ba9b Mon Sep 17 00:00:00 2001 From: Harrissou Sant-anna Date: Sat, 18 Nov 2017 13:21:50 +0100 Subject: [PATCH 1/2] [Geometry Checker] Use a more readable file format list --- .../geometry_checker/qgsgeometrycheckersetuptab.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/plugins/geometry_checker/qgsgeometrycheckersetuptab.cpp b/src/plugins/geometry_checker/qgsgeometrycheckersetuptab.cpp index d6e189824a8..2ce74d3f53b 100644 --- a/src/plugins/geometry_checker/qgsgeometrycheckersetuptab.cpp +++ b/src/plugins/geometry_checker/qgsgeometrycheckersetuptab.cpp @@ -54,15 +54,10 @@ QgsGeometryCheckerSetupTab::QgsGeometryCheckerSetupTab( QgisInterface *iface, QD mAbortButton = new QPushButton( tr( "Abort" ) ); mRunButton->setEnabled( false ); - const auto filterFormatMap = QgsVectorFileWriter::supportedFiltersAndFormats( QgsVectorFileWriter::SortRecommended | QgsVectorFileWriter::SkipNonSpatialFormats ); - for ( const QgsVectorFileWriter::FilterFormatDetails &filter : filterFormatMap ) + const auto drivers = QgsVectorFileWriter::ogrDriverList( QgsVectorFileWriter::SortRecommended | QgsVectorFileWriter::SkipNonSpatialFormats ); + for ( const QgsVectorFileWriter::DriverDetails &driver : drivers ) { - QString driverName = filter.driverName; - ui.comboBoxOutputFormat->addItem( driverName ); - if ( driverName == QLatin1String( "ESRI Shapefile" ) ) - { - ui.comboBoxOutputFormat->setCurrentIndex( ui.comboBoxOutputFormat->count() - 1 ); - } + ui.comboBoxOutputFormat->addItem( driver.longName, driver.driverName ); } ui.listWidgetInputLayers->setIconSize( QSize( 16, 16 ) ); @@ -297,7 +292,7 @@ void QgsGeometryCheckerSetupTab::runChecks() { // Get output directory and file extension QDir outputDir = QDir( ui.lineEditOutputDirectory->text() ); - QString outputDriverName = ui.comboBoxOutputFormat->currentText(); + QString outputDriverName = ui.comboBoxOutputFormat->currentData().toString(); QgsVectorFileWriter::MetaData metadata; if ( !QgsVectorFileWriter::driverMetadata( outputDriverName, metadata ) ) { From 7aab0c75227d53515a58a8bbb739c882651c0d49 Mon Sep 17 00:00:00 2001 From: Harrissou Sant-anna Date: Sat, 18 Nov 2017 13:25:39 +0100 Subject: [PATCH 2/2] Remove unused code --- .../geometry_checker/qgsgeometrycheckersetuptab.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/plugins/geometry_checker/qgsgeometrycheckersetuptab.cpp b/src/plugins/geometry_checker/qgsgeometrycheckersetuptab.cpp index 2ce74d3f53b..149f7a97696 100644 --- a/src/plugins/geometry_checker/qgsgeometrycheckersetuptab.cpp +++ b/src/plugins/geometry_checker/qgsgeometrycheckersetuptab.cpp @@ -210,16 +210,6 @@ void QgsGeometryCheckerSetupTab::validateInput() void QgsGeometryCheckerSetupTab::selectOutputDirectory() { - QString filterString = QgsVectorFileWriter::filterForDriver( QStringLiteral( "GPKG" ) ); - const auto filterFormatMap = QgsVectorFileWriter::supportedFiltersAndFormats( QgsVectorFileWriter::SortRecommended | QgsVectorFileWriter::SkipNonSpatialFormats ); - for ( const QgsVectorFileWriter::FilterFormatDetails &filter : filterFormatMap ) - { - QString driverName = filter.driverName; - if ( driverName != QLatin1String( "ESRI Shapefile" ) ) // Default entry, first in list (see above) - { - filterString += ";;" + filter.filterString; - } - } QString initialdir = ui.lineEditOutputDirectory->text(); if ( initialdir.isEmpty() || !QDir( initialdir ).exists() ) {