adding and deleting nodes now works

6 files changed, 181 insertions, 27 deletions

diff --git a/tikzit/src/gui/nodeitem.cpp b/tikzit/src/gui/nodeitem.cpp
index 40b4de9..71226f3 100644
--- a/tikzit/src/gui/nodeitem.cpp
+++ b/tikzit/src/gui/nodeitem.cpp
@@ -41,9 +41,9 @@ QRectF NodeItem::labelRect() const {
     return rect;
 }
 
-void NodeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+void NodeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
 {
-    if (_node->style().isNone()) {
+    if (_node->style()->isNone()) {
         QColor c(180,180,200);
         painter->setPen(QPen(c));
         painter->setBrush(QBrush(c));
@@ -57,10 +57,10 @@ void NodeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
         painter->setBrush(Qt::NoBrush);
         painter->drawPath(shape());
     } else {
-        QPen pen(_node->style().strokeColor);
-        pen.setWidth(_node->style().strokeThickness);
+        QPen pen(_node->style()->strokeColor);
+        pen.setWidth(_node->style()->strokeThickness);
         painter->setPen(pen);
-        painter->setBrush(QBrush(_node->style().fillColor));
+        painter->setBrush(QBrush(_node->style()->fillColor));
         painter->drawPath(shape());
     }
 
diff --git a/tikzit/src/gui/nodeitem.h b/tikzit/src/gui/nodeitem.h
index d0f1e62..9a3edb0 100644
--- a/tikzit/src/gui/nodeitem.h
+++ b/tikzit/src/gui/nodeitem.h
@@ -18,7 +18,7 @@ public:
     NodeItem(Node *node);
     void readPos();
     void writePos();
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *);
     QVariant itemChange(GraphicsItemChange change, const QVariant &value);
     QPainterPath shape() const;
     QRectF boundingRect() const;
diff --git a/tikzit/src/gui/tikzscene.cpp b/tikzit/src/gui/tikzscene.cpp
index a900192..2d9b49f 100644
--- a/tikzit/src/gui/tikzscene.cpp
+++ b/tikzit/src/gui/tikzscene.cpp
@@ -17,7 +17,7 @@ TikzScene::TikzScene(TikzDocument *tikzDocument, QObject *parent) :
 TikzScene::~TikzScene() {
 }
 
-Graph *TikzScene::graph() const
+Graph *TikzScene::graph()
 {
     return _tikzDocument->graph();
 }
@@ -38,13 +38,13 @@ void TikzScene::graphReplaced()
 
     foreach (Edge *e, graph()->edges()) {
         EdgeItem *ei = new EdgeItem(e);
-        _edgeItems << ei;
+        _edgeItems.insert(e, ei);
         addItem(ei);
     }
 
     foreach (Node *n, graph()->nodes()) {
         NodeItem *ni = new NodeItem(n);
-        _nodeItems << ni;
+        _nodeItems.insert(n, ni);
         addItem(ni);
     }
 }
@@ -267,7 +267,14 @@ void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 
         break;
     case ToolPalette::VERTEX:
-        // TODO
+        {
+            int gridSize = GLOBAL_SCALE / 8;
+            QPointF gridPos(round(mousePos.x()/gridSize)*gridSize, round(mousePos.y()/gridSize)*gridSize);
+            Node *n = new Node();
+            n->setPoint(fromScreen(gridPos));
+            AddNodeCommand *cmd = new AddNodeCommand(this, n);
+            _tikzDocument->undoStack()->push(cmd);
+        }
         break;
     case ToolPalette::EDGE:
         break;
@@ -276,6 +283,44 @@ void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
     }
 }
 
