QGIS server: ignore svg items not fixed to pixel position. Developed …

…for Faunalia (http://www.faunalia.it) with funding from Regione Toscana - Settore SISTEMA INFORMATIVO TERRITORIALE ED AMBIENTALE
qgis · Nov 6, 2012 · 32265de · 32265de
1 parent 716d619
commit 32265de
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/mapserver/qgsprojectparser.cpp b/src/mapserver/qgsprojectparser.cpp
@@ -2554,14 +2554,17 @@ void QgsProjectParser::createSvgAnnotationItems()
   {
     svgAnnotationElem = svgAnnotationList.at( i ).toElement();
     annotationElem = svgAnnotationElem.firstChildElement( "AnnotationItem" );
-    QSvgRenderer* svg = new QSvgRenderer();
-    if ( svg->load( convertToAbsolutePath( svgAnnotationElem.attribute( "file" ) ) ) )
-    {
-      mSvgAnnotationElems.push_back( qMakePair( svg, annotationElem ) );
-    }
-    else
+    if ( !annotationElem.isNull() && annotationElem.attribute( "mapPositionFixed" ) != "1" )
     {
-      delete svg;
+      QSvgRenderer* svg = new QSvgRenderer();
+      if ( svg->load( convertToAbsolutePath( svgAnnotationElem.attribute( "file" ) ) ) )
+      {
+        mSvgAnnotationElems.push_back( qMakePair( svg, annotationElem ) );
+      }
+      else
+      {
+        delete svg;
+      }
     }
   }
 }