Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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/qgis@12689 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
mhugent committed Jan 7, 2010
1 parent 1a4c602 commit c953e5c
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/core/composer/qgscomposermap.cpp
Expand Up @@ -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();
}
}

Expand Down Expand Up @@ -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 )
Expand All @@ -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 )
Expand Down Expand Up @@ -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 )
Expand Down

0 comments on commit c953e5c

Please sign in to comment.