Merge pull request #7467 from slarosa/truncate_name

do not truncate layer name in legend panel if filename contains period
qgis · Jul 28, 2018 · 88ddd4b0def9e54359c0080cd7941b89adde9233 · 88ddd4b
2 parents c0dd006 + abc4d43
commit 88ddd4b0def9e54359c0080cd7941b89adde9233
Unified Split

Showing with 2 additions and 2 deletions.

+1 −1 src/app/qgisapp.cpp

+1 −1 src/providers/gdal/qgsgdalsourceselect.cpp
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -5594,7 +5594,7 @@ void QgisApp::showRasterCalculator()
       case QgsRasterCalculator::Success:
         if ( d.addLayerToProject() )
         {
-          addRasterLayer( d.outputFile(), QFileInfo( d.outputFile() ).baseName() );
+          addRasterLayer( d.outputFile(), QFileInfo( d.outputFile() ).completeBaseName() );
         }
         messageBar()->pushMessage( tr( "Raster calculator" ),
                                    tr( "Calculation complete." ),

diff --git a/src/providers/gdal/qgsgdalsourceselect.cpp b/src/providers/gdal/qgsgdalsourceselect.cpp
@@ -154,7 +154,7 @@ void QgsGdalSourceSelect::addButtonClicked()
 
     Q_FOREACH ( const QString &path, QgsFileWidget::splitFilePaths( mRasterPath ) )
     {
-      emit addRasterLayer( path, QFileInfo( path ).baseName(), QStringLiteral( "gdal" ) );
+      emit addRasterLayer( path, QFileInfo( path ).completeBaseName(), QStringLiteral( "gdal" ) );
     }
   }
   else if ( radioSrcProtocol->isChecked() )