sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix #7012

Browse Source
This commit is contained in:
Nathan Woodrow 2013-08-12 10:19:33 +10:00
parent 9c4c2150bf
commit df0d690cd0
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/composer/qgscomposerlegend.cpp
View File

@ -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 );

6
src/core/composer/qgslegendmodel.cpp
View File

@ -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,