[composer] Add method for overriding page break location in multi fra…

…me items (sponsored by City of Uster, Switzerland)
qgis · Apr 28, 2014 · 4885289 · 4885289
1 parent c37b848
commit 4885289
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
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();