+void TikzScene::keyReleaseEvent(QKeyEvent *event)
+{
+    if (event->key() == Qt::Key_Backspace || event->key() == Qt::Key_Delete) {
+        QSet<Node*> selNodes;
+        QSet<Edge*> selEdges;
+        getSelection(selNodes, selEdges);
+
+        QMap<int,Node*> deleteNodes;
+        QMap<int,Edge*> deleteEdges;
+
+        for (int i = 0; i < _tikzDocument->graph()->nodes().length(); ++i) {
+            Node *n = _tikzDocument->graph()->nodes()[i];
+            if (selNodes.contains(n)) deleteNodes.insert(i, n);
+        }
+
+        for (int i = 0; i < _tikzDocument->graph()->edges().length(); ++i) {
+            Edge *e = _tikzDocument->graph()->edges()[i];
+            if (selEdges.contains(e) ||
+                selNodes.contains(e->source()) ||
+                selNodes.contains(e->target())) deleteEdges.insert(i, e);
+        }
+
+        //qDebug() << "nodes:" << deleteNodes;
+        //qDebug() << "edges:" << deleteEdges;
+        DeleteCommand *cmd = new DeleteCommand(this, deleteNodes, deleteEdges, selEdges);
+        _tikzDocument->undoStack()->push(cmd);
+    }
+}
+
+void TikzScene::getSelection(QSet<Node *> &selNodes, QSet<Edge *> &selEdges)
+{
+    foreach (QGraphicsItem *gi, selectedItems()) {
+        if (NodeItem *ni = dynamic_cast<NodeItem*>(gi)) selNodes << ni->node();
+        if (EdgeItem *ei = dynamic_cast<EdgeItem*>(gi)) selEdges << ei->edge();
+    }
+}
+
+
 TikzDocument *TikzScene::tikzDocument() const
 {
     return _tikzDocument;
@@ -287,11 +332,6 @@ void TikzScene::setTikzDocument(TikzDocument *tikzDocument)
     graphReplaced();
 }
 
-QVector<EdgeItem *> TikzScene::edgeItems() const
-{
-    return _edgeItems;
-}
-
 void TikzScene::refreshAdjacentEdges(QList<Node*> nodes)
 {
     if (nodes.empty()) return;
@@ -303,7 +343,12 @@ void TikzScene::refreshAdjacentEdges(QList<Node*> nodes)
     }
 }
 
-QVector<NodeItem *> TikzScene::nodeItems() const
+QMap<Node*,NodeItem *> &TikzScene::nodeItems()
 {
     return _nodeItems;
 }
+
+QMap<Edge*,EdgeItem*> &TikzScene::edgeItems()
+{
+    return _edgeItems;
+}
diff --git a/tikzit/src/gui/tikzscene.h b/tikzit/src/gui/tikzscene.h
index db95d88..a9af34b 100644
--- a/tikzit/src/gui/tikzscene.h
+++ b/tikzit/src/gui/tikzscene.h
@@ -25,9 +25,9 @@ class TikzScene : public QGraphicsScene
 public:
     TikzScene(TikzDocument *tikzDocument, QObject *parent);
     ~TikzScene();
-    Graph *graph() const;
-    QVector<NodeItem *> nodeItems() const;
-    QVector<EdgeItem *> edgeItems() const;
+    Graph *graph();
+    QMap<Node*,NodeItem*> &nodeItems();
+    QMap<Edge*,EdgeItem*> &edgeItems();
     void refreshAdjacentEdges(QList<Node*> nodes);
 
     TikzDocument *tikzDocument() const;
@@ -35,14 +35,16 @@ public:
 
 public slots:
     void graphReplaced();
+
 protected:
-    void mousePressEvent(QGraphicsSceneMouseEvent *event);
-    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+    void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
+    void keyReleaseEvent(QKeyEvent *event) override;
 private:
     TikzDocument *_tikzDocument;
-    QVector<NodeItem*> _nodeItems;
-    QVector<EdgeItem*> _edgeItems;
+    QMap<Node*,NodeItem*> _nodeItems;
+    QMap<Edge*,EdgeItem*> _edgeItems;
     EdgeItem *_modifyEdgeItem;
     bool _firstControlPoint;
 
@@ -51,6 +53,8 @@ private:
     int _oldBend;
     int _oldInAngle;
     int _oldOutAngle;
+
+    void getSelection(QSet<Node*> &selNodes, QSet<Edge*> &selEdges);
 };
 
 #endif // TIKZSCENE_H
diff --git a/tikzit/src/gui/undocommands.cpp b/tikzit/src/gui/undocommands.cpp
index 54741c8..997bf75 100644
--- a/tikzit/src/gui/undocommands.cpp
+++ b/tikzit/src/gui/undocommands.cpp
@@ -1,4 +1,6 @@
 #include "undocommands.h"
+#include "nodeitem.h"
+#include "edgeitem.h"
 
 MoveCommand::MoveCommand(TikzScene *scene,
                          QMap<Node*, QPointF> oldNodePositions,
@@ -8,8 +10,7 @@ MoveCommand::MoveCommand(TikzScene *scene,
     _scene(scene),
     _oldNodePositions(oldNodePositions),
     _newNodePositions(newNodePositions)
-{
-}
+{}
 
 
 void MoveCommand::undo()
@@ -78,3 +79,77 @@ void EdgeBendCommand::redo()
         }
     }
 }
