Skip to content

Commit 030d176

Browse files
committed
Mapserver read ShowingPartialsLabels configurations from project file now and added default init value to QgsPalLabeling
1 parent 54bcef6 commit 030d176

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

src/core/qgspallabeling.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -3049,6 +3049,7 @@ QgsPalLabeling::QgsPalLabeling()
30493049
mShowingCandidates = false;
30503050
mShowingShadowRects = false;
30513051
mShowingAllLabels = false;
3052+
mShowingPartialsLabels = p.getShowPartial();
30523053

30533054
mLabelSearchTree = new QgsLabelSearchTree();
30543055
}

src/mapserver/qgsprojectparser.cpp

+7
Original file line numberDiff line numberDiff line change
@@ -3658,5 +3658,12 @@ void QgsProjectParser::loadLabelSettings( QgsLabelingEngineInterface* lbl )
36583658
{
36593659
pal->setShowingAllLabels( showAllLabelsElem.text().compare( "true", Qt::CaseInsensitive ) == 0 );
36603660
}
3661+
3662+
//mShowingPartialsLabels
3663+
QDomElement showPartialsLabelsElem = palElem.firstChildElement( "ShowingPartialsLabels" );
3664+
if ( !showPartialsLabelsElem.isNull() )
3665+
{
3666+
pal->setShowingPartialsLabels( showPartialsLabelsElem.text().compare( "true", Qt::CaseInsensitive ) == 0 );
3667+
}
36613668
}
36623669
}

0 commit comments

Comments
 (0)