sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

More resize mode fixes

Browse Source
This commit is contained in:
Marco Hugentobler 2012-08-19 11:04:30 +02:00
parent 5d1848311c
commit cb3a08e6ef
1 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/core/composer/qgscomposermultiframe.cpp
View File

@ -89,21 +89,29 @@ void QgsComposerMultiFrame::recalculateFrameSizes()
}
//at end of frames but there is still content left. Add other pages if ResizeMode ==
if ( mResizeMode == RepeatUntilFinished || mResizeMode == ExtendToNextPage )
if ( mResizeMode != UseExistingFrames )
{
while ( currentY < totalHeight )
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() );
//add new pages if necessary
if ( mComposition->numPages() < ( page + 2 ) )
if ( mResizeMode == RepeatOnEveryPage )
{
mComposition->setNumPages( page + 2 );
if ( page > mComposition->numPages() - 2 )
{
break;
}
}
else
{
if ( mComposition->numPages() < ( page + 2 ) )
{
mComposition->setNumPages( page + 2 );
}
}
double frameHeight = 0;
if ( mResizeMode == RepeatUntilFinished )
if ( mResizeMode == RepeatUntilFinished || mResizeMode == RepeatOnEveryPage )
{
frameHeight = currentItem->rect().height();
}
@ -111,10 +119,23 @@ void QgsComposerMultiFrame::recalculateFrameSizes()
{
frameHeight = ( currentY + mComposition->paperHeight() ) > totalHeight ? totalHeight - currentY : mComposition->paperHeight();
}
double newFrameY = ( page + 1 ) * ( mComposition->paperHeight() + mComposition->spaceBetweenPages() );
if ( mResizeMode == RepeatUntilFinished || mResizeMode == RepeatOnEveryPage )
{
newFrameY += currentItem->transform().dy() - page * ( mComposition->paperHeight() + mComposition->spaceBetweenPages() );
}
QgsComposerFrame* newFrame = new QgsComposerFrame( mComposition, this, currentItem->transform().dx(),
( mComposition->numPages() - 1 ) * ( mComposition->paperHeight() + mComposition->spaceBetweenPages() ),
newFrameY,
currentItem->rect().width(), frameHeight );
newFrame->setContentSection( QRectF( 0, currentY, newFrame->rect().width(), newFrame->rect().height() ) );
if ( mResizeMode == RepeatOnEveryPage )
{
newFrame->setContentSection( QRectF( 0, 0, newFrame->rect().width(), newFrame->rect().height() ) );
}
else
{
newFrame->setContentSection( QRectF( 0, currentY, newFrame->rect().width(), newFrame->rect().height() ) );
}
currentY += frameHeight;
currentItem = newFrame;
addFrame( newFrame, false );