Simplify function that inserts Graphic Objects to View

Author: paceholder

src/BasicGraphicsScene.cpp

@@ -227,52 +227,32 @@ traverseGraphAndPopulateGraphicsObjects()
 {
   auto allNodeIds = _graphModel.allNodeIds();
 
-  std::vector<ConnectionId> connectionsToCreate;
-
-  while (!allNodeIds.empty())
+  // First create all the nodes.
+  for (NodeId const nodeId : allNodeIds)
   {
-    std::queue<NodeId> fifo;
-
-    auto firstId = *allNodeIds.begin();
-    allNodeIds.erase(firstId);
+    _nodeGraphicsObjects[nodeId] =
+      std::make_unique<NodeGraphicsObject>(*this, nodeId);
+  }
 
-    fifo.push(firstId);
+  // Then for each node check output connections and insert them.
+  for (NodeId const nodeId : allNodeIds)
+  {
+    unsigned int nOutPorts =
+      _graphModel.nodeData<PortCount>(nodeId, NodeRole::OutPortCount);
 
-    while (!fifo.empty())
+    for (PortIndex index = 0; index < nOutPorts; ++index)
     {
-      auto nodeId = fifo.front();
-      fifo.pop();
+      auto const& outConnectionIds =
+        _graphModel.connections(nodeId,
+                                PortType::Out,
+                                index);
 
-      _nodeGraphicsObjects[nodeId] =
-        std::make_unique<NodeGraphicsObject>(*this, nodeId);
-
-      unsigned int nOutPorts =
-        _graphModel.nodeData(nodeId, NodeRole::OutPortCount).toUInt();
-
-      for (PortIndex index = 0; index < nOutPorts; ++index)
+      for (auto cid : outConnectionIds)
       {
-        auto const& conns =
-          _graphModel.connections(nodeId,
-                                  PortType::Out,
-                                  index);
-
-        for (auto cn : conns)
-        {
-          fifo.push(cn.inNodeId);
-
-          allNodeIds.erase(cn.inNodeId);
-
-          connectionsToCreate.push_back(cn);
-        }
+        _connectionGraphicsObjects[cid] =
+          std::make_unique<ConnectionGraphicsObject>(*this, cid);
       }
-    } // while
-  }
-
-  for (auto const & connectionId : connectionsToCreate)
-  {
-    _connectionGraphicsObjects[connectionId] =
-      std::make_unique<ConnectionGraphicsObject>(*this,
-                                                 connectionId);
+    }
   }
 }