sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-15 00:02:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Take the label for the composer legend if there is one

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@9431 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
mhugent 2008-10-04 08:54:16 +00:00
parent 054c7bc77c
commit 4ec73c0309
1 changed files with 17 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,46 +132,6 @@ int QgsLegendModel::addVectorLayerItems( QStandardItem* layerItem, QgsMapLayer*
continue;
}
#if 0
//label
QString label;
QString lowerValue = ( *symbolIt )->lowerValue();
QString upperValue = ( *symbolIt )->upperValue();
if ( lowerValue == upperValue || upperValue.isEmpty() )
{
label = lowerValue;
}
else
{
label = lowerValue + " - " + upperValue;
}
//icon item
switch (( *symbolIt )->type() )
{
case QGis::Point:
currentSymbolItem = new QStandardItem( QIcon( QPixmap::fromImage(( *symbolIt )->getPointSymbolAsImage() ) ), label );
break;
case QGis::Line:
currentSymbolItem = new QStandardItem( QIcon( QPixmap::fromImage(( *symbolIt )->getLineSymbolAsImage() ) ), label );
break;
case QGis::Polygon:
currentSymbolItem = new QStandardItem( QIcon( QPixmap::fromImage(( *symbolIt )->getPolygonSymbolAsImage() ) ), label );
break;
default:
currentSymbolItem = 0;
break;
}
//Pass deep copy of QgsSymbol as user data. Cast to void* necessary such that QMetaType handles it
QgsSymbol* symbolCopy = new QgsSymbol( **symbolIt );
currentSymbolItem->setData( QVariant::fromValue(( void* )symbolCopy ) );
insertSymbol( symbolCopy );
currentSymbolItem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
#endif //0
QStandardItem* currentSymbolItem = itemFromSymbol( *symbolIt );
if ( !currentSymbolItem )
{
@ -465,30 +425,40 @@ QStandardItem* QgsLegendModel::itemFromSymbol( QgsSymbol* s )
QStandardItem* currentSymbolItem = 0;
//label
QString itemText;
QString label;
QString lowerValue = s->lowerValue();
QString upperValue = s->upperValue();
if ( lowerValue == upperValue || upperValue.isEmpty() )
label = s->label();
//Take the label as item text if it is there
if(!label.isEmpty())
{
itemText = label;
}
//take single value
else if ( lowerValue == upperValue || upperValue.isEmpty() )
{
label = lowerValue;
itemText = lowerValue;
}
else
else //or value range
{
label = lowerValue + " - " + upperValue;
itemText = lowerValue + " - " + upperValue;
}
//icon item
switch ( s->type() )
{
case QGis::Point:
currentSymbolItem = new QStandardItem( QIcon( QPixmap::fromImage( s->getPointSymbolAsImage() ) ), label );
currentSymbolItem = new QStandardItem( QIcon( QPixmap::fromImage( s->getPointSymbolAsImage() ) ), itemText );
break;
case QGis::Line:
currentSymbolItem = new QStandardItem( QIcon( QPixmap::fromImage( s->getLineSymbolAsImage() ) ), label );
currentSymbolItem = new QStandardItem( QIcon( QPixmap::fromImage( s->getLineSymbolAsImage() ) ), itemText );
break;
case QGis::Polygon:
currentSymbolItem = new QStandardItem( QIcon( QPixmap::fromImage( s->getPolygonSymbolAsImage() ) ), label );
currentSymbolItem = new QStandardItem( QIcon( QPixmap::fromImage( s->getPolygonSymbolAsImage() ) ), itemText );
break;
default:
currentSymbolItem = 0;