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

Fix QgsRasterFileWriter::driverForExtension and extensionsForFormat

Browse Source 
were skipping non-creatable datasets

And indicate in the docs that read-only datasets are also considered
This commit is contained in:
Nyall Dawson 2018-01-30 10:34:53 +10:00
parent f37c2bf6f6
commit eba7e7b8b4
4 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/core/raster/qgsrasterfilewriter.sip.in
View File

@ -175,6 +175,9 @@ Returns the GDAL driver name for a specified file ``extension``. E.g. the
driver name for the ".tif" extension is "GTiff".
If no suitable drivers are found then an empty string is returned.
Note that this method works for all GDAL drivers, including those without create support
(and which are not supported by QgsRasterFileWriter).
.. versionadded:: 3.0
%End
@ -185,6 +188,9 @@ E.g. returns "tif", "tiff" for the format "GTiff".
If no matching format driver is found an empty list will be returned.
Note that this method works for all GDAL drivers, including those without create support
(and which are not supported by QgsRasterFileWriter).
.. versionadded:: 3.0
%End

4
src/core/raster/qgsrasterfilewriter.cpp
View File

@ -996,7 +996,7 @@ QString QgsRasterFileWriter::driverForExtension( const QString &extension )
if ( drv )
{
char **driverMetadata = GDALGetMetadata( drv, nullptr );
if ( CSLFetchBoolean( driverMetadata, GDAL_DCAP_CREATE, false ) && CSLFetchBoolean( driverMetadata, GDAL_DCAP_RASTER, false ) )
if ( CSLFetchBoolean( driverMetadata, GDAL_DCAP_RASTER, false ) )
{
QString drvName = GDALGetDriverShortName( drv );
QStringList driverExtensions = QString( GDALGetMetadataItem( drv, GDAL_DMD_EXTENSIONS, nullptr ) ).split( ' ' );
@ -1018,7 +1018,7 @@ QStringList QgsRasterFileWriter::extensionsForFormat( const QString &format )
if ( drv )
{
char **driverMetadata = GDALGetMetadata( drv, nullptr );
if ( CSLFetchBoolean( driverMetadata, GDAL_DCAP_CREATE, false ) && CSLFetchBoolean( driverMetadata, GDAL_DCAP_RASTER, false ) )
if ( CSLFetchBoolean( driverMetadata, GDAL_DCAP_RASTER, false ) )
{
return QString( GDALGetMetadataItem( drv, GDAL_DMD_EXTENSIONS, nullptr ) ).split( ' ' );
}

7
src/core/raster/qgsrasterfilewriter.h
View File

@ -186,6 +186,10 @@ class CORE_EXPORT QgsRasterFileWriter
* Returns the GDAL driver name for a specified file \a extension. E.g. the
* driver name for the ".tif" extension is "GTiff".
* If no suitable drivers are found then an empty string is returned.
*
* Note that this method works for all GDAL drivers, including those without create support
* (and which are not supported by QgsRasterFileWriter).
*
* \since QGIS 3.0
*/
static QString driverForExtension( const QString &extension );
@ -196,6 +200,9 @@ class CORE_EXPORT QgsRasterFileWriter
*
* If no matching format driver is found an empty list will be returned.
*
* Note that this method works for all GDAL drivers, including those without create support
* (and which are not supported by QgsRasterFileWriter).
*
* \since QGIS 3.0
*/
static QStringList extensionsForFormat( const QString &format );

4
tests/src/python/test_qgsrasterfilewriter.py
View File

@ -106,6 +106,8 @@ class TestQgsRasterFileWriter(unittest.TestCase):
self.assertEqual(QgsRasterFileWriter.driverForExtension('.tif'), 'GTiff')
self.assertEqual(QgsRasterFileWriter.driverForExtension('img'), 'HFA')
self.assertEqual(QgsRasterFileWriter.driverForExtension('.vrt'), 'VRT')
self.assertEqual(QgsRasterFileWriter.driverForExtension('.jpg'), 'JPEG')
self.assertEqual(QgsRasterFileWriter.driverForExtension('asc'), 'AAIGrid')
self.assertEqual(QgsRasterFileWriter.driverForExtension('not a format'), '')
self.assertEqual(QgsRasterFileWriter.driverForExtension(''), '')
@ -113,6 +115,8 @@ class TestQgsRasterFileWriter(unittest.TestCase):
self.assertCountEqual(QgsRasterFileWriter.extensionsForFormat('not format'), [])
self.assertCountEqual(QgsRasterFileWriter.extensionsForFormat('GTiff'), ['tiff', 'tif'])
self.assertCountEqual(QgsRasterFileWriter.extensionsForFormat('GPKG'), ['gpkg'])
self.assertCountEqual(QgsRasterFileWriter.extensionsForFormat('JPEG'), ['jpg', 'jpeg'])
self.assertCountEqual(QgsRasterFileWriter.extensionsForFormat('AAIGrid'), ['asc'])
def testSupportedFiltersAndFormat(self):
# test with formats in recommended order