Skip to content

Commit e20bd88

Browse files
committed
Save display expression with qml export
1 parent 2ccdac7 commit e20bd88

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

src/core/qgsvectorlayer.cpp

+19-19
Original file line numberDiff line numberDiff line change
@@ -1655,18 +1655,6 @@ bool QgsVectorLayer::readXml( const QDomNode& layer_node )
16551655
updateFields();
16561656
connect( QgsMapLayerRegistry::instance(), SIGNAL( layerWillBeRemoved( QString ) ), this, SLOT( checkJoinLayerRemove( QString ) ) );
16571657

1658-
QDomNode prevExpNode = layer_node.namedItem( "previewExpression" );
1659-
1660-
if ( prevExpNode.isNull() )
1661-
{
1662-
mDisplayExpression = "";
1663-
}
1664-
else
1665-
{
1666-
QDomElement prevExpElem = prevExpNode.toElement();
1667-
mDisplayExpression = prevExpElem.text();
1668-
}
1669-
16701658
QString errorMsg;
16711659
if ( !readSymbology( layer_node, errorMsg ) )
16721660
{
@@ -1852,12 +1840,6 @@ bool QgsVectorLayer::writeXml( QDomNode & layer_node,
18521840
layer_node.appendChild( provider );
18531841
}
18541842

1855-
// save preview expression
1856-
QDomElement prevExpElem = document.createElement( "previewExpression" );
1857-
QDomText prevExpText = document.createTextNode( mDisplayExpression );
1858-
prevExpElem.appendChild( prevExpText );
1859-
layer_node.appendChild( prevExpElem );
1860-
18611843
//save joins
18621844
mJoinBuffer->writeXml( layer_node, document );
18631845

@@ -1976,13 +1958,25 @@ bool QgsVectorLayer::readSymbology( const QDomNode& node, QString& errorMessage
19761958

19771959
mConditionalStyles->readXml( node );
19781960

1961+
QDomNode prevExpNode = node.namedItem( "previewExpression" );
1962+
1963+
if ( prevExpNode.isNull() )
1964+
{
1965+
mDisplayExpression = "";
1966+
}
1967+
else
1968+
{
1969+
QDomElement prevExpElem = prevExpNode.toElement();
1970+
mDisplayExpression = prevExpElem.text();
1971+
}
1972+
1973+
19791974
readCustomProperties( node, "variable" );
19801975

19811976
QDomElement mapLayerNode = node.toElement();
19821977
if ( mapLayerNode.attribute( "readOnly", "0" ).toInt() == 1 )
19831978
mReadOnly = true;
19841979

1985-
19861980
return true;
19871981
}
19881982

@@ -2193,6 +2187,12 @@ bool QgsVectorLayer::writeSymbology( QDomNode& node, QDomDocument& doc, QString&
21932187
}
21942188
node.appendChild( defaultsElem );
21952189

2190+
// preview expression
2191+
QDomElement prevExpElem = doc.createElement( "previewExpression" );
2192+
QDomText prevExpText = doc.createTextNode( mDisplayExpression );
2193+
prevExpElem.appendChild( prevExpText );
2194+
node.appendChild( prevExpElem );
2195+
21962196
return true;
21972197
}
21982198

0 commit comments

Comments
 (0)