Merge pull request #46992 from pblottiere/envi_saveas

Fix output filename when a raster is saved in a format without extension
qgis · Jan 26, 2022 · dbbf8da · dbbf8da
2 parents fd00dd4 + 7d6b3f1
commit dbbf8da
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/gui/qgsrasterlayersaveasdialog.cpp b/src/gui/qgsrasterlayersaveasdialog.cpp
@@ -417,7 +417,7 @@ QString QgsRasterLayerSaveAsDialog::outputFileName() const
 
     // ensure the user never omits the extension from the file name
     QFileInfo fi( fileName );
-    if ( !fileName.isEmpty() && fi.suffix().isEmpty() )
+    if ( !fileName.isEmpty() && fi.suffix().isEmpty() && !defaultExt.isEmpty() )
     {
       fileName += '.' + defaultExt;
     }

diff --git a/tests/src/gui/testqgsrasterlayersaveasdialog.cpp b/tests/src/gui/testqgsrasterlayersaveasdialog.cpp
@@ -38,6 +38,7 @@ class TestQgsRasterLayerSaveAsDialog : public QObject
     void init(); // will be called before each testfunction is executed.
     void cleanup(); // will be called after every testfunction.
     void outputLayerExists();
+    void filenameWhenNoExtension();
 
   private:
 
@@ -146,6 +147,24 @@ QString TestQgsRasterLayerSaveAsDialog::prepareDb()
   return tmpFile.fileName( );
 }
 
+void TestQgsRasterLayerSaveAsDialog::filenameWhenNoExtension()
+{
+  // Try to add a raster layer to the DB
+  const QString dataDir( TEST_DATA_DIR ); //defined in CmakeLists.txt
+  const QString rasterPath { dataDir + "/landsat.tif" };
+
+  QgsRasterLayer rl( rasterPath, QStringLiteral( "my_raster" ) );
+  QVERIFY( rl.isValid() );
+
+  QgsRasterLayerSaveAsDialog d( &rl, rl.dataProvider(), rl.extent(), rl.crs(), rl.crs() );
+  d.mFormatComboBox->setCurrentIndex( d.mFormatComboBox->findData( QStringLiteral( "ENVI" ) ) );
+  QCOMPARE( d.mFormatComboBox->currentData().toString(), QString( "ENVI" ) );
+
+  const QString filename = "filename_without_extension";
+  d.mFilename->setFilePath( filename );
+  QCOMPARE( d.outputFileName(), filename );
+}
+
 QGSTEST_MAIN( TestQgsRasterLayerSaveAsDialog )
 
 #include "testqgsrasterlayersaveasdialog.moc"