Fix processing setting to use filename as layer name

qgis · Aug 18, 2017 · f1ac0be · f1ac0be
1 parent 7879c0a
commit f1ac0be
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/python/plugins/processing/gui/Postprocessing.py b/python/plugins/processing/gui/Postprocessing.py
@@ -58,7 +58,8 @@ def handleAlgorithmResults(alg, context, feedback=None, showResults=True):
         try:
             layer = QgsProcessingUtils.mapLayerFromString(l, context)
             if layer is not None:
-                layer.setName(details.name)
+                if not ProcessingConfig.getSetting(ProcessingConfig.USE_FILENAME_AS_LAYER_NAME):
+                    layer.setName(details.name)
 
                 style = None
                 if details.outputName:

diff --git a/src/core/processing/qgsprocessingutils.cpp b/src/core/processing/qgsprocessingutils.cpp
@@ -161,13 +161,16 @@ QgsMapLayer *QgsProcessingUtils::loadMapLayerFromString( const QString &string )
     ProjectionSettingRestorer restorer;
     ( void )restorer; // no warnings
 
+    QFileInfo fi( string );
+    QString name = fi.baseName();
+
     // brute force attempt to load a matching layer
-    std::unique_ptr< QgsVectorLayer > layer( new QgsVectorLayer( string, QStringLiteral( "temp" ), QStringLiteral( "ogr" ), false ) );
+    std::unique_ptr< QgsVectorLayer > layer( new QgsVectorLayer( string, name, QStringLiteral( "ogr" ), false ) );
     if ( layer->isValid() )
     {
       return layer.release();
     }
-    std::unique_ptr< QgsRasterLayer > rasterLayer( new QgsRasterLayer( string, QStringLiteral( "temp" ), QStringLiteral( "gdal" ), false ) );
+    std::unique_ptr< QgsRasterLayer > rasterLayer( new QgsRasterLayer( string, name, QStringLiteral( "gdal" ), false ) );
     if ( rasterLayer->isValid() )
     {
       return rasterLayer.release();

diff --git a/tests/src/core/testqgsprocessing.cpp b/tests/src/core/testqgsprocessing.cpp
@@ -684,12 +684,15 @@ void TestQgsProcessing::mapLayers()
   QgsMapLayer *l = QgsProcessingUtils::loadMapLayerFromString( raster );
   QVERIFY( l->isValid() );
   QCOMPARE( l->type(), QgsMapLayer::RasterLayer );
+  QCOMPARE( l->name(), QStringLiteral( "landsat" ) );
+
   delete l;
 
   //test with vector
   l = QgsProcessingUtils::loadMapLayerFromString( vector );
   QVERIFY( l->isValid() );
   QCOMPARE( l->type(), QgsMapLayer::VectorLayer );
+  QCOMPARE( l->name(), QStringLiteral( "points" ) );
   delete l;
 
   l = QgsProcessingUtils::loadMapLayerFromString( QString() );
@@ -699,6 +702,7 @@ void TestQgsProcessing::mapLayers()
   l = QgsProcessingUtils::loadMapLayerFromString( testDataDir + "multipoint.shp" );
   QVERIFY( l->isValid() );
   QCOMPARE( l->type(), QgsMapLayer::VectorLayer );
+  QCOMPARE( l->name(), QStringLiteral( "multipoint" ) );
   delete l;
 }