Skip to content

Commit 01e993c

Browse files
author
mhugent
committed
Emit extentChanged signal in composer map after drawing to prevent concurrent layer access with table items
git-svn-id: http://svn.osgeo.org/qgis/trunk@12689 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 41c888c commit 01e993c

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/core/composer/qgscomposermap.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -365,9 +365,9 @@ void QgsComposerMap::moveContent( double dx, double dy )
365365
mExtent.setXMaximum( mExtent.xMaximum() + dx );
366366
mExtent.setYMinimum( mExtent.yMinimum() + dy );
367367
mExtent.setYMaximum( mExtent.yMaximum() + dy );
368-
emit extentChanged();
369368
cache();
370369
update();
370+
emit extentChanged();
371371
}
372372
}
373373

@@ -433,9 +433,9 @@ void QgsComposerMap::zoomContent( int delta, double x, double y )
433433
mExtent.setYMaximum( centerY + newIntervalY / 2 );
434434
mExtent.setYMinimum( centerY - newIntervalY / 2 );
435435

436-
emit extentChanged();
437436
cache();
438437
update();
438+
emit extentChanged();
439439
}
440440

441441
void QgsComposerMap::setSceneRect( const QRectF& rectangle )
@@ -450,13 +450,14 @@ void QgsComposerMap::setSceneRect( const QRectF& rectangle )
450450
double newHeight = mExtent.width() * h / w ;
451451
mExtent = QgsRectangle( mExtent.xMinimum(), mExtent.yMinimum(), mExtent.xMaximum(), mExtent.yMinimum() + newHeight );
452452
mCacheUpdated = false;
453-
emit extentChanged();
453+
454454
if ( mPreviewMode != Rectangle )
455455
{
456456
cache();
457457
}
458458
updateBoundingRect();
459459
update();
460+
emit extentChanged();
460461
}
461462

462463
void QgsComposerMap::setNewExtent( const QgsRectangle& extent )
@@ -487,9 +488,9 @@ void QgsComposerMap::setNewScale( double scaleDenominator )
487488
double scaleRatio = scaleDenominator / currentScaleDenominator;
488489
mExtent.scale( scaleRatio );
489490
mCacheUpdated = false;
490-
emit extentChanged();
491491
cache();
492492
update();
493+
emit extentChanged();
493494
}
494495

495496
void QgsComposerMap::setOffset( double xOffset, double yOffset )

0 commit comments

Comments
 (0)