Skip to content

Commit c449b95

Browse files
committedJul 11, 2015
Fix diagrams incorrectly enabled when opening project from >= 2.10
1 parent 388d339 commit c449b95

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed
 

‎src/core/qgsvectorlayer.cpp

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1611,14 +1611,22 @@ bool QgsVectorLayer::readSymbology( const QDomNode& node, QString& errorMessage
16111611
QDomElement singleCatDiagramElem = node.firstChildElement( "SingleCategoryDiagramRenderer" );
16121612
if ( !singleCatDiagramElem.isNull() )
16131613
{
1614-
mDiagramRenderer = new QgsSingleCategoryDiagramRenderer();
1615-
mDiagramRenderer->readXML( singleCatDiagramElem, this );
1614+
QDomElement catElem = singleCatDiagramElem.firstChildElement( "DiagramCategory" );
1615+
if ( !catElem.isNull() && catElem.attribute( "enabled", "1" ) != "0" )
1616+
{
1617+
mDiagramRenderer = new QgsSingleCategoryDiagramRenderer();
1618+
mDiagramRenderer->readXML( singleCatDiagramElem, this );
1619+
}
16161620
}
16171621
QDomElement linearDiagramElem = node.firstChildElement( "LinearlyInterpolatedDiagramRenderer" );
16181622
if ( !linearDiagramElem.isNull() )
16191623
{
1620-
mDiagramRenderer = new QgsLinearlyInterpolatedDiagramRenderer();
1621-
mDiagramRenderer->readXML( linearDiagramElem, this );
1624+
QDomElement catElem = linearDiagramElem.firstChildElement( "DiagramCategory" );
1625+
if ( !catElem.isNull() && catElem.attribute( "enabled", "1" ) != "0" )
1626+
{
1627+
mDiagramRenderer = new QgsLinearlyInterpolatedDiagramRenderer();
1628+
mDiagramRenderer->readXML( linearDiagramElem, this );
1629+
}
16221630
}
16231631

16241632
if ( mDiagramRenderer )

0 commit comments

Comments
 (0)
Please sign in to comment.