Make WMS server use QgsLegendRenderer

wonder-sk · wonder-sk · commit f96484fb916e · 2014-09-01T10:10:36.000+07:00
diff --git a/src/core/composer/qgscomposerlegenditem.h b/src/core/composer/qgscomposerlegenditem.h
@@ -167,6 +167,9 @@ class CORE_EXPORT QgsComposerSymbolV2Item : public QgsComposerBaseSymbolItem
     //! @note added in 2.6
     QString ruleKey() const { return mItem.key; }
 
+    //! @note added in 2.6
+    const QgsLegendSymbolItemV2& itemData() const { return mItem; }
+
     //! @note added in 2.6
     static QgsComposerSymbolV2Item* findItemByRuleKey( QgsComposerLayerItem* parentLayerItem, QString ruleKey );
 
diff --git a/src/core/composer/qgslegendmodel.cpp b/src/core/composer/qgslegendmodel.cpp
@@ -36,7 +36,6 @@
 
 QgsLegendModel::QgsLegendModel()
   : QStandardItemModel()
-  , mScaleDenominator( -1 )
   , mAutoUpdate( true )
 {
   setColumnCount( 2 );
@@ -131,8 +130,6 @@ void QgsLegendModel::setLayerSetAndGroups( const QStringList& layerIds, const QL
 void QgsLegendModel::setLayerSet( const QStringList& layerIds, double scaleDenominator, QString rule )
 {
   mLayerIds = layerIds;
-  mScaleDenominator = scaleDenominator;
-  mRule = rule;
 
   //for now clear the model and add the new entries
   clear();
@@ -145,6 +142,62 @@ void QgsLegendModel::setLayerSet( const QStringList& layerIds, double scaleDenom
     currentLayer = QgsMapLayerRegistry::instance()->mapLayer( *idIter );
     addLayer( currentLayer, scaleDenominator, rule );
   }
+
+  // filter out items where the rule is not matching - used by WMS to get symbol icon for a particular rule
+  if ( !rule.isEmpty() )
+  {
+    for ( int i = rowCount() - 1 ; i >= 0; --i )
+    {
+      QgsComposerLayerItem* lItem = dynamic_cast<QgsComposerLayerItem*>( invisibleRootItem()->child( i ) );
+      if ( !lItem )
+        continue;
+
+      // remove rules that do not match
+      bool gotMatchingRule = false;
+      for ( int j = 0; j < lItem->rowCount(); ++j )
+      {
+        QgsComposerSymbolV2Item* sItem = dynamic_cast<QgsComposerSymbolV2Item*>( lItem->child( j ) );
+        if ( !sItem )
+          continue;
+
+        if ( sItem->itemData().label == rule )
+        {
+          QStandardItem* takenSItem = lItem->takeChild( j );
+          lItem->removeRows( 0, lItem->rowCount() );
+          lItem->setChild( 0, takenSItem );
+          gotMatchingRule = true;
+          break;
+        }
+      }
+
+      if ( !gotMatchingRule )
+        removeRow( i );
+    }
+  }
+
+  if ( scaleDenominator != -1 )
+  {
+    for ( int i = 0; i < rowCount(); ++i )
+    {
+      QgsComposerLayerItem* lItem = dynamic_cast<QgsComposerLayerItem*>( invisibleRootItem()->child( i ) );
+      if ( !lItem )
+        continue;
+
+      for ( int j = lItem->rowCount() - 1; j >= 0; --j )
+      {
+        QgsComposerSymbolV2Item* sItem = dynamic_cast<QgsComposerSymbolV2Item*>( lItem->child( j ) );
+        if ( !sItem )
+          continue;
+
+        if ( sItem->itemData().scaleDenomMin > 0 && sItem->itemData().scaleDenomMax > 0 &&
+             ( sItem->itemData().scaleDenomMin > scaleDenominator || sItem->itemData().scaleDenomMax < scaleDenominator ) )
+        {
+          lItem->removeRow( j );
+        }
+      }
+
+    }
+  }
 }
 
 QStandardItem* QgsLegendModel::addGroup( QString text, int position, QStandardItem* parentItem )
@@ -256,14 +309,17 @@ void QgsLegendModel::removeLayer( const QString& layerId )
 
 void QgsLegendModel::addLayer( QgsMapLayer* theMapLayer, double scaleDenominator, QString rule, QStandardItem* parentItem )
 {
-  Q_UNUSED( scaleDenominator );
   Q_UNUSED( rule );
 
   if ( !theMapLayer )
   {
     return;
   }
 
+  if ( scaleDenominator != -1 && theMapLayer->hasScaleBasedVisibility() &&
+       ( theMapLayer->minimumScale() > scaleDenominator || theMapLayer->maximumScale() < scaleDenominator ) )
+    return;
+
   if ( !parentItem )
     parentItem = invisibleRootItem();
 
diff --git a/src/core/composer/qgslegendmodel.h b/src/core/composer/qgslegendmodel.h
@@ -120,8 +120,6 @@ class CORE_EXPORT QgsLegendModel : public QStandardItemModel
 
   protected:
     QStringList mLayerIds;
-    double mScaleDenominator;
-    QString mRule;
     /**True if this application has toplevel windows (normally true). If this is false, this means that the application
        might not have a running x-server on unix systems and so QPixmap and QIcon cannot be used*/
     bool mHasTopLevelWindow;
diff --git a/src/core/symbology-ng/qgslegendsymbolitemv2.h b/src/core/symbology-ng/qgslegendsymbolitemv2.h
@@ -5,7 +5,7 @@
 
 class QgsSymbolV2;
 
-class QgsLegendSymbolItemV2
+class CORE_EXPORT QgsLegendSymbolItemV2
 {
 public:
   QgsLegendSymbolItemV2();
@@ -23,7 +23,6 @@ class QgsLegendSymbolItemV2
 
   int scaleDenomMin;
   int scaleDenomMax;
-  // TODO: QString rule;
 };
 
 
diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
diff --git a/src/mapserver/qgswmsserver.h b/src/mapserver/qgswmsserver.h

-Original file line number
+Diff line change
 #include "qgscrscache.h"
 #include "qgsfield.h"
 #include "qgsgeometry.h"
 +#include "qgslegendrenderer.h"
 #include "qgsmaplayer.h"
 #include "qgsmaplayerregistry.h"
 #include "qgsmaprenderer.h"
     return 0;
+  }
 -  //create first image (to find out dpi)
 -  QImage* theImage = createImage( 10, 10 );
 -  if ( !theImage )
 -  {
 -    return 0;
 -  }
 -  double mmToPixelFactor = theImage->dotsPerMeterX() / 1000.0;
 -  double maxTextWidth = 0;
 -  double maxSymbolWidth = 0;
 -  double fontOversamplingFactor = 10.0;
+-
   //get icon size, spaces between legend items and font from config parser
   double boxSpace, layerSpace, layerTitleSpace, symbolSpace, iconLabelSpace, symbolWidth, symbolHeight;
   QFont layerFont, itemFont;
   QColor layerFontColor, itemFontColor;
 -  legendParameters( mmToPixelFactor, fontOversamplingFactor, boxSpace, layerSpace, layerTitleSpace, symbolSpace,
 +  legendParameters( boxSpace, layerSpace, layerTitleSpace, symbolSpace,
                     iconLabelSpace, symbolWidth, symbolHeight, layerFont, itemFont, layerFontColor, itemFontColor );
   QString rule;
 +  int ruleSymbolWidth = 0, ruleSymbolHeight = 0;
   QMap<QString, QString>::const_iterator ruleIt = mParameters.find( "RULE" );
   if ( ruleIt != mParameters.constEnd() )
+  {
       double width = widthIt.value().toDouble( &conversionSuccess );
       if ( conversionSuccess )
+      {
 -        symbolWidth = width;
 +        ruleSymbolWidth = width;
+      }
+    }
       double width = heightIt.value().toDouble( &conversionSuccess );
       if ( conversionSuccess )
+      {
 -        symbolHeight = width;
 +        ruleSymbolHeight = width;
+      }
+    }
+  }
     return 0;
+  }
 +  // find out DPI
 +  QImage* tmpImage = createImage( 1, 1 );
 +  if ( !tmpImage )
 +    return 0;
 +  qreal dpmm = tmpImage->dotsPerMeterX() / 1000.0;
 +  delete tmpImage;
