kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-18 13:30:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Commit 5005 break the change made in commit 5003 : fix it

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5022 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2017-08-16 14:32:34 +00:00
parent 29748874fd
commit fbb07bf2b8
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sources/diagramview.cpp
View File

@@ -416,6 +416,7 @@ void DiagramView::zoom(const qreal zoom_factor)
} }
m_diagram->adjustSceneRect(); m_diagram->adjustSceneRect();
adjustGridToZoom(); adjustGridToZoom();
adjustSceneRect();
} }
/** /**
@@ -542,6 +543,7 @@ void DiagramView::mouseMoveEvent(QMouseEvent *e)
m_rubber_band_origin = e -> pos(); m_rubber_band_origin = e -> pos();
h -> setValue(h -> value() + pos.x()); h -> setValue(h -> value() + pos.x());
v -> setValue(v -> value() + pos.y()); v -> setValue(v -> value() + pos.y());
adjustSceneRect();
} }
else QGraphicsView::mouseMoveEvent(e); else QGraphicsView::mouseMoveEvent(e);
@@ -928,12 +930,21 @@ void DiagramView::removeRow() {
/** /**
* @brief DiagramView::adjustSceneRect * @brief DiagramView::adjustSceneRect
* Calcul and set the area of the scene visualized by this view * Calcul and set the area of the scene visualized by this view
* The area are diagram sceneRect * 2.
*/ */
void DiagramView::adjustSceneRect() void DiagramView::adjustSceneRect()
{ {
QRectF scene_rect = m_diagram->sceneRect(); QRectF scene_rect = m_diagram->sceneRect();
scene_rect.adjust(-Diagram::margin, -Diagram::margin, Diagram::margin, Diagram::margin); scene_rect.adjust(-Diagram::margin, -Diagram::margin, Diagram::margin, Diagram::margin);
QSettings settings;
if (settings.value("diagrameditor/zoom-out-beyond-of-folio", false).toBool())
{
//When zoom out beyong of folio is active,
//we always adjust the scene rect to be 1/3 bigger than the wiewport
QRectF vpbr = mapToScene(viewport()->rect()).boundingRect();
vpbr.adjust(0, 0, vpbr.width()/3, vpbr.height()/3);
scene_rect = scene_rect.united(vpbr);
}
setSceneRect(scene_rect); setSceneRect(scene_rect);
} }