Fix rendering of WMS Legend Graphics

qgis · Sep 1, 2014 · 45d6584 · 45d6584
1 parent 05b01c1
commit 45d6584
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/core/composer/qgscomposerlegenditem.h b/src/core/composer/qgscomposerlegenditem.h
@@ -45,6 +45,7 @@ class CORE_EXPORT QgsComposerLegendItem: public QStandardItem
     {
       GroupItem = QStandardItem::UserType,
       LayerItem,
+      // TODO: unify all item types derived from BaseSymbol item under one value (to allow extensibility)
       SymbologyV2Item,
       RasterSymbolItem,
       RasterImageItem,

diff --git a/src/core/qgslegendrenderer.cpp b/src/core/qgslegendrenderer.cpp
@@ -309,7 +309,8 @@ void QgsLegendRenderer::setColumns( QList<Atom>& atomList )
       if ( !item ) continue;
       QgsComposerLegendItem::ItemType type = item->itemType();
       if ( type == QgsComposerLegendItem::SymbologyV2Item ||
-           type == QgsComposerLegendItem::RasterSymbolItem )
+           type == QgsComposerLegendItem::RasterSymbolItem ||
+           type == QgsComposerLegendItem::RasterImageItem )
       {
         QString key = QString( "%1-%2" ).arg(( qulonglong )item->parent() ).arg( atomList[i].column );
         maxSymbolWidth[key] = qMax( atomList[i].nucleons[j].symbolSize.width(), maxSymbolWidth[key] );
@@ -324,7 +325,8 @@ void QgsLegendRenderer::setColumns( QList<Atom>& atomList )
       if ( !item ) continue;
       QgsComposerLegendItem::ItemType type = item->itemType();
       if ( type == QgsComposerLegendItem::SymbologyV2Item ||
-           type == QgsComposerLegendItem::RasterSymbolItem )
+           type == QgsComposerLegendItem::RasterSymbolItem ||
+           type == QgsComposerLegendItem::RasterImageItem )
       {
         QString key = QString( "%1-%2" ).arg(( qulonglong )item->parent() ).arg( atomList[i].column );
         double space = mSettings.style( QgsComposerLegendStyle::Symbol ).margin( QgsComposerLegendStyle::Right ) +
@@ -425,6 +427,7 @@ double QgsLegendRenderer::spaceAboveAtom( Atom atom )
       break;
     case QgsComposerLegendItem::SymbologyV2Item:
     case QgsComposerLegendItem::RasterSymbolItem:
+    case QgsComposerLegendItem::RasterImageItem:
       // TODO: use Symbol or SymbolLabel Top margin
       return mSettings.style( QgsComposerLegendStyle::Symbol ).margin( QgsComposerLegendStyle::Top );
       break;
@@ -473,7 +476,8 @@ QSizeF QgsLegendRenderer::drawAtom( Atom atom, QPainter* painter, QPointF point
       }
     }
     else if ( type == QgsComposerLegendItem::SymbologyV2Item ||
-              type == QgsComposerLegendItem::RasterSymbolItem )
+              type == QgsComposerLegendItem::RasterSymbolItem ||
+              type == QgsComposerLegendItem::RasterImageItem )
     {
       if ( !first )
       {