Show vector layer wkb types in tooltip in layer tree and layer combo boxes

nyalldawson · nyalldawson · commit 15e15356b37a · 2017-11-14T21:53:31.000+11:00
This is very useful information to have readily visible (esp.
to see if a layer is multi* type, has z/m, when choosing it
as a source for a processing algorithm)

Remove redundant geometry type display from default layer name
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -4203,7 +4203,7 @@ bool QgisApp::addVectorLayers( const QStringList &layerQStringList, const QStrin
 
         if ( elements.size() >= 4 && layer->name() != elements.at( 1 ) )
         {
-          layer->setName( QStringLiteral( "%1 %2 %3" ).arg( layer->name(), elements.at( 1 ), elements.at( 3 ) ) );
+          layer->setName( QStringLiteral( "%1 %2" ).arg( layer->name(), elements.at( 1 ) ) );
         }
 
         myList << layer;
@@ -4636,8 +4636,6 @@ void QgisApp::askUserForOGRSublayers( QgsVectorLayer *layer )
 
     QgsDebugMsg( "Creating new vector layer using " + composedURI );
     QString name = fileName + " " + def.layerName;
-    if ( !layerGeometryType.isEmpty() )
-      name += " " + layerGeometryType;
     QgsVectorLayer::LayerOptions options;
     options.loadDefaultStyle = false;
     QgsVectorLayer *layer = new QgsVectorLayer( composedURI, name, QStringLiteral( "ogr" ), options );
@@ -9999,7 +9997,7 @@ QgsVectorLayer *QgisApp::addVectorLayer( const QString &vectorLayerPath, const Q
 
         if ( elements.size() >= 4 && layer->name() != elements.at( 1 ) )
         {
-          layer->setName( QStringLiteral( "%1 %2 %3" ).arg( layer->name(), elements.at( 1 ), elements.at( 3 ) ) );
+          layer->setName( QStringLiteral( "%1 %2" ).arg( layer->name(), elements.at( 1 ) ) );
         }
       }
 
diff --git a/src/core/layertree/qgslayertreemodel.cpp b/src/core/layertree/qgslayertreemodel.cpp
@@ -297,7 +297,12 @@ QVariant QgsLayerTreeModel::data( const QModelIndex &index, int role ) const
           title = layer->name();
         title = "<b>" + title + "</b>";
         if ( layer->crs().isValid() )
-          title = tr( "%1 (%2)" ).arg( title, layer->crs().authid() );
+        {
+          if ( QgsVectorLayer *vl = qobject_cast<QgsVectorLayer *>( layer ) )
+            title = tr( "%1 (%2 - %3)" ).arg( title, QgsWkbTypes::displayString( vl->wkbType() ), layer->crs().authid() );
+          else
+            title = tr( "%1 (%2) " ).arg( title, layer->crs().authid() );
+        }
 
         parts << title;
 
diff --git a/src/core/qgsmaplayermodel.cpp b/src/core/qgsmaplayermodel.cpp
@@ -288,8 +288,12 @@ QVariant QgsMapLayerModel::data( const QModelIndex &index, int role ) const
           title = layer->name();
         title = "<b>" + title + "</b>";
         if ( layer->crs().isValid() )
-          title = tr( "%1 (%2)" ).arg( title, layer->crs().authid() );
-
+        {
+          if ( QgsVectorLayer *vl = qobject_cast<QgsVectorLayer *>( layer ) )
+            title = tr( "%1 (%2 - %3)" ).arg( title, QgsWkbTypes::displayString( vl->wkbType() ), layer->crs().authid() );
+          else
+            title = tr( "%1 (%2) " ).arg( title, layer->crs().authid() );
+        }
         parts << title;
 
         if ( !layer->abstract().isEmpty() )

Original file line number	Diff line number	Diff line change
`@@ -4203,7 +4203,7 @@ bool QgisApp::addVectorLayers( const QStringList &layerQStringList, const QStrin`
`4203`	`4203`
`4204`	`4204`	`if ( elements.size() >= 4 && layer->name() != elements.at( 1 ) )`
`4205`	`4205`	`{`
`4206`		`- layer->setName( QStringLiteral( "%1 %2 %3" ).arg( layer->name(), elements.at( 1 ), elements.at( 3 ) ) );`
	`4206`	`+ layer->setName( QStringLiteral( "%1 %2" ).arg( layer->name(), elements.at( 1 ) ) );`
`4207`	`4207`	`}`
`4208`	`4208`
`4209`	`4209`	`myList << layer;`
`@@ -4636,8 +4636,6 @@ void QgisApp::askUserForOGRSublayers( QgsVectorLayer *layer )`
`4636`	`4636`
`4637`	`4637`	`QgsDebugMsg( "Creating new vector layer using " + composedURI );`
`4638`	`4638`	`QString name = fileName + " " + def.layerName;`
`4639`		`- if ( !layerGeometryType.isEmpty() )`
`4640`		`- name += " " + layerGeometryType;`
`4641`	`4639`	`QgsVectorLayer::LayerOptions options;`
`4642`	`4640`	`options.loadDefaultStyle = false;`
`4643`	`4641`	`QgsVectorLayer *layer = new QgsVectorLayer( composedURI, name, QStringLiteral( "ogr" ), options );`
`@@ -9999,7 +9997,7 @@ QgsVectorLayer *QgisApp::addVectorLayer( const QString &vectorLayerPath, const Q`
`9999`	`9997`
`10000`	`9998`	`if ( elements.size() >= 4 && layer->name() != elements.at( 1 ) )`
`10001`	`9999`	`{`
`10002`		`- layer->setName( QStringLiteral( "%1 %2 %3" ).arg( layer->name(), elements.at( 1 ), elements.at( 3 ) ) );`
	`10000`	`+ layer->setName( QStringLiteral( "%1 %2" ).arg( layer->name(), elements.at( 1 ) ) );`
`10003`	`10001`	`}`
`10004`	`10002`	`}`
`10005`	`10003`