From 0002340da590611f635775d0555c66c7f22db09c Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 10 Jan 2019 18:12:48 +0100 Subject: infinite canvas (closes #20) --- src/gui/tikzscene.cpp | 26 +++++++++++++++++++++++++- src/gui/tikzscene.h | 1 + src/gui/tikzview.cpp | 2 +- src/gui/undocommands.cpp | 6 ++---- 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index 31d5bf6..7b090d8 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -41,7 +41,8 @@ TikzScene::TikzScene(TikzDocument *tikzDocument, ToolPalette *tools, _rubberBandItem = new QGraphicsRectItem(); _enabled = true; //setSceneRect(-310,-230,620,450); - setSceneRect(-1000,-1000,2000,2000); + //setSceneRect(-2000,-1500,4000,3000); + refreshSceneBounds(); QPen pen; pen.setColor(QColor::fromRgbF(0.5, 0.0, 0.5)); @@ -106,6 +107,7 @@ void TikzScene::graphReplaced() } refreshZIndices(); + refreshSceneBounds(); } void TikzScene::extendSelectionUp() @@ -870,6 +872,28 @@ void TikzScene::reloadStyles() } } +void TikzScene::refreshSceneBounds() { + qreal maxX = 30.0, maxY = 30.0; + qreal increment = 20.0; + + foreach (Node *n, graph()->nodes()) { + while (n->point().x() - increment < -maxX || n->point().x() + increment > maxX) { + maxX += increment; + } + + while (n->point().y() - increment < -maxY || n->point().y() + increment > maxY) { + maxY += increment; + } + } + + QRectF rect(-GLOBAL_SCALEF * maxX, -GLOBAL_SCALEF * maxY, 2.0 * GLOBAL_SCALEF * maxX, 2.0 * GLOBAL_SCALEF * maxY); + + if (rect != sceneRect()) { + setSceneRect(rect); + invalidate(); + } +} + // void TikzScene::refreshSceneBounds() // { // // if (!views().empty()) { diff --git a/src/gui/tikzscene.h b/src/gui/tikzscene.h index e8ea2c6..cc0a4a7 100644 --- a/src/gui/tikzscene.h +++ b/src/gui/tikzscene.h @@ -80,6 +80,7 @@ public: void getSelection(QSet &selNodes, QSet &selEdges); QSet getSelectedNodes(); + void refreshSceneBounds(); public slots: void graphReplaced(); diff --git a/src/gui/tikzview.cpp b/src/gui/tikzview.cpp index 5b0f09c..ddbc404 100644 --- a/src/gui/tikzview.cpp +++ b/src/gui/tikzview.cpp @@ -49,7 +49,7 @@ void TikzView::zoomOut() void TikzView::setScene(QGraphicsScene *scene) { QGraphicsView::setScene(scene); - centerOn(QPointF(0.0f,0.0f)); + centerOn(QPointF(0.0,0.0)); } void TikzView::drawBackground(QPainter *painter, const QRectF &rect) diff --git a/src/gui/undocommands.cpp b/src/gui/undocommands.cpp index 8a00536..82b9455 100644 --- a/src/gui/undocommands.cpp +++ b/src/gui/undocommands.cpp @@ -29,16 +29,14 @@ GraphUpdateCommand::GraphUpdateCommand(TikzScene *scene, QUndoCommand *parent) : void GraphUpdateCommand::undo() { _scene->tikzDocument()->refreshTikz(); - //refreshSceneBounds does nothing - //_scene->refreshSceneBounds(); + _scene->refreshSceneBounds(); _scene->invalidate(); } void GraphUpdateCommand::redo() { _scene->tikzDocument()->refreshTikz(); - //refreshSceneBounds does nothing - //_scene->refreshSceneBounds(); + _scene->refreshSceneBounds(); _scene->invalidate(); } -- cgit v1.2.3