+
+DeleteCommand::DeleteCommand(TikzScene *scene,
+                             QMap<int, Node *> deleteNodes,
+                             QMap<int, Edge *> deleteEdges,
+                             QSet<Edge *> selEdges) :
+    _scene(scene), _deleteNodes(deleteNodes),
+    _deleteEdges(deleteEdges), _selEdges(selEdges)
+{}
+
+void DeleteCommand::undo()
+{
+    for (auto it = _deleteNodes.begin(); it != _deleteNodes.end(); ++it) {
+        Node *n = it.value();
+        _scene->graph()->addNode(n, it.key());
+        NodeItem *ni = new NodeItem(n);
+        _scene->nodeItems().insert(n, ni);
+        _scene->addItem(ni);
+        ni->setSelected(true);
+    }
+
+    for (auto it = _deleteEdges.begin(); it != _deleteEdges.end(); ++it) {
+        Edge *e = it.value();
+        _scene->graph()->addEdge(e, it.key());
+        EdgeItem *ei = new EdgeItem(e);
+        _scene->edgeItems().insert(e, ei);
+        _scene->addItem(ei);
+
+        if (_selEdges.contains(e)) ei->setSelected(true);
+    }
+}
+
+void DeleteCommand::redo()
+{
+    foreach (Edge *e, _deleteEdges.values()) {
+        EdgeItem *ei = _scene->edgeItems()[e];
+        _scene->edgeItems().remove(e);
+        _scene->removeItem(ei);
+        delete ei;
+
+        _scene->graph()->removeEdge(e);
+    }
+
+    foreach (Node *n, _deleteNodes.values()) {
+        NodeItem *ni = _scene->nodeItems()[n];
+        _scene->nodeItems().remove(n);
+        _scene->removeItem(ni);
+        delete ni;
+
+        _scene->graph()->removeNode(n);
+    }
+}
+
+AddNodeCommand::AddNodeCommand(TikzScene *scene, Node *node) :
+    _scene(scene), _node(node)
+{}
+
+void AddNodeCommand::undo()
+{
+    NodeItem *ni = _scene->nodeItems()[_node];
+    _scene->removeItem(ni);
+    _scene->nodeItems().remove(_node);
+    delete ni;
+
+    _scene->graph()->removeNode(_node);
+}
+
+void AddNodeCommand::redo()
+{
+    // TODO: get the current style
+    _scene->graph()->addNode(_node);
+    NodeItem *ni = new NodeItem(_node);
+    _scene->nodeItems().insert(_node, ni);
+    _scene->addItem(ni);
+}
diff --git a/tikzit/src/gui/undocommands.h b/tikzit/src/gui/undocommands.h
index bb6a8e9..c1b4910 100644
--- a/tikzit/src/gui/undocommands.h
+++ b/tikzit/src/gui/undocommands.h
@@ -1,5 +1,8 @@
 /**
-  * These classes store the data required to undo/redo a single UI action.
+  * All changes to a TikzDocument are done via subclasses of QUndoCommand. When a controller
+  * (e.g. TikzScene) gets input from the user to change the document, it will push one of
+  * these commands onto the TikzDocument's undo stack, which automatically calls the redo()
+  * method of the command.
   */
 
 #ifndef UNDOCOMMANDS_H
@@ -45,4 +48,31 @@ private:
     int _newOutAngle;
 };
 
+class DeleteCommand : public QUndoCommand
+{
+public:
+    explicit DeleteCommand(TikzScene *scene,
+                           QMap<int,Node*> deleteNodes,
+                           QMap<int,Edge*> deleteEdges,
+                           QSet<Edge*> selEdges);
+    void undo() override;
+    void redo() override;
+private:
+    TikzScene *_scene;
+    QMap<int,Node*> _deleteNodes;
+    QMap<int,Edge*> _deleteEdges;
+    QSet<Edge*> _selEdges;
+};
+
+class AddNodeCommand : public QUndoCommand
+{
+public:
+    explicit AddNodeCommand(TikzScene *scene, Node *node);
+    void undo() override;
+    void redo() override;
+private:
+    TikzScene *_scene;
+    Node *_node;
+};
+
 #endif // UNDOCOMMANDS_H