Mapserver read ShowingPartialsLabels configurations from project file…

… now and added default init value to QgsPalLabeling
qgis · Sep 16, 2013 · 030d176c665bf4fd68c10382e00babc00918ac11 · 030d176
1 parent 54bcef6
commit 030d176c665bf4fd68c10382e00babc00918ac11
Showing with 8 additions and 0 deletions.

+1 −0 src/core/qgspallabeling.cpp

+7 −0 src/mapserver/qgsprojectparser.cpp
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -3049,6 +3049,7 @@ QgsPalLabeling::QgsPalLabeling()
   mShowingCandidates = false;
   mShowingShadowRects = false;
   mShowingAllLabels = false;
+  mShowingPartialsLabels = p.getShowPartial();
 
   mLabelSearchTree = new QgsLabelSearchTree();
 }

diff --git a/src/mapserver/qgsprojectparser.cpp b/src/mapserver/qgsprojectparser.cpp
@@ -3658,5 +3658,12 @@ void QgsProjectParser::loadLabelSettings( QgsLabelingEngineInterface* lbl )
     {
       pal->setShowingAllLabels( showAllLabelsElem.text().compare( "true", Qt::CaseInsensitive ) == 0 );
     }
+
+    //mShowingPartialsLabels
+    QDomElement showPartialsLabelsElem = palElem.firstChildElement( "ShowingPartialsLabels" );
+    if ( !showPartialsLabelsElem.isNull() )
+    {
+      pal->setShowingPartialsLabels( showPartialsLabelsElem.text().compare( "true", Qt::CaseInsensitive ) == 0 );
+    }
   }
 }