14 changes: 7 additions & 7 deletions src/core/composer/qgscomposermultiframe.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ void QgsComposerMultiFrame::recalculateFrameSizes()
while (( mResizeMode == RepeatOnEveryPage ) || currentY < totalHeight )
{
//find out on which page the lower left point of the last frame is
int page = currentItem->transform().dy() / ( mComposition->paperHeight() + mComposition->spaceBetweenPages() );
int page = currentItem->pos().y() / ( mComposition->paperHeight() + mComposition->spaceBetweenPages() );
if ( mResizeMode == RepeatOnEveryPage )
{
if ( page > mComposition->numPages() - 2 )
Expand Down Expand Up @@ -124,9 +124,9 @@ void QgsComposerMultiFrame::recalculateFrameSizes()
double newFrameY = ( page + 1 ) * ( mComposition->paperHeight() + mComposition->spaceBetweenPages() );
if ( mResizeMode == RepeatUntilFinished || mResizeMode == RepeatOnEveryPage )
{
newFrameY += currentItem->transform().dy() - page * ( mComposition->paperHeight() + mComposition->spaceBetweenPages() );
newFrameY += currentItem->pos().y() - page * ( mComposition->paperHeight() + mComposition->spaceBetweenPages() );
}
QgsComposerFrame* newFrame = new QgsComposerFrame( mComposition, this, currentItem->transform().dx(),
QgsComposerFrame* newFrame = new QgsComposerFrame( mComposition, this, currentItem->pos().x(),
newFrameY,
currentItem->rect().width(), frameHeight );
if ( mResizeMode == RepeatOnEveryPage )
Expand Down Expand Up @@ -179,7 +179,7 @@ void QgsComposerMultiFrame::handlePageChange()
for ( int i = mFrameItems.size() - 1; i >= 0; --i )
{
QgsComposerFrame* frame = mFrameItems[i];
int page = frame->transform().dy() / ( mComposition->paperHeight() + mComposition->spaceBetweenPages() );
int page = frame->pos().y() / ( mComposition->paperHeight() + mComposition->spaceBetweenPages() );
if ( page > ( mComposition->numPages() - 1 ) )
{
removeFrame( i );
Expand All @@ -188,13 +188,13 @@ void QgsComposerMultiFrame::handlePageChange()

//page number of the last item
QgsComposerFrame* lastFrame = mFrameItems.last();
int lastItemPage = lastFrame->transform().dy() / ( mComposition->paperHeight() + mComposition->spaceBetweenPages() );
int lastItemPage = lastFrame->pos().y() / ( mComposition->paperHeight() + mComposition->spaceBetweenPages() );

for ( int i = lastItemPage + 1; i < mComposition->numPages(); ++i )
{
//copy last frame to current page
QgsComposerFrame* newFrame = new QgsComposerFrame( mComposition, this, lastFrame->transform().dx(),
lastFrame->transform().dy() + mComposition->paperHeight() + mComposition->spaceBetweenPages(),
QgsComposerFrame* newFrame = new QgsComposerFrame( mComposition, this, lastFrame->pos().x(),
lastFrame->pos().y() + mComposition->paperHeight() + mComposition->spaceBetweenPages(),
lastFrame->rect().width(), lastFrame->rect().height() );
addFrame( newFrame, false );
lastFrame = newFrame;
Expand Down
6 changes: 3 additions & 3 deletions src/core/composer/qgscomposerpicture.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ void QgsComposerPicture::setPictureFile( const QString& path )

if ( mMode != Unknown ) //make sure we start with a new QImage
{
setSceneRect( QRectF( transform().dx(), transform().dy(), rect().width(), rect().height() ) );
setSceneRect( QRectF( pos().x(), pos().y(), rect().width(), rect().height() ) );
}
emit itemChanged();
}
Expand Down Expand Up @@ -221,8 +221,8 @@ void QgsComposerPicture::setRotation( double r )
sizeChangedByRotation( width, height );

//adapt scene rect to have the same center and the new width / height
double x = transform().dx() + rect().width() / 2.0 - width / 2.0;
double y = transform().dy() + rect().height() / 2.0 - height / 2.0;
double x = pos().x() + rect().width() / 2.0 - width / 2.0;
double y = pos().y() + rect().height() / 2.0 - height / 2.0;
QgsComposerItem::setSceneRect( QRectF( x, y, width, height ) );

QgsComposerItem::setRotation( r );
Expand Down
4 changes: 2 additions & 2 deletions src/core/composer/qgscomposershape.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ void QgsComposerShape::setRotation( double r )
sizeChangedByRotation( width, height );

//adapt scene rect to have the same center and the new width / height
double x = transform().dx() + rect().width() / 2.0 - width / 2.0;
double y = transform().dy() + rect().height() / 2.0 - height / 2.0;
double x = pos().x() + rect().width() / 2.0 - width / 2.0;
double y = pos().y() + rect().height() / 2.0 - height / 2.0;
QgsComposerItem::setSceneRect( QRectF( x, y, width, height ) );

QgsComposerItem::setRotation( r );
Expand Down
4 changes: 2 additions & 2 deletions src/core/composer/qgscomposertable.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,8 @@ void QgsComposerTable::adaptItemFrame( const QMap<int, double>& maxWidthMap, con
}
totalWidth += ( 2 * maxWidthMap.size() * mLineTextDistance );
totalWidth += ( maxWidthMap.size() + 1 ) * mGridStrokeWidth;
QTransform t = transform();
QgsComposerItem::setSceneRect( QRectF( t.dx(), t.dy(), totalWidth, totalHeight ) );

QgsComposerItem::setSceneRect( QRectF( pos().x(), pos().y(), totalWidth, totalHeight ) );
}

void QgsComposerTable::drawHorizontalGridLines( QPainter* p, int nAttributes )
Expand Down
68 changes: 28 additions & 40 deletions src/core/composer/qgscomposition.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ int QgsComposition::pageNumberAt( const QPointF& position ) const

int QgsComposition::itemPageNumber( const QgsComposerItem* item ) const
{
return pageNumberAt( QPointF( item->transform().dx(), item->transform().dy() ) );
return pageNumberAt( QPointF( item->pos().x(), item->pos().y() ) );
}

QList<QgsComposerItem*> QgsComposition::selectedComposerItems()
Expand Down Expand Up @@ -713,7 +713,7 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen
{
if ( pasteInPlacePt )
{
newLabel->setItemPosition( newLabel->transform().dx(), fmod( newLabel->transform().dy(), ( paperHeight() + spaceBetweenPages() ) ) );
newLabel->setItemPosition( newLabel->pos().x(), fmod( newLabel->pos().y(), ( paperHeight() + spaceBetweenPages() ) ) );
newLabel->move( pasteInPlacePt->x(), pasteInPlacePt->y() );
}
else
Expand Down Expand Up @@ -747,7 +747,7 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen
{
if ( pasteInPlace )
{
newMap->setItemPosition( newMap->transform().dx(), fmod( newMap->transform().dy(), ( paperHeight() + spaceBetweenPages() ) ) );
newMap->setItemPosition( newMap->pos().x(), fmod( newMap->pos().y(), ( paperHeight() + spaceBetweenPages() ) ) );
newMap->move( pasteInPlacePt->x(), pasteInPlacePt->y() );
}
else
Expand All @@ -772,7 +772,7 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen
{
if ( pasteInPlace )
{
newArrow->setItemPosition( newArrow->transform().dx(), fmod( newArrow->transform().dy(), ( paperHeight() + spaceBetweenPages() ) ) );
newArrow->setItemPosition( newArrow->pos().x(), fmod( newArrow->pos().y(), ( paperHeight() + spaceBetweenPages() ) ) );
newArrow->move( pasteInPlacePt->x(), pasteInPlacePt->y() );
}
else
Expand All @@ -797,7 +797,7 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen
{
if ( pasteInPlace )
{
newScaleBar->setItemPosition( newScaleBar->transform().dx(), fmod( newScaleBar->transform().dy(), ( paperHeight() + spaceBetweenPages() ) ) );
newScaleBar->setItemPosition( newScaleBar->pos().x(), fmod( newScaleBar->pos().y(), ( paperHeight() + spaceBetweenPages() ) ) );
newScaleBar->move( pasteInPlacePt->x(), pasteInPlacePt->y() );
}
else
Expand All @@ -822,7 +822,7 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen
{
if ( pasteInPlace )
{
newShape->setItemPosition( newShape->transform().dx(), fmod( newShape->transform().dy(), ( paperHeight() + spaceBetweenPages() ) ) );
newShape->setItemPosition( newShape->pos().x(), fmod( newShape->pos().y(), ( paperHeight() + spaceBetweenPages() ) ) );
newShape->move( pasteInPlacePt->x(), pasteInPlacePt->y() );
}
else
Expand All @@ -847,7 +847,7 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen
{
if ( pasteInPlace )
{
newPicture->setItemPosition( newPicture->transform().dx(), fmod( newPicture->transform().dy(), ( paperHeight() + spaceBetweenPages() ) ) );
newPicture->setItemPosition( newPicture->pos().x(), fmod( newPicture->pos().y(), ( paperHeight() + spaceBetweenPages() ) ) );
newPicture->move( pasteInPlacePt->x(), pasteInPlacePt->y() );
}
else
Expand All @@ -872,7 +872,7 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen
{
if ( pasteInPlace )
{
newLegend->setItemPosition( newLegend->transform().dx(), fmod( newLegend->transform().dy(), ( paperHeight() + spaceBetweenPages() ) ) );
newLegend->setItemPosition( newLegend->pos().x(), fmod( newLegend->pos().y(), ( paperHeight() + spaceBetweenPages() ) ) );
newLegend->move( pasteInPlacePt->x(), pasteInPlacePt->y() );
}
else
Expand All @@ -897,7 +897,7 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen
{
if ( pasteInPlace )
{
newTable->setItemPosition( newTable->transform().dx(), fmod( newTable->transform().dy(), ( paperHeight() + spaceBetweenPages() ) ) );
newTable->setItemPosition( newTable->pos().x(), fmod( newTable->pos().y(), ( paperHeight() + spaceBetweenPages() ) ) );
newTable->move( pasteInPlacePt->x(), pasteInPlacePt->y() );
}
else
Expand Down Expand Up @@ -1155,9 +1155,7 @@ void QgsComposition::alignSelectedItemsLeft()
{
QgsComposerItemCommand* subcommand = new QgsComposerItemCommand( *align_it, "", parentCommand );
subcommand->savePreviousState();
QTransform itemTransform = ( *align_it )->transform();
itemTransform.translate( minXCoordinate - itemTransform.dx(), 0 );
( *align_it )->setTransform( itemTransform );
( *align_it )->setPos( minXCoordinate, ( *align_it )->pos().y() );
subcommand->saveAfterState();
}
mUndoStack.push( parentCommand );
Expand Down Expand Up @@ -1186,9 +1184,7 @@ void QgsComposition::alignSelectedItemsHCenter()
{
QgsComposerItemCommand* subcommand = new QgsComposerItemCommand( *align_it, "", parentCommand );
subcommand->savePreviousState();
QTransform itemTransform = ( *align_it )->transform();
itemTransform.translate( averageXCoord - itemTransform.dx() - ( *align_it )->rect().width() / 2.0, 0 );
( *align_it )->setTransform( itemTransform );
( *align_it )->setPos( averageXCoord - ( *align_it )->rect().width() / 2.0, ( *align_it )->pos().y() );
subcommand->saveAfterState();
}
mUndoStack.push( parentCommand );
Expand Down Expand Up @@ -1217,9 +1213,7 @@ void QgsComposition::alignSelectedItemsRight()
{
QgsComposerItemCommand* subcommand = new QgsComposerItemCommand( *align_it, "", parentCommand );
subcommand->savePreviousState();
QTransform itemTransform = ( *align_it )->transform();
itemTransform.translate( maxXCoordinate - itemTransform.dx() - ( *align_it )->rect().width(), 0 );
( *align_it )->setTransform( itemTransform );
( *align_it )->setPos( maxXCoordinate - ( *align_it )->rect().width(), ( *align_it )->pos().y() );
subcommand->saveAfterState();
}
mUndoStack.push( parentCommand );
Expand Down Expand Up @@ -1247,9 +1241,7 @@ void QgsComposition::alignSelectedItemsTop()
{
QgsComposerItemCommand* subcommand = new QgsComposerItemCommand( *align_it, "", parentCommand );
subcommand->savePreviousState();
QTransform itemTransform = ( *align_it )->transform();
itemTransform.translate( 0, minYCoordinate - itemTransform.dy() );
( *align_it )->setTransform( itemTransform );
( *align_it )->setPos(( *align_it )->pos().x(), minYCoordinate );
subcommand->saveAfterState();
}
mUndoStack.push( parentCommand );
Expand All @@ -1276,9 +1268,7 @@ void QgsComposition::alignSelectedItemsVCenter()
{
QgsComposerItemCommand* subcommand = new QgsComposerItemCommand( *align_it, "", parentCommand );
subcommand->savePreviousState();
QTransform itemTransform = ( *align_it )->transform();
itemTransform.translate( 0, averageYCoord - itemTransform.dy() - ( *align_it )->rect().height() / 2 );
( *align_it )->setTransform( itemTransform );
( *align_it )->setPos(( *align_it )->pos().x(), averageYCoord - ( *align_it )->rect().height() / 2 );
subcommand->saveAfterState();
}
mUndoStack.push( parentCommand );
Expand All @@ -1305,9 +1295,7 @@ void QgsComposition::alignSelectedItemsBottom()
{
QgsComposerItemCommand* subcommand = new QgsComposerItemCommand( *align_it, "", parentCommand );
subcommand->savePreviousState();
QTransform itemTransform = ( *align_it )->transform();
itemTransform.translate( 0, maxYCoord - itemTransform.dy() - ( *align_it )->rect().height() );
( *align_it )->setTransform( itemTransform );
( *align_it )->setPos(( *align_it )->pos().x(), maxYCoord - ( *align_it )->rect().height() );
subcommand->saveAfterState();
}
mUndoStack.push( parentCommand );
Expand Down Expand Up @@ -1544,30 +1532,30 @@ QGraphicsLineItem* QgsComposition::nearestSnapLine( bool horizontal, double x, d

if ( horizontal )
{
if ( qgsDoubleNear( currentYCoord, currentItem->transform().dy() + currentItem->rect().top(), itemTolerance ) )
if ( qgsDoubleNear( currentYCoord, currentItem->pos().y() + currentItem->rect().top(), itemTolerance ) )
{
snappedItems.append( qMakePair( currentItem, QgsComposerItem::UpperMiddle ) );
}
else if ( qgsDoubleNear( currentYCoord, currentItem->transform().dy() + currentItem->rect().center().y(), itemTolerance ) )
else if ( qgsDoubleNear( currentYCoord, currentItem->pos().y() + currentItem->rect().center().y(), itemTolerance ) )
{
snappedItems.append( qMakePair( currentItem, QgsComposerItem::Middle ) );
}
else if ( qgsDoubleNear( currentYCoord, currentItem->transform().dy() + currentItem->rect().bottom(), itemTolerance ) )
else if ( qgsDoubleNear( currentYCoord, currentItem->pos().y() + currentItem->rect().bottom(), itemTolerance ) )
{
snappedItems.append( qMakePair( currentItem, QgsComposerItem::LowerMiddle ) );
}
}
else
{
if ( qgsDoubleNear( currentXCoord, currentItem->transform().dx(), itemTolerance ) )
if ( qgsDoubleNear( currentXCoord, currentItem->pos().x(), itemTolerance ) )
{
snappedItems.append( qMakePair( currentItem, QgsComposerItem::MiddleLeft ) );
}
else if ( qgsDoubleNear( currentXCoord, currentItem->transform().dx() + currentItem->rect().center().x(), itemTolerance ) )
else if ( qgsDoubleNear( currentXCoord, currentItem->pos().x() + currentItem->rect().center().x(), itemTolerance ) )
{
snappedItems.append( qMakePair( currentItem, QgsComposerItem::Middle ) );
}
else if ( qgsDoubleNear( currentXCoord, currentItem->transform().dx() + currentItem->rect().width(), itemTolerance ) )
else if ( qgsDoubleNear( currentXCoord, currentItem->pos().x() + currentItem->rect().width(), itemTolerance ) )
{
snappedItems.append( qMakePair( currentItem, QgsComposerItem::MiddleRight ) );
}
Expand All @@ -1588,8 +1576,8 @@ int QgsComposition::boundingRectOfSelectedItems( QRectF& bRect )

//set the box to the first item
QgsComposerItem* currentItem = selectedItems.at( 0 );
double minX = currentItem->transform().dx();
double minY = currentItem->transform().dy();
double minX = currentItem->pos().x();
double minY = currentItem->pos().y();
double maxX = minX + currentItem->rect().width();
double maxY = minY + currentItem->rect().height();

Expand All @@ -1598,8 +1586,8 @@ int QgsComposition::boundingRectOfSelectedItems( QRectF& bRect )
for ( int i = 1; i < selectedItems.size(); ++i )
{
currentItem = selectedItems.at( i );
currentMinX = currentItem->transform().dx();
currentMinY = currentItem->transform().dy();
currentMinX = currentItem->pos().x();
currentMinY = currentItem->pos().y();
currentMaxX = currentMinX + currentItem->rect().width();
currentMaxY = currentMinY + currentItem->rect().height();

Expand Down Expand Up @@ -2200,7 +2188,7 @@ void QgsComposition::renderPage( QPainter* p, int page )
return;
}

QRectF paperRect = QRectF( paperItem->transform().dx(), paperItem->transform().dy(), paperItem->rect().width(), paperItem->rect().height() );
QRectF paperRect = QRectF( paperItem->pos().x(), paperItem->pos().y(), paperItem->rect().width(), paperItem->rect().height() );

QgsComposition::PlotStyle savedPlotStyle = mPlotStyle;
mPlotStyle = QgsComposition::Print;
Expand Down Expand Up @@ -2245,8 +2233,8 @@ void QgsComposition::computeWorldFileParameters( double& a, double& b, double& c
double YC = extent.center().y();

// get the extent for the page
double xmin = extent.xMinimum() - mWorldFileMap->transform().dx() * xr;
double ymax = extent.yMaximum() + mWorldFileMap->transform().dy() * yr;
double xmin = extent.xMinimum() - mWorldFileMap->pos().x() * xr;
double ymax = extent.yMaximum() + mWorldFileMap->pos().y() * yr;
QgsRectangle paperExtent( xmin, ymax - paperHeight() * yr, xmin + paperWidth() * xr, ymax );

double X0 = paperExtent.xMinimum();
Expand Down
2 changes: 1 addition & 1 deletion src/core/composer/qgsnumericscalebarstyle.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ QRectF QgsNumericScaleBarStyle::calculateBoxSize() const
double textWidth = mScaleBar->textWidthMillimeters( mScaleBar->font(), scaleText() );
double textHeight = mScaleBar->fontAscentMillimeters( mScaleBar->font() );

rect = QRectF( mScaleBar->transform().dx(), mScaleBar->transform().dy(), 2 * mScaleBar->boxContentSpace()
rect = QRectF( mScaleBar->pos().x(), mScaleBar->pos().y(), 2 * mScaleBar->boxContentSpace()
+ 2 * mScaleBar->pen().width() + textWidth,
textHeight + 2 * mScaleBar->boxContentSpace() );

Expand Down
4 changes: 2 additions & 2 deletions src/core/composer/qgspaperitem.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ void QgsPaperItem::setSceneRect( const QRectF& rectangle )
QgsComposerItem::setSceneRect( rectangle );
//update size and position of attached QgsPaperGrid to reflect new page size and position
mPageGrid->setRect( 0, 0, rect().width(), rect().height() );
mPageGrid->setPos( transform().dx(), transform().dy() );
mPageGrid->setPos( pos().x(), pos().y() );
}

void QgsPaperItem::initialize()
Expand All @@ -184,6 +184,6 @@ void QgsPaperItem::initialize()
setZValue( 0 );

//create a new QgsPaperGrid for this page, and add it to the composition
mPageGrid = new QgsPaperGrid( transform().dx(), transform().dy(), rect().width(), rect().height(), mComposition );
mPageGrid = new QgsPaperGrid( pos().x(), pos().y(), rect().width(), rect().height(), mComposition );
mComposition->addItem( mPageGrid );
}
2 changes: 1 addition & 1 deletion src/core/composer/qgsscalebarstyle.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,5 +130,5 @@ QRectF QgsScaleBarStyle::calculateBoxSize() const
double width = firstLabelLeft + totalBarLength + 2 * mScaleBar->pen().widthF() + largestLabelWidth + 2 * mScaleBar->boxContentSpace();
double height = mScaleBar->height() + mScaleBar->labelBarSpace() + 2 * mScaleBar->boxContentSpace() + mScaleBar->fontAscentMillimeters( mScaleBar->font() );

return QRectF( mScaleBar->transform().dx(), mScaleBar->transform().dy(), width, height );
return QRectF( mScaleBar->pos().x(), mScaleBar->pos().y(), width, height );
}
12 changes: 6 additions & 6 deletions src/gui/qgscomposerruler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,30 +229,30 @@ void QgsComposerRuler::setSnapLinePosition( const QPointF& pos )
{
if ( itemIt->second == QgsComposerItem::MiddleLeft )
{
itemIt->first->setItemPosition( transformedPt.x(), itemIt->first->transform().dy(), QgsComposerItem::UpperLeft );
itemIt->first->setItemPosition( transformedPt.x(), itemIt->first->pos().y(), QgsComposerItem::UpperLeft );
}
else if ( itemIt->second == QgsComposerItem::Middle )
{
itemIt->first->setItemPosition( transformedPt.x(), itemIt->first->transform().dy(), QgsComposerItem::UpperMiddle );
itemIt->first->setItemPosition( transformedPt.x(), itemIt->first->pos().y(), QgsComposerItem::UpperMiddle );
}
else
{
itemIt->first->setItemPosition( transformedPt.x(), itemIt->first->transform().dy(), QgsComposerItem::UpperRight );
itemIt->first->setItemPosition( transformedPt.x(), itemIt->first->pos().y(), QgsComposerItem::UpperRight );
}
}
else
{
if ( itemIt->second == QgsComposerItem::UpperMiddle )
{
itemIt->first->setItemPosition( itemIt->first->transform().dx(), transformedPt.y(), QgsComposerItem::UpperLeft );
itemIt->first->setItemPosition( itemIt->first->pos().x(), transformedPt.y(), QgsComposerItem::UpperLeft );
}
else if ( itemIt->second == QgsComposerItem::Middle )
{
itemIt->first->setItemPosition( itemIt->first->transform().dx(), transformedPt.y(), QgsComposerItem::MiddleLeft );
itemIt->first->setItemPosition( itemIt->first->pos().x(), transformedPt.y(), QgsComposerItem::MiddleLeft );
}
else
{
itemIt->first->setItemPosition( itemIt->first->transform().dx(), transformedPt.y(), QgsComposerItem::LowerLeft );
itemIt->first->setItemPosition( itemIt->first->pos().x(), transformedPt.y(), QgsComposerItem::LowerLeft );
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/plugins/georeferencer/qgsgeorefplugingui.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1604,7 +1604,7 @@ bool QgsGeorefPluginGui::writePDFReportFile( const QString& fileName, const QgsG
mapWidthMM = 70 / canvasExtent.height() * canvasExtent.width();
}

QgsComposerMap* composerMap = new QgsComposerMap( composition, leftMargin, titleLabel->rect().bottom() + titleLabel->transform().dy(), mapWidthMM, mapHeightMM );
QgsComposerMap* composerMap = new QgsComposerMap( composition, leftMargin, titleLabel->rect().bottom() + titleLabel->pos().y(), mapWidthMM, mapHeightMM );
composerMap->setLayerSet( canvasRenderer->layerSet() );
composerMap->setNewExtent( mCanvas->extent() );
composerMap->setMapCanvas( mCanvas );
Expand Down Expand Up @@ -1638,7 +1638,7 @@ bool QgsGeorefPluginGui::writePDFReportFile( const QString& fileName, const QgsG
parameterLabel->setText( parameterTitle );
parameterLabel->adjustSizeToText();
composition->addItem( parameterLabel );
parameterLabel->setSceneRect( QRectF( leftMargin, composerMap->rect().bottom() + composerMap->transform().dy() + 5, contentWidth, 8 ) );
parameterLabel->setSceneRect( QRectF( leftMargin, composerMap->rect().bottom() + composerMap->pos().y() + 5, contentWidth, 8 ) );
parameterLabel->setFrameEnabled( false );

//calculate mean error
Expand All @@ -1655,7 +1655,7 @@ bool QgsGeorefPluginGui::writePDFReportFile( const QString& fileName, const QgsG
row << QString::number( origin.x(), 'f', 3 ) << QString::number( origin.y(), 'f', 3 ) << QString::number( scaleX ) << QString::number( scaleY ) << QString::number( rotation * 180 / M_PI ) << QString::number( meanError );
parameterTable->addRow( row );
composition->addItem( parameterTable );
parameterTable->setSceneRect( QRectF( leftMargin, parameterLabel->rect().bottom() + parameterLabel->transform().dy() + 5, contentWidth, 20 ) );
parameterTable->setSceneRect( QRectF( leftMargin, parameterLabel->rect().bottom() + parameterLabel->pos().y() + 5, contentWidth, 20 ) );
parameterTable->setGridStrokeWidth( 0.1 );
parameterTable->adjustFrameToSize();
}
Expand All @@ -1670,13 +1670,13 @@ bool QgsGeorefPluginGui::writePDFReportFile( const QString& fileName, const QgsG
residualLabel->setFont( titleFont );
residualLabel->setText( tr( "Residuals" ) );
composition->addItem( residualLabel );
residualLabel->setSceneRect( QRectF( leftMargin, previousItem->rect().bottom() + previousItem->transform().dy() + 5, contentWidth, 6 ) );
residualLabel->setSceneRect( QRectF( leftMargin, previousItem->rect().bottom() + previousItem->pos().y() + 5, contentWidth, 6 ) );
residualLabel->setFrameEnabled( false );

//residual plot
QgsResidualPlotItem* resPlotItem = new QgsResidualPlotItem( composition );
composition->addItem( resPlotItem );
resPlotItem->setSceneRect( QRectF( leftMargin, residualLabel->rect().bottom() + residualLabel->transform().dy() + 5, contentWidth, composerMap->rect().height() ) );
resPlotItem->setSceneRect( QRectF( leftMargin, residualLabel->rect().bottom() + residualLabel->pos().y() + 5, contentWidth, composerMap->rect().height() ) );
resPlotItem->setExtent( composerMap->extent() );
resPlotItem->setGCPList( mPoints );

Expand Down Expand Up @@ -1713,7 +1713,7 @@ bool QgsGeorefPluginGui::writePDFReportFile( const QString& fileName, const QgsG

composition->addItem( gcpTable );

gcpTable->setSceneRect( QRectF( leftMargin, resPlotItem->rect().bottom() + resPlotItem->transform().dy() + 5, contentWidth, 100 ) );
gcpTable->setSceneRect( QRectF( leftMargin, resPlotItem->rect().bottom() + resPlotItem->pos().y() + 5, contentWidth, 100 ) );
gcpTable->setGridStrokeWidth( 0.1 );

printer.setResolution( composition->printResolution() );
Expand Down