Skip to content
Permalink
Browse files
Emit extentChanged signal in composer map after drawing to prevent co…
…ncurrent layer access with table items

git-svn-id: http://svn.osgeo.org/qgis/trunk@12689 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
mhugent committed Jan 7, 2010
1 parent 41c888c commit 01e993cf4c666e0620a2d38bc84a2d31b3237a7c
Showing with 5 additions and 4 deletions.
  1. +5 −4 src/core/composer/qgscomposermap.cpp
@@ -365,9 +365,9 @@ void QgsComposerMap::moveContent( double dx, double dy )
mExtent.setXMaximum( mExtent.xMaximum() + dx );
mExtent.setYMinimum( mExtent.yMinimum() + dy );
mExtent.setYMaximum( mExtent.yMaximum() + dy );
emit extentChanged();
cache();
update();
emit extentChanged();
}
}

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

emit extentChanged();
cache();
update();
emit extentChanged();
}

void QgsComposerMap::setSceneRect( const QRectF& rectangle )
@@ -450,13 +450,14 @@ void QgsComposerMap::setSceneRect( const QRectF& rectangle )
double newHeight = mExtent.width() * h / w ;
mExtent = QgsRectangle( mExtent.xMinimum(), mExtent.yMinimum(), mExtent.xMaximum(), mExtent.yMinimum() + newHeight );
mCacheUpdated = false;
emit extentChanged();

if ( mPreviewMode != Rectangle )
{
cache();
}
updateBoundingRect();
update();
emit extentChanged();
}

void QgsComposerMap::setNewExtent( const QgsRectangle& extent )
@@ -487,9 +488,9 @@ void QgsComposerMap::setNewScale( double scaleDenominator )
double scaleRatio = scaleDenominator / currentScaleDenominator;
mExtent.scale( scaleRatio );
mCacheUpdated = false;
emit extentChanged();
cache();
update();
emit extentChanged();
}

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

0 comments on commit 01e993c

Please sign in to comment.