Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix #2543
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13047 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Mar 11, 2010
1 parent 8fce780 commit 01dcd47
Showing 1 changed file with 11 additions and 6 deletions.
17 changes: 11 additions & 6 deletions src/gui/qgsmapcanvas.cpp
Expand Up @@ -222,20 +222,25 @@ const QgsMapToPixel * QgsMapCanvas::getCoordinateTransform()
return mMapRenderer->coordinateTransform();
}

void QgsMapCanvas::setLayerSet( QList<QgsMapCanvasLayer>& layers )
void QgsMapCanvas::setLayerSet( QList<QgsMapCanvasLayer> &layers )
{
if ( mDrawing )
{
return;
}
int i;

// create layer set
QStringList layerSet, layerSetOverview;

int i;
for ( i = 0; i < layers.size(); i++ )
{
QgsMapCanvasLayer& lyr = layers[i];
QgsMapCanvasLayer &lyr = layers[i];
if ( !lyr.layer() )
{
continue;
}

if ( lyr.isVisible() )
{
layerSet.push_back( lyr.layer()->getLayerID() );
Expand All @@ -248,7 +253,7 @@ void QgsMapCanvas::setLayerSet( QList<QgsMapCanvasLayer>& layers )

QStringList& layerSetOld = mMapRenderer->layerSet();

bool layerSetChanged = ( layerSetOld != layerSet );
bool layerSetChanged = layerSetOld != layerSet;

// update only if needed
if ( layerSetChanged )
Expand Down Expand Up @@ -1170,11 +1175,11 @@ int QgsMapCanvas::layerCount() const
QList<QgsMapLayer*> QgsMapCanvas::layers() const
{
QList<QgsMapLayer*> lst;
foreach ( QString layerID, mMapRenderer->layerSet() )
foreach( QString layerID, mMapRenderer->layerSet() )
{
QgsMapLayer* layer = QgsMapLayerRegistry::instance()->mapLayer( layerID );
if ( layer )
lst.append(layer);
lst.append( layer );
}
return lst;
}
Expand Down

0 comments on commit 01dcd47

Please sign in to comment.