From 8f3f804990387607b7e52b5550ebce52e36aa619 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sun, 19 Apr 2020 18:15:26 +0100 Subject: add path as background --- src/gui/mainmenu.cpp | 8 +++++++- src/gui/mainmenu.h | 1 + src/gui/mainmenu.ui | 9 ++++++++ src/gui/tikzscene.cpp | 57 ++++++++++++++++++++++++++++++++++++++++++--------- src/gui/tikzscene.h | 2 +- tex/logo.tikzstyles | 5 ++++- 6 files changed, 69 insertions(+), 13 deletions(-) diff --git a/src/gui/mainmenu.cpp b/src/gui/mainmenu.cpp index 092d8b4..efd453d 100644 --- a/src/gui/mainmenu.cpp +++ b/src/gui/mainmenu.cpp @@ -242,7 +242,13 @@ void MainMenu::on_actionMerge_Nodes_triggered() void MainMenu::on_actionMake_Path_triggered() { if (tikzit->activeWindow() != 0) - tikzit->activeWindow()->tikzScene()->makePath(); + tikzit->activeWindow()->tikzScene()->makePath(false); +} + +void MainMenu::on_actionMake_Path_as_Background_triggered() +{ + if (tikzit->activeWindow() != 0) + tikzit->activeWindow()->tikzScene()->makePath(true); } void MainMenu::on_actionSplit_Path_triggered() diff --git a/src/gui/mainmenu.h b/src/gui/mainmenu.h index 431e43a..d0d73e9 100644 --- a/src/gui/mainmenu.h +++ b/src/gui/mainmenu.h @@ -68,6 +68,7 @@ public slots: void on_actionReverse_Edge_Direction_triggered(); void on_actionMerge_Nodes_triggered(); void on_actionMake_Path_triggered(); + void on_actionMake_Path_as_Background_triggered(); void on_actionSplit_Path_triggered(); // Tools diff --git a/src/gui/mainmenu.ui b/src/gui/mainmenu.ui index 2e390f9..11778db 100644 --- a/src/gui/mainmenu.ui +++ b/src/gui/mainmenu.ui @@ -64,6 +64,7 @@ + @@ -485,6 +486,14 @@ Ctrl+Shift+P + + + Make Path as Background + + + Ctrl+B + + diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index 9da8639..33e4710 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -314,11 +314,14 @@ void TikzScene::reverseSelectedEdges() _tikzDocument->undoStack()->push(cmd); } -void TikzScene::makePath() +void TikzScene::makePath(bool duplicateEdges) { QSet selNodes; + QSet selEdges; QSet edges; - getSelection(selNodes, edges); + getSelection(selNodes, selEdges); + + edges = selEdges; // if no edges are selected, try to infer edges from nodes if (edges.isEmpty()) { @@ -334,13 +337,29 @@ void TikzScene::makePath() } foreach (Edge *e, edges) { - if (e->path() != nullptr) { + if (e->path() != nullptr && !duplicateEdges) { //QMessageBox::warning(nullptr, "Error", "Edges must not already be in another path."); // TODO: maybe we want to automatically split paths if edges are in a path already? return; } } + _tikzDocument->undoStack()->beginMacro("Make Path"); + + QVector oldEdgeOrder = graph()->edges(); + QSet oldEdges, newEdges; + oldEdges = edges; + + if (duplicateEdges) { + foreach (Edge *e, edges) { + Edge *e1 = e->copy(); + _tikzDocument->undoStack()->push(new AddEdgeCommand(this, e1, false, selNodes, selEdges)); + newEdges << e1; + oldEdgeOrder << e1; + } + edges = newEdges; + } + // try to turn selected edges into one contiguous chain or cycle, recording // which edges need to be flipped. @@ -387,16 +406,33 @@ void TikzScene::makePath() return; } - //qDebug() << p; - //qDebug() << flip; + _tikzDocument->undoStack()->push(new ReverseEdgesCommand(this, flip)); + + // order all of the edges together, and in the case of + // duplicate edges, just below the first original. + QVector newEdgeOrder; + bool firstEdge = true; + foreach (Edge *e, oldEdgeOrder) { + if (oldEdges.contains(e)) { + if (firstEdge) { + newEdgeOrder += p; + firstEdge = false; + } + + if (duplicateEdges) newEdgeOrder << e; + } else if (!newEdges.contains(e)) { + newEdgeOrder << e; + } + } + + _tikzDocument->undoStack()->push(new ReorderCommand(this, + graph()->nodes(), graph()->nodes(), oldEdgeOrder, newEdgeOrder)); QMap oldEdgeData; foreach (Edge *e, p) { if (e != p.first()) oldEdgeData[e] = e->data()->copy(); } - _tikzDocument->undoStack()->beginMacro("Make Path"); - _tikzDocument->undoStack()->push(new ReverseEdgesCommand(this, flip)); _tikzDocument->undoStack()->push(new MakePathCommand(this, p, oldEdgeData)); _tikzDocument->undoStack()->endMacro(); } @@ -754,10 +790,11 @@ void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) nodeItems()[e->source()]->setSelected(sel); nodeItems()[e->target()]->setSelected(sel); } - } else { - nodeItems()[_selectingEdge->source()]->setSelected(sel); - nodeItems()[_selectingEdge->target()]->setSelected(sel); } +// else { +// nodeItems()[_selectingEdge->source()]->setSelected(sel); +// nodeItems()[_selectingEdge->target()]->setSelected(sel); +// } } if (_rubberBandItem->isVisible()) { diff --git a/src/gui/tikzscene.h b/src/gui/tikzscene.h index 3f035e2..e1d30d2 100644 --- a/src/gui/tikzscene.h +++ b/src/gui/tikzscene.h @@ -83,7 +83,7 @@ public: void reverseSelectedEdges(); - void makePath(); + void makePath(bool duplicateEdges); void splitPath(); void getSelection(QSet &selNodes, QSet &selEdges) const; diff --git a/tex/logo.tikzstyles b/tex/logo.tikzstyles index 3419ee3..1103b0b 100644 --- a/tex/logo.tikzstyles +++ b/tex/logo.tikzstyles @@ -4,9 +4,12 @@ % \tikzstyle{NAME}=[PROPERTY LIST] % Node styles -\tikzstyle{test}=[fill=none, draw=black, shape=circle] +\tikzstyle{white dot}=[fill=white, draw=black, shape=circle] % Edge styles \tikzstyle{bg}=[-, line width=0.5mm, fill={rgb,255: red,217; green,217; blue,217}] \tikzstyle{fg}=[-, fill=black] \tikzstyle{dir}=[->] +\tikzstyle{region A}=[-, draw=none, fill={rgb,255: red,255; green,160; blue,162}, opacity=0.8] +\tikzstyle{region B}=[-, draw=none, fill={rgb,255: red,190; green,185; blue,255}, opacity=0.8] +\tikzstyle{region C}=[-, fill={rgb,255: red,179; green,255; blue,192}, draw=none, opacity=0.8] -- cgit v1.2.3