Tweaks to automatic layer name logic

nyalldawson · nyalldawson · commit 020972c2916a · 2017-11-14T21:53:31.000+11:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -4157,6 +4157,7 @@ bool QgisApp::addVectorLayers( const QStringList &layerQStringList, const QStrin
       QFileInfo fi( src );
       base = fi.completeBaseName();
     }
+    base = QgsMapLayer::formatLayerName( base );
 
     QgsDebugMsg( "completeBaseName: " + base );
 
@@ -4200,8 +4201,10 @@ bool QgisApp::addVectorLayers( const QStringList &layerQStringList, const QStrin
       {
         //set friendly name for datasources with only one layer
         QStringList elements = sublayers.at( 0 ).split( ':' );
+        QString subLayerNameFormatted = elements.size() >= 2 ? QgsMapLayer::formatLayerName( elements.at( 1 ) ) : QString();
 
-        if ( elements.size() >= 4 && layer->name() != elements.at( 1 ) )
+        if ( elements.size() >= 4 && layer->name().compare( elements.at( 1 ), Qt::CaseInsensitive ) != 0
+             && layer->name().compare( subLayerNameFormatted, Qt::CaseInsensitive ) != 0 )
         {
           layer->setName( QStringLiteral( "%1 %2" ).arg( layer->name(), elements.at( 1 ) ) );
         }
@@ -9994,8 +9997,10 @@ QgsVectorLayer *QgisApp::addVectorLayer( const QString &vectorLayerPath, const Q
       if ( !sublayers.isEmpty() )
       {
         QStringList elements = sublayers.at( 0 ).split( ':' );
+        QString subLayerNameFormatted = elements.size() >= 2 ? QgsMapLayer::formatLayerName( elements.at( 1 ) ) : QString();
 
-        if ( elements.size() >= 4 && layer->name() != elements.at( 1 ) )
+        if ( elements.size() >= 4 && layer->name().compare( elements.at( 1 ), Qt::CaseInsensitive ) != 0
+             && layer->name().compare( subLayerNameFormatted, Qt::CaseInsensitive ) != 0 )
         {
           layer->setName( QStringLiteral( "%1 %2" ).arg( layer->name(), elements.at( 1 ) ) );
         }
diff --git a/src/core/qgsmaplayer.cpp b/src/core/qgsmaplayer.cpp
@@ -1022,12 +1022,8 @@ void QgsMapLayer::setCrs( const QgsCoordinateReferenceSystem &srs, bool emitSign
 QString QgsMapLayer::formatLayerName( const QString &name )
 {
   QString layerName( name );
-
-  if ( !layerName.isEmpty() )
-    layerName = QgsStringUtils::capitalize( name, QgsStringUtils::ForceFirstLetterToCapital );
-
   layerName.replace( '_', ' ' );
-
+  layerName = QgsStringUtils::capitalize( layerName, QgsStringUtils::ForceFirstLetterToCapital );
   return layerName;
 }
 
diff --git a/tests/src/core/testqgsmaplayer.cpp b/tests/src/core/testqgsmaplayer.cpp
@@ -62,6 +62,7 @@ class TestQgsMapLayer : public QObject
     void cleanup(); // will be called after every testfunction.
 
     void isValid();
+    void formatName();
 
     void setBlendMode();
 
@@ -116,6 +117,14 @@ void TestQgsMapLayer::isValid()
   QVERIFY( mpLayer->isValid() );
 }
 
+void TestQgsMapLayer::formatName()
+{
+  QCOMPARE( QgsMapLayer::formatLayerName( QString() ), QString() );
+  QCOMPARE( QgsMapLayer::formatLayerName( QStringLiteral( "layer" ) ), QStringLiteral( "Layer" ) );
+  QCOMPARE( QgsMapLayer::formatLayerName( QStringLiteral( "layer name" ) ), QStringLiteral( "Layer Name" ) );
+  QCOMPARE( QgsMapLayer::formatLayerName( QStringLiteral( "layer_name" ) ), QStringLiteral( "Layer Name" ) );
+}
+
 void TestQgsMapLayer::setBlendMode()
 {
   TestSignalReceiver receiver;

Original file line number	Diff line number	Diff line change
`@@ -4157,6 +4157,7 @@ bool QgisApp::addVectorLayers( const QStringList &layerQStringList, const QStrin`
`4157`	`4157`	`QFileInfo fi( src );`
`4158`	`4158`	`base = fi.completeBaseName();`
`4159`	`4159`	`}`
	`4160`	`+ base = QgsMapLayer::formatLayerName( base );`
`4160`	`4161`
`4161`	`4162`	`QgsDebugMsg( "completeBaseName: " + base );`
`4162`	`4163`
`@@ -4200,8 +4201,10 @@ bool QgisApp::addVectorLayers( const QStringList &layerQStringList, const QStrin`
`4200`	`4201`	`{`
`4201`	`4202`	`//set friendly name for datasources with only one layer`
`4202`	`4203`	`QStringList elements = sublayers.at( 0 ).split( ':' );`
	`4204`	`+ QString subLayerNameFormatted = elements.size() >= 2 ? QgsMapLayer::formatLayerName( elements.at( 1 ) ) : QString();`
`4203`	`4205`
`4204`		`- if ( elements.size() >= 4 && layer->name() != elements.at( 1 ) )`
	`4206`	`+ if ( elements.size() >= 4 && layer->name().compare( elements.at( 1 ), Qt::CaseInsensitive ) != 0`
	`4207`	`+ && layer->name().compare( subLayerNameFormatted, Qt::CaseInsensitive ) != 0 )`
`4205`	`4208`	`{`
`4206`	`4209`	`layer->setName( QStringLiteral( "%1 %2" ).arg( layer->name(), elements.at( 1 ) ) );`
`4207`	`4210`	`}`
`@@ -9994,8 +9997,10 @@ QgsVectorLayer *QgisApp::addVectorLayer( const QString &vectorLayerPath, const Q`
`9994`	`9997`	`if ( !sublayers.isEmpty() )`
`9995`	`9998`	`{`
`9996`	`9999`	`QStringList elements = sublayers.at( 0 ).split( ':' );`
	`10000`	`+ QString subLayerNameFormatted = elements.size() >= 2 ? QgsMapLayer::formatLayerName( elements.at( 1 ) ) : QString();`
`9997`	`10001`
`9998`		`- if ( elements.size() >= 4 && layer->name() != elements.at( 1 ) )`
	`10002`	`+ if ( elements.size() >= 4 && layer->name().compare( elements.at( 1 ), Qt::CaseInsensitive ) != 0`
	`10003`	`+ && layer->name().compare( subLayerNameFormatted, Qt::CaseInsensitive ) != 0 )`
`9999`	`10004`	`{`
`10000`	`10005`	`layer->setName( QStringLiteral( "%1 %2" ).arg( layer->name(), elements.at( 1 ) ) );`
`10001`	`10006`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1022,12 +1022,8 @@ void QgsMapLayer::setCrs( const QgsCoordinateReferenceSystem &srs, bool emitSign`
`1022`	`1022`	`QString QgsMapLayer::formatLayerName( const QString &name )`
`1023`	`1023`	`{`
`1024`	`1024`	`QString layerName( name );`
`1025`		`-`
`1026`		`- if ( !layerName.isEmpty() )`
`1027`		`- layerName = QgsStringUtils::capitalize( name, QgsStringUtils::ForceFirstLetterToCapital );`
`1028`		`-`
`1029`	`1025`	`layerName.replace( '_', ' ' );`
`1030`		`-`
	`1026`	`+ layerName = QgsStringUtils::capitalize( layerName, QgsStringUtils::ForceFirstLetterToCapital );`
`1031`	`1027`	`return layerName;`
`1032`	`1028`	`}`
`1033`	`1029`