Skip to content
Permalink
Browse files
Mapserver read ShowingPartialsLabels configurations from project file…
… now and added default init value to QgsPalLabeling
  • Loading branch information
yellow-sky committed Sep 16, 2013
1 parent 54bcef6 commit 030d176c665bf4fd68c10382e00babc00918ac11
Showing with 8 additions and 0 deletions.
  1. +1 −0 src/core/qgspallabeling.cpp
  2. +7 −0 src/mapserver/qgsprojectparser.cpp
@@ -3049,6 +3049,7 @@ QgsPalLabeling::QgsPalLabeling()
mShowingCandidates = false;
mShowingShadowRects = false;
mShowingAllLabels = false;
mShowingPartialsLabels = p.getShowPartial();

mLabelSearchTree = new QgsLabelSearchTree();
}
@@ -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 );
}
}
}

0 comments on commit 030d176

Please sign in to comment.