Skip to content

Commit

Permalink
Update layout map to use transform context
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Dec 15, 2017
1 parent 4838e55 commit 95a2ac0
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/core/layout/qgslayoutitemmap.cpp
Expand Up @@ -1498,7 +1498,7 @@ QPointF QgsLayoutItemMap::layoutMapPosForItem( const QgsAnnotation *annotation )
{
//need to reproject
// todo datum nyall set context
QgsCoordinateTransform t( annotationCrs, crs() );
QgsCoordinateTransform t( annotationCrs, crs(), mLayout->project() );
double z = 0.0;
try
{
Expand Down
2 changes: 1 addition & 1 deletion src/core/layout/qgslayoutitemmapgrid.cpp
Expand Up @@ -2294,7 +2294,7 @@ int QgsLayoutItemMapGrid::crsGridParams( QgsRectangle &crsRect, QgsCoordinateTra

try
{
QgsCoordinateTransform tr( mMap->crs(), mCRS );
QgsCoordinateTransform tr( mMap->crs(), mCRS, mLayout->project() );
QPolygonF mapPolygon = mMap->transformedMapPolygon();
QRectF mbr = mapPolygon.boundingRect();
QgsRectangle mapBoundingRect( mbr.left(), mbr.bottom(), mbr.right(), mbr.top() );
Expand Down
2 changes: 1 addition & 1 deletion src/core/layout/qgslayoutitemmapoverview.cpp
Expand Up @@ -70,7 +70,7 @@ void QgsLayoutItemMapOverview::draw( QPainter *painter )

// reproject extent
QgsCoordinateTransform ct( overviewFrameMap->crs(),
mMap->crs() );
mMap->crs(), mLayout->project() );
g = g.densifyByCount( 20 );
try
{
Expand Down

0 comments on commit 95a2ac0

Please sign in to comment.