sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

If vector layer renderer cannot be loaded, fallback to default

Browse Source 
Eg if loading a project which used a plugin based renderer which
is not available, qgis would not renderer the layer and
eventually crash. Now if the saved renderer could not be
restored we fallback to a default renderer for the layer.
This commit is contained in:
Nyall Dawson 2016-09-05 08:53:00 +10:00
parent 95c4fa1340
commit 96e10ebff2
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/core/qgsvectorlayer.cpp
View File

@ -1786,6 +1786,7 @@ bool QgsVectorLayer::readSymbology( const QDomNode& node, QString& errorMessage
bool QgsVectorLayer::readStyle( const QDomNode &node, QString &errorMessage )
{
bool result = true;
emit readCustomSymbology( node.toElement(), errorMessage );
if ( hasGeometryType() )
@ -1795,18 +1796,28 @@ bool QgsVectorLayer::readStyle( const QDomNode &node, QString &errorMessage )
if ( !rendererElement.isNull() )
{
QgsFeatureRenderer* r = QgsFeatureRenderer::load( rendererElement );
if ( !r )
return false;
setRenderer( r );
if ( r )
{
setRenderer( r );
}
else
{
result = false;
}
}
else
{
QgsFeatureRenderer* r = QgsSymbologyConversion::readOldRenderer( node, geometryType() );
if ( !r )
r = QgsFeatureRenderer::defaultRenderer( geometryType() );
if ( r )
{
setRenderer( r );
}
}
setRenderer( r );
// make sure layer has a renderer - if none exists, fallback to a default renderer
if ( !renderer() )
{
setRenderer( QgsFeatureRenderer::defaultRenderer( geometryType() ) );
}
QDomElement labelingElement = node.firstChildElement( "labeling" );
@ -1879,7 +1890,7 @@ bool QgsVectorLayer::readStyle( const QDomNode &node, QString &errorMessage )
}
}
}
return true;
return result;
}
bool QgsVectorLayer::writeSymbology( QDomNode& node, QDomDocument& doc, QString& errorMessage ) const