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

legend interface: guard layer dereferences (fixes #13899)

Browse Source
This commit is contained in:
Juergen E. Fischer 2015-11-29 20:48:10 +01:00
parent c14352fa55
commit 3b2d7173f6
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/app/legend/qgsapplegendinterface.cpp
View File

@ -75,8 +75,11 @@ void QgsAppLegendInterface::removeGroup( int groupIndex )
parentGroup->removeChildNode( group ); parentGroup->removeChildNode( group );
} }
void QgsAppLegendInterface::moveLayer( QgsMapLayer * ml, int groupIndex ) void QgsAppLegendInterface::moveLayer( QgsMapLayer *ml, int groupIndex )
{ {
if ( !ml )
return;
QgsLayerTreeGroup* group = groupIndexToNode( groupIndex ); QgsLayerTreeGroup* group = groupIndexToNode( groupIndex );
if ( !group ) if ( !group )
return; return;
@ -155,14 +158,20 @@ int QgsAppLegendInterface::groupNodeToIndex( QgsLayerTreeGroup* group )
return _groupNodeToIndex( group, mLayerTreeView->layerTreeModel()->rootGroup(), currentIndex ); return _groupNodeToIndex( group, mLayerTreeView->layerTreeModel()->rootGroup(), currentIndex );
} }
void QgsAppLegendInterface::setLayerVisible( QgsMapLayer * ml, bool visible ) void QgsAppLegendInterface::setLayerVisible( QgsMapLayer *ml, bool visible )
{ {
if ( !ml )
return;
if ( QgsLayerTreeLayer* nodeLayer = mLayerTreeView->layerTreeModel()->rootGroup()->findLayer( ml->id() ) ) if ( QgsLayerTreeLayer* nodeLayer = mLayerTreeView->layerTreeModel()->rootGroup()->findLayer( ml->id() ) )
nodeLayer->setVisible( visible ? Qt::Checked : Qt::Unchecked ); nodeLayer->setVisible( visible ? Qt::Checked : Qt::Unchecked );
} }
void QgsAppLegendInterface::setLayerExpanded( QgsMapLayer * ml, bool expand ) void QgsAppLegendInterface::setLayerExpanded( QgsMapLayer * ml, bool expand )
{ {
if ( !ml )
return;
if ( QgsLayerTreeLayer* nodeLayer = mLayerTreeView->layerTreeModel()->rootGroup()->findLayer( ml->id() ) ) if ( QgsLayerTreeLayer* nodeLayer = mLayerTreeView->layerTreeModel()->rootGroup()->findLayer( ml->id() ) )
setExpanded( nodeLayer, expand ); setExpanded( nodeLayer, expand );
} }
@ -247,8 +256,11 @@ bool QgsAppLegendInterface::isGroupVisible( int groupIndex )
return false; return false;
} }
bool QgsAppLegendInterface::isLayerExpanded( QgsMapLayer * ml ) bool QgsAppLegendInterface::isLayerExpanded( QgsMapLayer *ml )
{ {
if ( !ml )
return false;
if ( QgsLayerTreeLayer* nodeLayer = mLayerTreeView->layerTreeModel()->rootGroup()->findLayer( ml->id() ) ) if ( QgsLayerTreeLayer* nodeLayer = mLayerTreeView->layerTreeModel()->rootGroup()->findLayer( ml->id() ) )
return nodeLayer->isExpanded(); return nodeLayer->isExpanded();
@ -256,8 +268,11 @@ bool QgsAppLegendInterface::isLayerExpanded( QgsMapLayer * ml )
} }
bool QgsAppLegendInterface::isLayerVisible( QgsMapLayer * ml ) bool QgsAppLegendInterface::isLayerVisible( QgsMapLayer *ml )
{ {
if ( !ml )
return false;
if ( QgsLayerTreeLayer* nodeLayer = mLayerTreeView->layerTreeModel()->rootGroup()->findLayer( ml->id() ) ) if ( QgsLayerTreeLayer* nodeLayer = mLayerTreeView->layerTreeModel()->rootGroup()->findLayer( ml->id() ) )
return nodeLayer->isVisible() == Qt::Checked; return nodeLayer->isVisible() == Qt::Checked;
@ -283,6 +298,9 @@ QList< QgsMapLayer * > QgsAppLegendInterface::layers() const
void QgsAppLegendInterface::refreshLayerSymbology( QgsMapLayer *ml ) void QgsAppLegendInterface::refreshLayerSymbology( QgsMapLayer *ml )
{ {
if ( !ml )
return;
mLayerTreeView->refreshLayerSymbology( ml->id() ); mLayerTreeView->refreshLayerSymbology( ml->id() );
} }