Fix #7012

qgis · Aug 12, 2013 · df0d690 · df0d690 · NathanW2 · Aug 12, 2013
1 parent 9c4c215
commit df0d690
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/core/composer/qgscomposerlegend.cpp b/src/core/composer/qgscomposerlegend.cpp
@@ -326,11 +326,6 @@ QgsComposerLegend::Nucleon QgsComposerLegend::drawSymbolItem( QgsComposerLegendI
 #endif
 
   QString text = symbolItem->text();
-  if ( text.isEmpty() )
-  {
-    // Use layer label, used for single symbols
-    text = layerItem->text();
-  }
 
   QStringList lines = splitStringForWrapping( text );
 

diff --git a/src/core/composer/qgslegendmodel.cpp b/src/core/composer/qgslegendmodel.cpp
@@ -170,6 +170,7 @@ int QgsLegendModel::addVectorLayerItemsV2( QStandardItem* layerItem, QgsVectorLa
     if ( oldSymbolItem )
     {
       currentSymbolItem->setUserText( oldSymbolItem->userText() );
+
     }
 
     currentSymbolItem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
@@ -272,6 +273,11 @@ void QgsLegendModel::updateSymbolV2ItemText( QStandardItem* symbolItem )
 
   QString label = sv2Item->userText().isEmpty() ? symbol.first : sv2Item->userText();
 
+  if ( renderer->type() == "singleSymbol" )
+  {
+    label = vLayer->name();
+  }
+
   if ( lItem->showFeatureCount() )
   {
     // Add counts to multi symbols layers only or labeled single symbols,