use layer title instead of name in server getlegendgraphic response (fixes #11406)

jef-n · jef-n · commit bb95a0f43a53 · 2014-10-16T23:11:56.000+02:00
diff --git a/src/core/qgslegendrenderer.cpp b/src/core/qgslegendrenderer.cpp
@@ -147,9 +147,6 @@ QSizeF QgsLegendRenderer::paintAndDetermineSize( QPainter* painter )
 }
 
 
-
-
-
 QList<QgsLegendRenderer::Atom> QgsLegendRenderer::createAtomList( QgsLayerTreeGroup* parentGroup, bool splitLayer )
 {
   QList<Atom> atoms;
@@ -248,7 +245,6 @@ QList<QgsLegendRenderer::Atom> QgsLegendRenderer::createAtomList( QgsLayerTreeGr
 }
 
 
-
 void QgsLegendRenderer::setColumns( QList<Atom>& atomList )
 {
   if ( mSettings.columnCount() == 0 ) return;
@@ -348,7 +344,6 @@ void QgsLegendRenderer::setColumns( QList<Atom>& atomList )
 }
 
 
-
 QSizeF QgsLegendRenderer::drawTitle( QPainter* painter, QPointF point, Qt::AlignmentFlag halignment, double legendWidth )
 {
   QSizeF size( 0, 0 );
diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
@@ -656,7 +656,12 @@ QImage* QgsWMSServer::getLegendGraphics()
 
   QgsLayerTreeGroup rootGroup;
   foreach ( QString layerId, layerIds )
-    rootGroup.addLayer( QgsMapLayerRegistry::instance()->mapLayer( layerId ) );
+  {
+    QgsMapLayer *ml = QgsMapLayerRegistry::instance()->mapLayer( layerId );
+    QgsLayerTreeLayer *layer = rootGroup.addLayer( ml );
+    if( !ml->title().isEmpty() )
+      layer->setLayerName( ml->title() );
+  }
   QgsLayerTreeModel legendModel( &rootGroup );
 
   QList<QgsLayerTreeNode*> rootChildren = rootGroup.children();

Original file line number	Diff line number	Diff line change
`@@ -147,9 +147,6 @@ QSizeF QgsLegendRenderer::paintAndDetermineSize( QPainter* painter )`
`147`	`147`	`}`
`148`	`148`
`149`	`149`
`150`		`-`
`151`		`-`
`152`		`-`
`153`	`150`	`QList<QgsLegendRenderer::Atom> QgsLegendRenderer::createAtomList( QgsLayerTreeGroup* parentGroup, bool splitLayer )`
`154`	`151`	`{`
`155`	`152`	`QList<Atom> atoms;`
`@@ -248,7 +245,6 @@ QList<QgsLegendRenderer::Atom> QgsLegendRenderer::createAtomList( QgsLayerTreeGr`
`248`	`245`	`}`
`249`	`246`
`250`	`247`
`251`		`-`
`252`	`248`	`void QgsLegendRenderer::setColumns( QList<Atom>& atomList )`
`253`	`249`	`{`
`254`	`250`	`if ( mSettings.columnCount() == 0 ) return;`
`@@ -348,7 +344,6 @@ void QgsLegendRenderer::setColumns( QList<Atom>& atomList )`
`348`	`344`	`}`
`349`	`345`
`350`	`346`
`351`		`-`
`352`	`347`	`QSizeF QgsLegendRenderer::drawTitle( QPainter* painter, QPointF point, Qt::AlignmentFlag halignment, double legendWidth )`
`353`	`348`	`{`
`354`	`349`	`QSizeF size( 0, 0 );`