[composer] Add method for overriding page break location in multi frame items (sponsored by City of Uster, Switzerland)

nyalldawson · nyalldawson · commit 4885289c46ab · 2014-04-28T21:20:39.000+10:00
diff --git a/src/core/composer/qgscomposermultiframe.cpp b/src/core/composer/qgscomposermultiframe.cpp
@@ -91,6 +91,7 @@ void QgsComposerMultiFrame::recalculateFrameSizes()
     }
     else
     {
+      currentHeight = findNearbyPageBreak( currentY + currentHeight ) - currentY;
       currentItem->setContentSection( QRectF( 0, currentY, currentItem->rect().width(), currentHeight ) );
     }
     currentItem->update();
@@ -103,7 +104,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 = qFloor( (currentItem->pos().y() + currentItem->rect().height()) / ( mComposition->paperHeight() + mComposition->spaceBetweenPages() ) ) + 1;
+      int page = qFloor(( currentItem->pos().y() + currentItem->rect().height() ) / ( mComposition->paperHeight() + mComposition->spaceBetweenPages() ) ) + 1;
 
       if ( mResizeMode == RepeatOnEveryPage )
       {
diff --git a/src/core/composer/qgscomposermultiframe.h b/src/core/composer/qgscomposermultiframe.h
@@ -48,6 +48,13 @@ class CORE_EXPORT QgsComposerMultiFrame: public QObject
 
     virtual void addFrame( QgsComposerFrame* frame, bool recalcFrameSizes = true ) = 0;
 
+    /**Finds the optimal position to break a frame at.
+     * @param yPos maximum vertical position for break
+     * @returns the optimal breakable position which occurs in the multi frame close
+     * to and before the specified yPos
+     * Note: added in version 2.3*/
+    virtual double findNearbyPageBreak( double yPos ) { return yPos; }
+
     void removeFrame( int i );
 
     void update();

Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,7 @@ void QgsComposerMultiFrame::recalculateFrameSizes()`
`91`	`91`	`}`
`92`	`92`	`else`
`93`	`93`	`{`
	`94`	`+ currentHeight = findNearbyPageBreak( currentY + currentHeight ) - currentY;`
`94`	`95`	`currentItem->setContentSection( QRectF( 0, currentY, currentItem->rect().width(), currentHeight ) );`
`95`	`96`	`}`
`96`	`97`	`currentItem->update();`
`@@ -103,7 +104,7 @@ void QgsComposerMultiFrame::recalculateFrameSizes()`
`103`	`104`	`while (( mResizeMode == RepeatOnEveryPage ) \|\| currentY < totalHeight )`
`104`	`105`	`{`
`105`	`106`	`//find out on which page the lower left point of the last frame is`
`106`		`- int page = qFloor( (currentItem->pos().y() + currentItem->rect().height()) / ( mComposition->paperHeight() + mComposition->spaceBetweenPages() ) ) + 1;`
	`107`	`+ int page = qFloor(( currentItem->pos().y() + currentItem->rect().height() ) / ( mComposition->paperHeight() + mComposition->spaceBetweenPages() ) ) + 1;`
`107`	`108`
`108`	`109`	`if ( mResizeMode == RepeatOnEveryPage )`
`109`	`110`	`{`