Make fictive scene bigger in all cases.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-12-04 10:04:43 +02:00
parent 019b3dc38b
commit 6d566c2715

View File

@ -194,11 +194,6 @@ void GraphicsViewZoom::FictiveSceneRect(QGraphicsScene *sc, QGraphicsView *view)
const QPointF b = view->mapToScene(view->viewport()->width(), view->viewport()->height()); const QPointF b = view->mapToScene(view->viewport()->width(), view->viewport()->height());
QRectF viewRect = QRectF( a, b ); QRectF viewRect = QRectF( a, b );
//Calculate scene rect
const QRectF sceneRect = sc->sceneRect();
if (not sceneRect.contains(viewRect))
{//Scene less than view
//Scale view //Scale view
QLineF topLeftRay(viewRect.center(), viewRect.topLeft()); QLineF topLeftRay(viewRect.center(), viewRect.topLeft());
topLeftRay.setLength(topLeftRay.length()*2); topLeftRay.setLength(topLeftRay.length()*2);
@ -208,12 +203,14 @@ void GraphicsViewZoom::FictiveSceneRect(QGraphicsScene *sc, QGraphicsView *view)
viewRect = QRectF(topLeftRay.p2(), bottomRightRay.p2()); viewRect = QRectF(topLeftRay.p2(), bottomRightRay.p2());
//Calculate scene rect
const QRectF sceneRect = sc->sceneRect();
//Unite two rects //Unite two rects
const QRectF newRect = sceneRect.united(viewRect); const QRectF newRect = sceneRect.united(viewRect);
sc->setSceneRect(newRect); sc->setSceneRect(newRect);
} }
}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
/** /**