Skip to content

Commit c5126e0

Browse files
rldhontnyalldawson
authored andcommittedDec 10, 2019
Use debug message level in labeling from SLD
1 parent 9172c31 commit c5126e0

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed
 

‎src/core/qgsvectorlayer.cpp

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4120,7 +4120,7 @@ void QgsVectorLayer::readSldLabeling( const QDomNode &node )
41204120
// rule has a renderer symbolizer, not a text symbolizer
41214121
else if ( ruleChildElem.localName() == QLatin1String( "TextSymbolizer" ) )
41224122
{
4123-
QgsDebugMsg( QStringLiteral( "TextSymbolizer element found" ) );
4123+
QgsDebugMsgLevel( QStringLiteral( "Info: TextSymbolizer element found" ), 4 );
41244124
hasTextSymbolizer = true;
41254125
}
41264126

@@ -4136,15 +4136,15 @@ void QgsVectorLayer::readSldLabeling( const QDomNode &node )
41364136

41374137
if ( hasRuleBased )
41384138
{
4139-
QgsDebugMsg( QStringLiteral( "Filter or Min/MaxScaleDenominator element found: need a RuleBasedLabeling" ) );
4139+
QgsDebugMsgLevel( QStringLiteral( "Info: Filter or Min/MaxScaleDenominator element found: need a RuleBasedLabeling" ), 4 );
41404140
needRuleBasedLabeling = true;
41414141
}
41424142
}
41434143

41444144
// more rules present, use the RuleRenderer
41454145
if ( ruleCount > 1 )
41464146
{
4147-
QgsDebugMsg( QStringLiteral( "more Rule elements found: need a RuleBasedLabeling" ) );
4147+
QgsDebugMsgLevel( QStringLiteral( "Info: More Rule elements found: need a RuleBasedLabeling" ), 4 );
41484148
needRuleBasedLabeling = true;
41494149
}
41504150

@@ -4169,7 +4169,7 @@ void QgsVectorLayer::readSldLabeling( const QDomNode &node )
41694169

41704170
if ( needRuleBasedLabeling )
41714171
{
4172-
QgsDebugMsg( QStringLiteral( "Info: rule based labeling" ) );
4172+
QgsDebugMsgLevel( QStringLiteral( "Info: rule based labeling" ), 4 );
41734173
QgsRuleBasedLabeling::Rule *rootRule = new QgsRuleBasedLabeling::Rule( nullptr );
41744174
while ( !ruleElem.isNull() )
41754175
{
@@ -4221,7 +4221,7 @@ void QgsVectorLayer::readSldLabeling( const QDomNode &node )
42214221
{
42224222
if ( filter->hasParserError() )
42234223
{
4224-
QgsDebugMsg( "parser error: " + filter->parserErrorString() );
4224+
QgsDebugMsgLevel( QStringLiteral( "SLD Filter parsing error: %1" ).arg( filter->parserErrorString() ), 3 );
42254225
}
42264226
else
42274227
{
@@ -4263,7 +4263,7 @@ void QgsVectorLayer::readSldLabeling( const QDomNode &node )
42634263
}
42644264
else
42654265
{
4266-
QgsDebugMsg( QStringLiteral( "Info: simple labeling" ) );
4266+
QgsDebugMsgLevel( QStringLiteral( "Info: simple labeling" ), 4 );
42674267
// retrieve the TextSymbolizer element child node
42684268
QDomElement textSymbolizerElem = ruleElem.firstChildElement( QStringLiteral( "TextSymbolizer" ) );
42694269
QgsPalLayerSettings s;
@@ -4279,7 +4279,7 @@ bool QgsVectorLayer::readSldTextSymbolizer( const QDomNode &node, QgsPalLayerSet
42794279
{
42804280
if ( node.localName() != QLatin1String( "TextSymbolizer" ) )
42814281
{
4282-
QgsDebugMsg( QStringLiteral( "Not a TextSymbolizer element: %1" ).arg( node.localName() ) );
4282+
QgsDebugMsgLevel( QStringLiteral( "Not a TextSymbolizer element: %1" ).arg( node.localName() ), 3 );
42834283
return false;
42844284
}
42854285
QDomElement textSymbolizerElem = node.toElement();
@@ -4309,21 +4309,18 @@ bool QgsVectorLayer::readSldTextSymbolizer( const QDomNode &node, QgsPalLayerSet
43094309
else
43104310
{
43114311
QgsDebugMsgLevel( QStringLiteral( "SLD label attribute error: %1" ).arg( exp.evalErrorString() ), 3 );
4312-
QgsDebugMsg( QStringLiteral( "SLD label attribute error: %1" ).arg( exp.evalErrorString() ) );
43134312
}
43144313
}
43154314
}
43164315
else
43174316
{
43184317
QgsDebugMsgLevel( QStringLiteral( "Info: PropertyName element not found." ), 4 );
4319-
QgsDebugMsg( QStringLiteral( "Info: PropertyName element not found." ) );
43204318
return false;
43214319
}
43224320
}
43234321
else
43244322
{
43254323
QgsDebugMsgLevel( QStringLiteral( "Info: Label element not found." ), 4 );
4326-
QgsDebugMsg( QStringLiteral( "Info: Label element not found." ) );
43274324
return false;
43284325
}
43294326

@@ -4340,7 +4337,7 @@ bool QgsVectorLayer::readSldTextSymbolizer( const QDomNode &node, QgsPalLayerSet
43404337
QgsStringMap fontSvgParams = QgsSymbolLayerUtils::getSvgParameterList( fontElem );
43414338
for ( QgsStringMap::iterator it = fontSvgParams.begin(); it != fontSvgParams.end(); ++it )
43424339
{
4343-
QgsDebugMsg( QStringLiteral( "found fontSvgParams %1: %2" ).arg( it.key(), it.value() ) );
4340+
QgsDebugMsgLevel( QStringLiteral( "found fontSvgParams %1: %2" ).arg( it.key(), it.value() ), 4 );
43444341

43454342
if ( it.key() == QLatin1String( "font-family" ) )
43464343
{
@@ -4382,7 +4379,7 @@ bool QgsVectorLayer::readSldTextSymbolizer( const QDomNode &node, QgsPalLayerSet
43824379
QgsSymbolLayerUtils::fillFromSld( fillElem, textBrush, textColor );
43834380
if ( textColor.isValid() )
43844381
{
4385-
QgsDebugMsg( QStringLiteral( "Info: textColor %1." ).arg( QVariant( textColor ).toString() ) );
4382+
QgsDebugMsgLevel( QStringLiteral( "Info: textColor %1." ).arg( QVariant( textColor ).toString() ), 4 );
43864383
format.setColor( textColor );
43874384
}
43884385

@@ -4412,7 +4409,7 @@ bool QgsVectorLayer::readSldTextSymbolizer( const QDomNode &node, QgsPalLayerSet
44124409
QgsSymbolLayerUtils::fillFromSld( haloFillElem, bufferBrush, bufferColor );
44134410
if ( bufferColor.isValid() )
44144411
{
4415-
QgsDebugMsg( QStringLiteral( "Info: bufferColor %1." ).arg( QVariant( bufferColor ).toString() ) );
4412+
QgsDebugMsgLevel( QStringLiteral( "Info: bufferColor %1." ).arg( QVariant( bufferColor ).toString() ), 4 );
44164413
bufferSettings.setColor( bufferColor );
44174414
}
44184415
}

0 commit comments

Comments
 (0)
Please sign in to comment.