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

remove Q_FOREACH

Browse Source
This commit is contained in:
Denis Rouzaud 2019-01-31 11:40:41 -05:00
parent 3d57a93ffe
commit 2fbdac09ea
2 changed files with 11 additions and 7 deletions

16
src/gui/layertree/qgslayertreemapcanvasbridge.cpp

@ -29,7 +29,7 @@ QgsLayerTreeMapCanvasBridge::QgsLayerTreeMapCanvasBridge( QgsLayerTree *root, Qg
, mCanvas( canvas ) , mCanvas( canvas )
, mPendingCanvasUpdate( false ) , mPendingCanvasUpdate( false )
, mAutoSetupOnFirstLayer( true ) , mAutoSetupOnFirstLayer( true )
, mLastLayerCount( !root->findLayers().isEmpty() ) , mHasLayersLoaded( !root->findLayers().isEmpty() )
{ {
connect( root, &QgsLayerTreeGroup::customPropertyChanged, this, &QgsLayerTreeMapCanvasBridge::nodeCustomPropertyChanged ); connect( root, &QgsLayerTreeGroup::customPropertyChanged, this, &QgsLayerTreeMapCanvasBridge::nodeCustomPropertyChanged );
connect( root, &QgsLayerTreeNode::visibilityChanged, this, &QgsLayerTreeMapCanvasBridge::nodeVisibilityChanged ); connect( root, &QgsLayerTreeNode::visibilityChanged, this, &QgsLayerTreeMapCanvasBridge::nodeVisibilityChanged );
@ -44,7 +44,8 @@ void QgsLayerTreeMapCanvasBridge::setCanvasLayers()
if ( mRoot->hasCustomLayerOrder() ) if ( mRoot->hasCustomLayerOrder() )
{ {
Q_FOREACH ( QgsMapLayer *layer, mRoot->customLayerOrder() ) const QList<QgsMapLayer *> customOrderLayers = mRoot->customLayerOrder();
for ( const QgsMapLayer *layer : customOrderLayers )
{ {
QgsLayerTreeLayer *nodeLayer = mRoot->findLayer( layer->id() ); QgsLayerTreeLayer *nodeLayer = mRoot->findLayer( layer->id() );
if ( nodeLayer ) if ( nodeLayer )
@ -61,7 +62,9 @@ void QgsLayerTreeMapCanvasBridge::setCanvasLayers()
} }
} }
else else
{
setCanvasLayers( mRoot, canvasLayers, overviewLayers, allLayerOrder ); setCanvasLayers( mRoot, canvasLayers, overviewLayers, allLayerOrder );
}
const QList<QgsLayerTreeLayer *> layerNodes = mRoot->findLayers(); const QList<QgsLayerTreeLayer *> layerNodes = mRoot->findLayers();
int currentSpatialLayerCount = 0; int currentSpatialLayerCount = 0;
@ -71,7 +74,7 @@ void QgsLayerTreeMapCanvasBridge::setCanvasLayers()
currentSpatialLayerCount++; currentSpatialLayerCount++;
} }
bool firstLayers = mAutoSetupOnFirstLayer && mLastLayerCount == 0 && currentSpatialLayerCount != 0; bool firstLayers = mAutoSetupOnFirstLayer && !mHasLayersLoaded && currentSpatialLayerCount != 0;
mCanvas->setLayers( canvasLayers ); mCanvas->setLayers( canvasLayers );
if ( mOverviewCanvas ) if ( mOverviewCanvas )
@ -86,7 +89,7 @@ void QgsLayerTreeMapCanvasBridge::setCanvasLayers()
if ( !mFirstCRS.isValid() ) if ( !mFirstCRS.isValid() )
{ {
// find out what is the first used CRS in case we may need to turn on OTF projections later // find out what is the first used CRS in case we may need to turn on OTF projections later
Q_FOREACH ( QgsLayerTreeLayer *layerNode, layerNodes ) for ( const QgsLayerTreeLayer *layerNode : layerNodes )
{ {
if ( layerNode->layer() && layerNode->layer()->crs().isValid() ) if ( layerNode->layer() && layerNode->layer()->crs().isValid() )
{ {
@ -101,7 +104,7 @@ void QgsLayerTreeMapCanvasBridge::setCanvasLayers()
QgsProject::instance()->setCrs( mFirstCRS ); QgsProject::instance()->setCrs( mFirstCRS );
} }
mLastLayerCount = currentSpatialLayerCount; mHasLayersLoaded = currentSpatialLayerCount;
if ( currentSpatialLayerCount == 0 ) if ( currentSpatialLayerCount == 0 )
mFirstCRS = QgsCoordinateReferenceSystem(); mFirstCRS = QgsCoordinateReferenceSystem();
@ -125,7 +128,8 @@ void QgsLayerTreeMapCanvasBridge::setCanvasLayers( QgsLayerTreeNode *node, QList
} }
} }
Q_FOREACH ( QgsLayerTreeNode *child, node->children() ) const QList<QgsLayerTreeNode *> children = node->children();
for ( QgsLayerTreeNode *child : children )
setCanvasLayers( child, canvasLayers, overviewLayers, allLayers ); setCanvasLayers( child, canvasLayers, overviewLayers, allLayers );
} }

2
src/gui/layertree/qgslayertreemapcanvasbridge.h

@ -120,7 +120,7 @@ class GUI_EXPORT QgsLayerTreeMapCanvasBridge : public QObject
bool mAutoSetupOnFirstLayer; bool mAutoSetupOnFirstLayer;
bool mHasFirstLayer; bool mHasFirstLayer;
bool mLastLayerCount; bool mHasLayersLoaded;
bool mUpdatingProjectLayerOrder = false; bool mUpdatingProjectLayerOrder = false;
QgsCoordinateReferenceSystem mFirstCRS; QgsCoordinateReferenceSystem mFirstCRS;