Respect the overridden layer name in composer legend also in rendered legend

wonder-sk · wonder-sk · commit e2f1ceb74196 · 2014-09-05T16:49:56.000+07:00
diff --git a/src/app/composer/qgscomposerlegendwidget.cpp b/src/app/composer/qgscomposerlegendwidget.cpp
@@ -745,6 +745,11 @@ void QgsComposerLegendWidget::on_mEditPushButton_clicked()
   else if ( QgsLayerTree::isLayer( currentNode ) )
   {
     currentNode->setCustomProperty( "legend/title-label", newText );
+
+    // force update of label of the legend node with embedded icon (a bit clumsy i know)
+    QList<QgsLayerTreeModelLegendNode*> nodes = model->layerLegendNodes( QgsLayerTree::toLayer( currentNode ) );
+    if ( nodes.count() == 1 && nodes[0]->isEmbeddedInParent() )
+      nodes[0]->setUserLabel( QString() );
   }
   else if ( legendNode )
   {
diff --git a/src/core/layertree/qgslayertreemodellegendnode.cpp b/src/core/layertree/qgslayertreemodellegendnode.cpp
@@ -305,7 +305,11 @@ void QgsSymbolV2LegendNode::updateLabel()
 
   if ( mEmbeddedInParent )
   {
-    mLabel = mUserLabel.isEmpty() ? mLayerNode->layerName() : mUserLabel;
+    QString layerName = mLayerNode->layerName();
+    if ( !mLayerNode->customProperty( "legend/title-label" ).isNull() )
+      layerName = mLayerNode->customProperty( "legend/title-label" ).toString();
+
+    mLabel = mUserLabel.isEmpty() ? layerName : mUserLabel;
     if ( showFeatureCount && vl && vl->pendingFeatureCount() >= 0 )
       mLabel += QString( " [%1]" ).arg( vl->pendingFeatureCount() );
   }

Original file line number	Diff line number	Diff line change
`@@ -745,6 +745,11 @@ void QgsComposerLegendWidget::on_mEditPushButton_clicked()`
`745`	`745`	`else if ( QgsLayerTree::isLayer( currentNode ) )`
`746`	`746`	`{`
`747`	`747`	`currentNode->setCustomProperty( "legend/title-label", newText );`
	`748`	`+`
	`749`	`+ // force update of label of the legend node with embedded icon (a bit clumsy i know)`
	`750`	`+ QList<QgsLayerTreeModelLegendNode*> nodes = model->layerLegendNodes( QgsLayerTree::toLayer( currentNode ) );`
	`751`	`+ if ( nodes.count() == 1 && nodes[0]->isEmbeddedInParent() )`
	`752`	`+ nodes[0]->setUserLabel( QString() );`
`748`	`753`	`}`
`749`	`754`	`else if ( legendNode )`
`750`	`755`	`{`
Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,11 @@ void QgsSymbolV2LegendNode::updateLabel()`
`305`	`305`
`306`	`306`	`if ( mEmbeddedInParent )`
`307`	`307`	`{`
`308`		`- mLabel = mUserLabel.isEmpty() ? mLayerNode->layerName() : mUserLabel;`
	`308`	`+ QString layerName = mLayerNode->layerName();`
	`309`	`+ if ( !mLayerNode->customProperty( "legend/title-label" ).isNull() )`
	`310`	`+ layerName = mLayerNode->customProperty( "legend/title-label" ).toString();`
	`311`	`+`
	`312`	`+ mLabel = mUserLabel.isEmpty() ? layerName : mUserLabel;`
`309`	`313`	`if ( showFeatureCount && vl && vl->pendingFeatureCount() >= 0 )`
`310`	`314`	`mLabel += QString( " [%1]" ).arg( vl->pendingFeatureCount() );`
`311`	`315`	`}`