Call loadLabelSettings in initializeRender method and enable in sldpa…

…rser
qgis · Jun 11, 2014 · dedc662 · dedc662
1 parent 1bab141
commit dedc662
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/src/mapserver/qgssldconfigparser.cpp b/src/mapserver/qgssldconfigparser.cpp
@@ -528,15 +528,20 @@ bool QgsSLDConfigParser::featureInfoFormatSIA2045() const
   return false;
 }
 
-void QgsSLDConfigParser::drawOverlays( QPainter *, int , int, int ) const
+void QgsSLDConfigParser::drawOverlays( QPainter* p, int dpi, int width, int height ) const
 {
-  //todo: fixme
+  if ( mFallbackParser )
+  {
+    mFallbackParser->drawOverlays( p, dpi, width, height );
+  }
 }
 
 void QgsSLDConfigParser::loadLabelSettings( QgsLabelingEngineInterface * lbl ) const
 {
-  Q_UNUSED ( lbl );
-  //needs to be here?
+  if ( mFallbackParser )
+  {
+    mFallbackParser->loadLabelSettings( lbl );
+  }
 }
 
 QString QgsSLDConfigParser::serviceUrl() const

diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
@@ -999,11 +999,6 @@ QImage* QgsWMSServer::getMap()
 
   applyOpacities( layersList, bkVectorRenderers, bkRasterRenderers, labelTransparencies, labelBufferTransparencies );
 
-  if ( mConfigParser )
-  {
-    mConfigParser->loadLabelSettings( mMapRenderer->labelingEngine() );
-  }
-
   mMapRenderer->render( &thePainter );
   if ( mConfigParser )
   {
@@ -1390,6 +1385,12 @@ QImage* QgsWMSServer::initializeRendering( QStringList& layersList, QStringList&
 #endif
   mMapRenderer->setLayerSet( layerIdList );
 
+  //load label settings
+  if ( mConfigParser )
+  {
+    mConfigParser->loadLabelSettings( mMapRenderer->labelingEngine() );
+  }
+
   return theImage;
 }