++
 +  // setup legend configuration
 +  QgsLegendSettings legendSettings;
 +  legendSettings.setTitle( QString() );
 +  legendSettings.setBoxSpace( boxSpace );
 +  legendSettings.rstyle( QgsComposerLegendStyle::Subgroup ).setMargin( QgsComposerLegendStyle::Top, layerSpace );
 +   // TODO: not available: layer title space
 +  legendSettings.rstyle( QgsComposerLegendStyle::Symbol ).setMargin( QgsComposerLegendStyle::Top, symbolSpace );
 +  legendSettings.rstyle( QgsComposerLegendStyle::SymbolLabel ).setMargin( QgsComposerLegendStyle::Left, iconLabelSpace );
 +  legendSettings.setSymbolSize( QSizeF( symbolWidth, symbolHeight ) );
 +  legendSettings.rstyle( QgsComposerLegendStyle::Subgroup ).setFont( layerFont );
 +  legendSettings.rstyle( QgsComposerLegendStyle::SymbolLabel ).setFont( itemFont );
 +  // TODO: not available: layer font color
 +  legendSettings.setFontColor( itemFontColor );
++
   if ( !rule.isEmpty() )
+  {
     //create second image with the right dimensions
 -    QImage* paintImage = createImage( symbolWidth, symbolHeight );
 +    QImage* paintImage = createImage( ruleSymbolWidth, ruleSymbolHeight );
     //go through the items a second time for painting
     QPainter p( paintImage );
     p.setRenderHint( QPainter::Antialiasing, true );
 +    p.scale( dpmm, dpmm );
 -    QgsComposerLegendItem* currentComposerItem = dynamic_cast<QgsComposerLegendItem*>( rootItem->child( 0 )->child( 0 ) );
 +    QgsComposerBaseSymbolItem* currentComposerItem = dynamic_cast<QgsComposerBaseSymbolItem*>( rootItem->child( 0 )->child( 0 ) );
     if ( currentComposerItem != NULL )
+    {
 -      QgsComposerLegendItem::ItemType type = currentComposerItem->itemType();
 -      switch ( type )
 -      {
 -        case QgsComposerLegendItem::SymbologyV2Item:
 -          drawLegendSymbolV2( currentComposerItem, &p, 0., 0., symbolWidth, symbolHeight, 0. );
 -          break;
 -        case QgsComposerLegendItem::RasterSymbolItem:
 -          drawRasterSymbol( currentComposerItem, &p, 0., 0., symbolWidth, symbolHeight, 0. );
 -          break;
 -        case QgsComposerLegendItem::GroupItem:
 -          //QgsDebugMsg( "GroupItem not handled" );
 -          break;
 -        case QgsComposerLegendItem::LayerItem:
 -          //QgsDebugMsg( "GroupItem not handled" );
 -          break;
 -        case QgsComposerLegendItem::StyleItem:
 -          //QgsDebugMsg( "StyleItem not handled" );
 -          break;
 -      }
 +      QgsComposerBaseSymbolItem::ItemContext ctx;
 +      ctx.painter = &p;
 +      ctx.labelXOffset = 0;
 +      ctx.point = QPointF();
 +      double itemHeight = ruleSymbolHeight / dpmm;
 +      currentComposerItem->drawSymbol( legendSettings, &ctx, itemHeight );
+    }
     QgsMapLayerRegistry::instance()->removeAllMapLayers();
 -    delete theImage;
     return paintImage;
+  }
 -  double currentY = drawLegendGraphics( 0, fontOversamplingFactor, rootItem, boxSpace, layerSpace, layerTitleSpace, symbolSpace,
 -                                        iconLabelSpace, symbolWidth, symbolHeight, layerFont, itemFont, layerFontColor, itemFontColor, maxTextWidth,
 -                                        maxSymbolWidth );
 +  for ( int i = 0; i < rootItem->rowCount(); ++i )
 +  {
 +    if ( QgsComposerLayerItem* lItem = dynamic_cast<QgsComposerLayerItem*>( rootItem->child( i ) ) )
 +    {
 +      // layer titles - hidden or not
 +      lItem->setStyle( mDrawLegendLayerLabel ? QgsComposerLegendStyle::Subgroup : QgsComposerLegendStyle::Hidden );
 -  //create second image with the right dimensions
 -  QImage* paintImage = createImage( maxTextWidth + maxSymbolWidth, ceil( currentY ) );
 +      // rule item titles
 +      if ( !mDrawLegendItemLabel )
 +      {
 +        for ( int j = 0; j < lItem->rowCount(); ++j )
 +        {
 +          if ( QgsComposerBaseSymbolItem* sItem = dynamic_cast<QgsComposerBaseSymbolItem*>( lItem->child( j ) ) )
 +            sItem->setUserText( " " ); // empty string = no override, so let's use one space
 +        }
 +      }
 +    }
 +  }
