Fix issue with objects removing

Author: paceholder

src/FlowScene.cpp

@@ -172,9 +172,8 @@ restoreNode(Properties const &p)
 
 void
 FlowScene::
-removeNode(NodeGraphicsObject* ngo)
+removeNode(std::shared_ptr<Node> node)
 {
-  std::shared_ptr<Node> const node = ngo->node().lock();
   nodeDeleted(*node);
 
   auto deleteConnections = [&node, this] (PortType portType)
@@ -198,9 +197,8 @@ removeNode(NodeGraphicsObject* ngo)
 
 void
 FlowScene::
-removeConnection(ConnectionGraphicsObject* cgo)
+removeConnection(std::shared_ptr<Connection> conn)
 {
-  std::shared_ptr<Connection> const conn = cgo->connection().lock();
   connectionDeleted(*conn);
 
   deleteConnection(conn);

src/FlowScene.hpp

@@ -36,13 +36,13 @@ class NODE_EDITOR_PUBLIC FlowScene
   createConnection(PortType connectedPort,
                    std::shared_ptr<Node> node,
                    PortIndex portIndex);
-  
+
   std::shared_ptr<Connection>
   createConnection(std::shared_ptr<Node> nodeIn,
                    PortIndex portIndexIn,
                    std::shared_ptr<Node> nodeOut,
                    PortIndex portIndexOut);
-  
+
   std::shared_ptr<Connection>
   restoreConnection(Properties const &p);
 
@@ -56,10 +56,10 @@ class NODE_EDITOR_PUBLIC FlowScene
   restoreNode(Properties const &p);
 
   void
-  removeNode(NodeGraphicsObject* item);
+  removeNode(std::shared_ptr<Node> node);
 
   void
-  removeConnection(ConnectionGraphicsObject* item);
+  removeConnection(std::shared_ptr<Connection> connection);
 
   DataModelRegistry&
   registry();
@@ -76,12 +76,16 @@ class NODE_EDITOR_PUBLIC FlowScene
   load();
 
 signals:
-  void nodeCreated(Node& n);
-  void nodeDeleted(Node& n);
-  
-  void connectionCreated(Connection& c);
-  void connectionDeleted(Connection& c);
-  
+  void
+  nodeCreated(Node& n);
+  void
+  nodeDeleted(Node& n);
+
+  void
+  connectionCreated(Connection& c);
+  void
+  connectionDeleted(Connection& c);
+
 private:
 
   using SharedConnection = std::shared_ptr<Connection>;

src/FlowView.cpp

@@ -25,7 +25,6 @@
 
 #include "StyleCollection.hpp"
 
-
 FlowView::
 FlowView(FlowScene *scene)
   : QGraphicsView(scene)
@@ -146,15 +145,27 @@ keyPressEvent(QKeyEvent *event)
       break;
 
     case Qt::Key_Delete:
+    {
+      std::vector<std::shared_ptr<Node>> nodesToDelete;
+      std::vector<std::shared_ptr<Connection>> connectionsToDelete;
       for (QGraphicsItem * item : _scene->selectedItems())
       {
         if (auto n = dynamic_cast<NodeGraphicsObject*>(item))
-          _scene->removeNode(n);
-        else if (auto n = dynamic_cast<ConnectionGraphicsObject*>(item))
-          _scene->removeConnection(n);
+          nodesToDelete.push_back(n->node().lock());
+
+        if (auto c = dynamic_cast<ConnectionGraphicsObject*>(item))
+          connectionsToDelete.push_back(c->connection().lock());
       }
 
-      break;
+      for( auto & n : nodesToDelete )
+        _scene->removeNode(n);
+
+      for( auto & c : connectionsToDelete )
+        _scene->removeConnection(c);
+
+    }
+
+    break;
 
     case Qt::Key_Shift:
       setDragMode(QGraphicsView::RubberBandDrag);
@@ -260,12 +271,3 @@ mouseMoveEvent(QMouseEvent* event)
 {
   QGraphicsView::mouseMoveEvent(event);
 }
-
-
-//void
-//FlowView::
-//setStyle(FlowViewStyle ns)
-//{
-  //flowViewStyle = ns;
-  //setBackgroundBrush(flowViewStyle.BackgroundColor);
-//}