@@ -90,14 +90,14 @@ const QVector< QgsPalLayerSettings::PredefinedPointPosition > QgsPalLayerSetting
90
90
<< QgsPalLayerSettings::TopMiddle
91
91
<< QgsPalLayerSettings::BottomMiddle;*/
92
92
93
- QgsPropertiesDefinition QgsPalLayerSettings::PROPERTY_DEFINITIONS ;
93
+ QgsPropertiesDefinition QgsPalLayerSettings::sPropertyDefinitions ;
94
94
95
95
void QgsPalLayerSettings::initPropertyDefinitions ()
96
96
{
97
- if ( !PROPERTY_DEFINITIONS .isEmpty () )
97
+ if ( !sPropertyDefinitions .isEmpty () )
98
98
return ;
99
99
100
- PROPERTY_DEFINITIONS = QgsPropertiesDefinition
100
+ sPropertyDefinitions = QgsPropertiesDefinition
101
101
{
102
102
{ QgsPalLayerSettings::Size , QgsPropertyDefinition ( " Size" , QObject::tr ( " Font size" ), QgsPropertyDefinition::DoublePositive ) },
103
103
{ QgsPalLayerSettings::Bold, QgsPropertyDefinition ( " Bold" , QObject::tr ( " Bold style" ), QgsPropertyDefinition::Boolean ) },
@@ -392,6 +392,11 @@ QgsPalLayerSettings QgsPalLayerSettings::fromLayer( QgsVectorLayer* layer )
392
392
return settings;
393
393
}
394
394
395
+ const QgsPropertiesDefinition& QgsPalLayerSettings::propertyDefinitions ()
396
+ {
397
+ initPropertyDefinitions ();
398
+ return sPropertyDefinitions ;
399
+ }
395
400
396
401
QgsExpression* QgsPalLayerSettings::getLabelExpression ()
397
402
{
@@ -438,7 +443,7 @@ QString updateDataDefinedString( const QString& value )
438
443
439
444
void QgsPalLayerSettings::readOldDataDefinedProperty ( QgsVectorLayer* layer, QgsPalLayerSettings::Property p )
440
445
{
441
- QString newPropertyName = " labeling/dataDefined/" + PROPERTY_DEFINITIONS .value ( p ).name ();
446
+ QString newPropertyName = " labeling/dataDefined/" + sPropertyDefinitions .value ( p ).name ();
442
447
QVariant newPropertyField = layer->customProperty ( newPropertyName, QVariant () );
443
448
444
449
if ( !newPropertyField.isValid () )
@@ -476,8 +481,8 @@ void QgsPalLayerSettings::readOldDataDefinedPropertyMap( QgsVectorLayer* layer,
476
481
return ;
477
482
}
478
483
479
- QgsPropertiesDefinition::const_iterator i = PROPERTY_DEFINITIONS .constBegin ();
480
- for ( ; i != PROPERTY_DEFINITIONS .constEnd (); ++i )
484
+ QgsPropertiesDefinition::const_iterator i = sPropertyDefinitions .constBegin ();
485
+ for ( ; i != sPropertyDefinitions .constEnd (); ++i )
481
486
{
482
487
if ( layer )
483
488
{
@@ -650,7 +655,7 @@ void QgsPalLayerSettings::readFromLayer( QgsVectorLayer* layer )
650
655
QDomDocument doc ( QStringLiteral ( " dd" ) );
651
656
doc.setContent ( layer->customProperty ( QStringLiteral ( " labeling/ddProperties" ) ).toString () );
652
657
QDomElement elem = doc.firstChildElement ( QStringLiteral ( " properties" ) );
653
- mDataDefinedProperties .readXml ( elem, doc, PROPERTY_DEFINITIONS );
658
+ mDataDefinedProperties .readXml ( elem, doc, sPropertyDefinitions );
654
659
}
655
660
else
656
661
{
@@ -741,7 +746,7 @@ void QgsPalLayerSettings::writeToLayer( QgsVectorLayer* layer )
741
746
742
747
doc = QDomDocument ( QStringLiteral ( " dd" ) );
743
748
QDomElement ddElem = doc.createElement ( QStringLiteral ( " properties" ) );
744
- mDataDefinedProperties .writeXml ( ddElem, doc, PROPERTY_DEFINITIONS );
749
+ mDataDefinedProperties .writeXml ( ddElem, doc, sPropertyDefinitions );
745
750
QString ddProps;
746
751
QTextStream streamProps ( &ddProps );
747
752
ddElem.save ( streamProps, -1 );
@@ -857,7 +862,7 @@ void QgsPalLayerSettings::readXml( QDomElement& elem )
857
862
QDomElement ddElem = elem.firstChildElement ( QStringLiteral ( " dd_properties" ) );
858
863
if ( !ddElem.isNull () )
859
864
{
860
- mDataDefinedProperties .readXml ( ddElem, ddElem.ownerDocument (), PROPERTY_DEFINITIONS );
865
+ mDataDefinedProperties .readXml ( ddElem, ddElem.ownerDocument (), sPropertyDefinitions );
861
866
}
862
867
else
863
868
{
@@ -946,7 +951,7 @@ QDomElement QgsPalLayerSettings::writeXml( QDomDocument& doc )
946
951
renderingElem.setAttribute ( QStringLiteral ( " zIndex" ), zIndex );
947
952
948
953
QDomElement ddElem = doc.createElement ( QStringLiteral ( " dd_properties" ) );
949
- mDataDefinedProperties .writeXml ( ddElem, doc, PROPERTY_DEFINITIONS );
954
+ mDataDefinedProperties .writeXml ( ddElem, doc, sPropertyDefinitions );
950
955
951
956
QDomElement elem = doc.createElement ( QStringLiteral ( " settings" ) );
952
957
elem.appendChild ( textStyleElem );
0 commit comments