++
 +  QgsLegendRenderer legendRenderer( &legendModel, legendSettings );
 +  QSizeF minSize = legendRenderer.minimumSize();
 +  QSize s( minSize.width() * dpmm, minSize.height() * dpmm );
++
 +  QImage* paintImage = createImage( s.width(), s.height() );
 -  //go through the items a second time for painting
   QPainter p( paintImage );
   p.setRenderHint( QPainter::Antialiasing, true );
 +  p.scale( dpmm, dpmm );
 -  drawLegendGraphics( &p, fontOversamplingFactor, rootItem, boxSpace, layerSpace, layerTitleSpace, symbolSpace,
 -                      iconLabelSpace, symbolWidth, symbolHeight, layerFont, itemFont, layerFontColor, itemFontColor, maxTextWidth,
 -                      maxSymbolWidth );
 +  legendRenderer.drawLegend( &p );
++
 +  p.end();
   QgsMapLayerRegistry::instance()->removeAllMapLayers();
 -  delete theImage;
   return paintImage;
+}
 -double QgsWMSServer::drawLegendGraphics( QPainter* p, double fontOversamplingFactor, QStandardItem* rootItem, double boxSpace,
 -    double layerSpace, double layerTitleSpace, double symbolSpace, double iconLabelSpace,
 -    double symbolWidth, double symbolHeight, const QFont& layerFont, const QFont& itemFont,
 -    const QColor& layerFontColor, const QColor& itemFontColor, double& maxTextWidth, double& maxSymbolWidth )
 -{
 -  if ( !rootItem )
 -  {
 -    return 0;
 -  }
+-
 -  int numLayerItems = rootItem->rowCount();
 -  if ( numLayerItems < 1 )
 -  {
 -    return 0;
 -  }
 -  double currentY = boxSpace;
 -  for ( int i = 0; i < numLayerItems; ++i )
 -  {
 -    QgsComposerLayerItem* layerItem = dynamic_cast<QgsComposerLayerItem*>( rootItem->child( i ) );
 -    if ( layerItem )
 -    {
 -      if ( i > 0 )
 -      {
 -        currentY += layerSpace;
 -      }
 -      drawLegendLayerItem( layerItem, p, maxTextWidth, maxSymbolWidth, currentY, layerFont, layerFontColor, itemFont, itemFontColor,
 -                           boxSpace, layerSpace, layerTitleSpace, symbolSpace, iconLabelSpace, symbolWidth, symbolHeight, fontOversamplingFactor );
 -    }
 -  }
 -  currentY += boxSpace;
 -  return currentY;
 -}
 -void QgsWMSServer::legendParameters( double mmToPixelFactor, double fontOversamplingFactor, double& boxSpace, double& layerSpace, double& layerTitleSpace,
 +void QgsWMSServer::legendParameters( double& boxSpace, double& layerSpace, double& layerTitleSpace,
                                      double& symbolSpace, double& iconLabelSpace, double& symbolWidth, double& symbolHeight,
                                      QFont& layerFont, QFont& itemFont, QColor& layerFontColor, QColor& itemFontColor )
+{
   //spaces between legend elements
   QMap<QString, QString>::const_iterator boxSpaceIt = mParameters.find( "BOXSPACE" );
 -  boxSpace = ( boxSpaceIt == mParameters.constEnd() ) ? mConfigParser->legendBoxSpace() * mmToPixelFactor :
 -             boxSpaceIt.value().toDouble() * mmToPixelFactor;
 +  boxSpace = ( boxSpaceIt == mParameters.constEnd() ) ? mConfigParser->legendBoxSpace() : boxSpaceIt.value().toDouble();
   QMap<QString, QString>::const_iterator layerSpaceIt = mParameters.find( "LAYERSPACE" );
 -  layerSpace = ( layerSpaceIt == mParameters.constEnd() ) ? mConfigParser->legendLayerSpace() * mmToPixelFactor :
 -               layerSpaceIt.value().toDouble() * mmToPixelFactor;
 +  layerSpace = ( layerSpaceIt == mParameters.constEnd() ) ? mConfigParser->legendLayerSpace() : layerSpaceIt.value().toDouble();
   QMap<QString, QString>::const_iterator layerTitleSpaceIt = mParameters.find( "LAYERTITLESPACE" );
 -  layerTitleSpace = ( layerTitleSpaceIt == mParameters.constEnd() ) ? mConfigParser->legendLayerTitleSpace() * mmToPixelFactor :
 -                    layerTitleSpaceIt.value().toDouble() * mmToPixelFactor;
 +  layerTitleSpace = ( layerTitleSpaceIt == mParameters.constEnd() ) ? mConfigParser->legendLayerTitleSpace() : layerTitleSpaceIt.value().toDouble();
   QMap<QString, QString>::const_iterator symbolSpaceIt = mParameters.find( "SYMBOLSPACE" );
 -  symbolSpace = ( symbolSpaceIt == mParameters.constEnd() ) ? mConfigParser->legendSymbolSpace() * mmToPixelFactor :
 -                symbolSpaceIt.value().toDouble() * mmToPixelFactor;
 +  symbolSpace = ( symbolSpaceIt == mParameters.constEnd() ) ? mConfigParser->legendSymbolSpace() : symbolSpaceIt.value().toDouble();
   QMap<QString, QString>::const_iterator iconLabelSpaceIt = mParameters.find( "ICONLABELSPACE" );
 -  iconLabelSpace = ( iconLabelSpaceIt == mParameters.constEnd() ) ? mConfigParser->legendIconLabelSpace() * mmToPixelFactor :
 -                   iconLabelSpaceIt.value().toDouble() * mmToPixelFactor;
 +  iconLabelSpace = ( iconLabelSpaceIt == mParameters.constEnd() ) ? mConfigParser->legendIconLabelSpace() : iconLabelSpaceIt.value().toDouble();
   QMap<QString, QString>::const_iterator symbolWidthIt = mParameters.find( "SYMBOLWIDTH" );
 -  symbolWidth = ( symbolWidthIt == mParameters.constEnd() ) ? mConfigParser->legendSymbolWidth() * mmToPixelFactor :
 -                symbolWidthIt.value().toDouble() * mmToPixelFactor;
 +  symbolWidth = ( symbolWidthIt == mParameters.constEnd() ) ? mConfigParser->legendSymbolWidth() : symbolWidthIt.value().toDouble();
   QMap<QString, QString>::const_iterator symbolHeightIt = mParameters.find( "SYMBOLHEIGHT" );
 -  symbolHeight = ( symbolHeightIt == mParameters.constEnd() ) ? mConfigParser->legendSymbolHeight() * mmToPixelFactor :
 -                 symbolHeightIt.value().toDouble() * mmToPixelFactor;
 +  symbolHeight = ( symbolHeightIt == mParameters.constEnd() ) ? mConfigParser->legendSymbolHeight() : symbolHeightIt.value().toDouble();
   //font properties
   layerFont = mConfigParser->legendLayerFont();
     layerFont.setItalic( layerFontItalicIt.value().compare( "TRUE", Qt::CaseInsensitive ) == 0 );
+  }
   QMap<QString, QString>::const_iterator layerFontSizeIt = mParameters.find( "LAYERFONTSIZE" );
 -  if ( layerFontSizeIt != mParameters.constEnd() )
 -  {
 -    layerFont.setPixelSize( layerFontSizeIt.value().toDouble() * 0.3528 * mmToPixelFactor * fontOversamplingFactor );
 -  }
 -  else
 -  {
 -    layerFont.setPixelSize( layerFont.pointSizeF() * 0.3528 * mmToPixelFactor * fontOversamplingFactor );
 -  }
 +  layerFont.setPointSizeF( layerFontSizeIt != mParameters.constEnd() ? layerFontSizeIt.value().toDouble() : layerFont.pointSizeF() );
   QMap<QString, QString>::const_iterator layerFontColorIt = mParameters.find( "LAYERFONTCOLOR" );
   if ( layerFontColorIt != mParameters.constEnd() )
+  {
     itemFont.setItalic( itemFontItalicIt.value().compare( "TRUE", Qt::CaseInsensitive ) == 0 );
+  }
   QMap<QString, QString>::const_iterator itemFontSizeIt = mParameters.find( "ITEMFONTSIZE" );
 -  if ( itemFontSizeIt != mParameters.constEnd() )
 -  {
 -    itemFont.setPixelSize( itemFontSizeIt.value().toDouble() * 0.3528 * mmToPixelFactor * fontOversamplingFactor );
 -  }
 -  else
 -  {
 -    itemFont.setPixelSize( itemFont.pointSizeF() * 0.3528 * mmToPixelFactor * fontOversamplingFactor );
 -  }
 +  itemFont.setPointSizeF( itemFontSizeIt != mParameters.constEnd() ? itemFontSizeIt.value().toDouble() : itemFont.pointSizeF() );
   QMap<QString, QString>::const_iterator itemFontColorIt = mParameters.find( "ITEMFONTCOLOR" );
   if ( itemFontColorIt != mParameters.constEnd() )
+  {
   return layerKeys;
+}
 -void QgsWMSServer::drawLegendLayerItem( QgsComposerLayerItem* item, QPainter* p, double& maxTextWidth, double& maxSymbolWidth, double& currentY, const QFont& layerFont,
 -                                        const QColor& layerFontColor, const QFont& itemFont, const QColor&  itemFontColor, double boxSpace, double layerSpace,
 -                                        double layerTitleSpace, double symbolSpace, double iconLabelSpace, double symbolWidth, double symbolHeight, double fontOversamplingFactor ) const
 -{
 -  Q_UNUSED( layerSpace );
 -  if ( !item )
 -  {
 -    return;
 -  }
+-
 -  QFontMetricsF layerFontMetrics( layerFont );
 -  if ( mDrawLegendLayerLabel )
 -  {
 -    currentY += layerFontMetrics.ascent() / fontOversamplingFactor;
 -  }
+-
 -  //draw layer title first
 -  if ( p )
 -  {
 -    if ( mDrawLegendLayerLabel )
 -    {
 -      p->save();
 -      p->scale( 1.0 / fontOversamplingFactor, 1.0 / fontOversamplingFactor );
 -      p->setPen( layerFontColor );
 -      p->setFont( layerFont );
 -      p->drawText( boxSpace * fontOversamplingFactor, currentY * fontOversamplingFactor, item->text() );
 -      p->restore();
 -    }
 -  }
 -  else
 -  {
 -    double layerItemWidth = layerFontMetrics.width( item->text() ) / fontOversamplingFactor + boxSpace;
 -    if ( layerItemWidth > maxTextWidth )
 -    {
 -      if ( mDrawLegendLayerLabel )
 -      {
 -        maxTextWidth = layerItemWidth;
 -      }
 -    }
 -  }
+-
 -  if ( mDrawLegendLayerLabel )
 -  {
 -    currentY += layerTitleSpace;
 -  }
+-
 -  //then draw all the children
 -  QFontMetricsF itemFontMetrics( itemFont );
+-
 -  int nChildItems = item->rowCount();
 -  QgsComposerLegendItem* currentComposerItem = 0;
+-
 -  for ( int i = 0; i < nChildItems; ++i )
 -  {
 -    currentComposerItem = dynamic_cast<QgsComposerLegendItem*>( item->child( i ) );
 -    if ( !currentComposerItem )
 -    {
 -      continue;
 -    }
+-
 -    double currentSymbolHeight = symbolHeight;
 -    double currentSymbolWidth = symbolWidth; //symbol width (without box space and icon/label space
 -    double currentTextWidth = 0;
+-
 -    //if the font is larger than the standard symbol size, try to draw the symbol centered (shifting towards the bottom)
 -    double symbolDownShift = ( itemFontMetrics.ascent() / fontOversamplingFactor - symbolHeight ) / 2.0;
 -    if ( symbolDownShift < 0 )
 -    {
 -      symbolDownShift = 0;
 -    }
+-
 -    QgsComposerLegendItem::ItemType type = currentComposerItem->itemType();
 -    switch ( type )
 -    {
 -      case QgsComposerLegendItem::SymbologyV2Item:
 -        drawLegendSymbolV2( currentComposerItem, p, boxSpace, currentY, currentSymbolWidth, currentSymbolHeight, symbolDownShift );
 -        break;
 -      case QgsComposerLegendItem::RasterSymbolItem:
 -        drawRasterSymbol( currentComposerItem, p, boxSpace, currentY, currentSymbolWidth, currentSymbolHeight, symbolDownShift );
 -        break;
 -      case QgsComposerLegendItem::GroupItem:
 -        //QgsDebugMsg( "GroupItem not handled" );
 -        break;
 -      case QgsComposerLegendItem::LayerItem:
 -        //QgsDebugMsg( "GroupItem not handled" );
 -        break;
 -      case QgsComposerLegendItem::StyleItem:
 -        //QgsDebugMsg( "StyleItem not handled" );
 -        break;
 -    }
+-
 -    if ( mDrawLegendItemLabel )
 -    {
 -      //finally draw text
 -      currentTextWidth = itemFontMetrics.width( currentComposerItem->text() ) / fontOversamplingFactor;
 -    }
 -    else
 -    {
 -      currentTextWidth = 0;
 -    }
 -    double symbolItemHeight = qMax( itemFontMetrics.ascent() / fontOversamplingFactor, currentSymbolHeight );
+-
 -    if ( p )
 -    {
 -      if ( mDrawLegendItemLabel )
 -      {
 -        p->save();
 -        p->scale( 1.0 / fontOversamplingFactor, 1.0 / fontOversamplingFactor );
 -        p->setPen( itemFontColor );
 -        p->setFont( itemFont );
 -        p->drawText( maxSymbolWidth * fontOversamplingFactor,
 -                     ( currentY + symbolItemHeight / 2.0 ) * fontOversamplingFactor + itemFontMetrics.ascent() / 2.0, currentComposerItem->text() );
 -        p->restore();
 -      }
 -    }
 -    else
 -    {
 -      if ( currentTextWidth > maxTextWidth )
 -      {
 -        if ( mDrawLegendItemLabel )
 -        {
 -          maxTextWidth = currentTextWidth;
 -        }
 -      }
 -      double symbolWidth = boxSpace + currentSymbolWidth + iconLabelSpace;
 -      if ( symbolWidth > maxSymbolWidth )
 -      {
 -        maxSymbolWidth = symbolWidth;
 -      }
 -    }
+-
 -    currentY += symbolItemHeight;
 -    if ( i < ( nChildItems - 1 ) )
 -    {
 -      currentY += symbolSpace;
 -    }
 -  }
 -}
+-
+-
 -void QgsWMSServer::drawLegendSymbolV2( QgsComposerLegendItem* item, QPainter* p, double boxSpace, double currentY, double& symbolWidth,
 -                                       double& symbolHeight, double yDownShift ) const
 -{
 -  QgsComposerSymbolV2Item* symbolItem = dynamic_cast< QgsComposerSymbolV2Item* >( item );
 -  if ( !symbolItem )
 -  {
 -    return;
 -  }
 -  QgsSymbolV2* symbol = symbolItem->symbolV2();
 -  if ( !symbol )
 -  {
 -    return;
 -  }
+-
 -  if ( p )
 -  {
 -    p->save();
 -    p->translate( boxSpace, currentY + yDownShift );
 -    p->scale( 1.0, 1.0 );
 -    symbol->drawPreviewIcon( p, QSize( symbolWidth, symbolHeight ) );
 -    p->restore();
 -  }
 -}
+-
 -void QgsWMSServer::drawRasterSymbol( QgsComposerLegendItem* item, QPainter* p, double boxSpace, double currentY, double symbolWidth, double symbolHeight, double yDownShift ) const
 -{
 -  if ( !item || ! p )
 -  {
 -    return;
 -  }
+-
 -  QgsComposerRasterSymbolItem* rasterItem = dynamic_cast< QgsComposerRasterSymbolItem* >( item );
 -  if ( !rasterItem )
 -  {
 -    return;
 -  }
+-
 -  p->setBrush( QBrush( rasterItem->color() ) );
 -  p->drawRect( QRectF( boxSpace, currentY + yDownShift, symbolWidth, symbolHeight ) );
 -}
 QMap<QString, QString> QgsWMSServer::applyRequestedLayerFilters( const QStringList& layerList ) const
+{
-Original file line number
+Diff line change
        @param scaleDenominator Filter out layer if scale based visibility does not match (or use -1 if no scale restriction)*/
     QStringList layerSet( const QStringList& layersList, const QStringList& stylesList, const QgsCoordinateReferenceSystem& destCRS, double scaleDenominator = -1 ) const;
 -    /**Draws graphics if painter != 0 and gives back y dimension, maximum symbol and text width of legend*/
 -    double drawLegendGraphics( QPainter* p, double fontOversamplingFactor, QStandardItem* rootItem, double boxSpace, double layerSpace, double layerTitleSpace,
 -                               double symbolSpace, double iconLabelSpace, double symbolWidth, double symbolHeight,
 -                               const QFont& layerFont, const QFont& itemFont, const QColor& layerFontColor, const QColor& itemFontColor,
 -                               double& maxTextWidth, double& maxSymbolWidth );
+-
 -    //helper functions for GetLegendGraphics
 -    /**Draws layer item and subitems
 -       @param p painter if the item should be drawn, if 0 the size parameters are calculated only
 -       @param maxTextWidth Includes boxSpace (on the right side). If p==0: maximumTextWidth is calculated, if p: maxTextWidth parameter is used for rendering
 -       @param maxSymbolWidth Includes boxSpace and iconLabelSpace. If p==0: maximum Symbol width is calculated, if p: maxSymbolWidth is input parameter
 -      */
 -    void drawLegendLayerItem( QgsComposerLayerItem* item, QPainter* p, double& maxTextWidth, double& maxSymbolWidth, double& currentY, const QFont& layerFont,
 -                              const QColor& layerFontColor, const QFont& itemFont, const QColor&  itemFontColor, double boxSpace, double layerSpace,
 -                              double layerTitleSpace, double symbolSpace, double iconLabelSpace, double symbolWidth, double symbolHeight, double fontOversamplingFactor ) const;
 -    /**Draws a symbol. Optionally, maxHeight is adapted (e.g. for large point markers) */
 -    void drawLegendSymbolV2( QgsComposerLegendItem* item, QPainter* p, double boxSpace, double currentY, double& symbolWidth, double& symbolHeight, double yDownShift ) const;
 -    void drawRasterSymbol( QgsComposerLegendItem* item, QPainter* p, double boxSpace, double currentY, double symbolWidth, double symbolHeight, double yDownShift ) const;
+-
     /**Read legend parameter from the request or from the first print composer in the project*/
 -    void legendParameters( double mmToPixelFactor, double fontOversamplingFactor, double& boxSpace, double& layerSpace, double& layerTitleSpace,
 +    void legendParameters( double& boxSpace, double& layerSpace, double& layerTitleSpace,
                            double& symbolSpace, double& iconLabelSpace, double& symbolWidth, double& symbolHeight, QFont& layerFont, QFont& itemFont, QColor& layerFontColor, QColor& itemFontColor );
 #if 0