Fixed non-emit of BasicGraphicsScene::nodeMoved.

BasicGraphicsScene::nodeMoved was not being emitted anywhere. Now it is
called each time the mouse is released from a node and the dragging
behaviour is stopped.

In the case that Q_EMIT is to be called directly within
BasicGraphicsScene::onNodePositionUpdated, the signal occurs on every
frame update which may be too often. As such, mouse release was chosen
for the emitter.

Signed-off-by: Finn Rayment <finn@rayment.fr>

Author: rayment

include/QtNodes/internal/BasicGraphicsScene.hpp

@@ -147,6 +147,8 @@ public Q_SLOTS:
 
     void onNodeUpdated(NodeId const nodeId);
 
+    void onNodeClicked(NodeId const nodeId);
+
     void onModelReset();
 
 private:
@@ -166,6 +168,8 @@ public Q_SLOTS:
 
     std::unique_ptr<AbstractNodePainter> _nodePainter;
 
+    bool _nodeDrag;
+
     QUndoStack *_undoStack;
 
     Qt::Orientation _orientation;

src/BasicGraphicsScene.cpp

@@ -36,6 +36,7 @@ BasicGraphicsScene::BasicGraphicsScene(AbstractGraphModel &graphModel, QObject *
     , _graphModel(graphModel)
     , _nodeGeometry(std::make_unique<DefaultHorizontalNodeGeometry>(_graphModel))
     , _nodePainter(std::make_unique<DefaultNodePainter>())
+    , _nodeDrag(false)
     , _undoStack(new QUndoStack(this))
     , _orientation(Qt::Horizontal)
 {
@@ -71,6 +72,8 @@ BasicGraphicsScene::BasicGraphicsScene(AbstractGraphModel &graphModel, QObject *
             this,
             &BasicGraphicsScene::onNodeUpdated);
 
+    connect(this, &BasicGraphicsScene::nodeClicked, this, &BasicGraphicsScene::onNodeClicked);
+
     connect(&_graphModel, &AbstractGraphModel::modelReset, this, &BasicGraphicsScene::onModelReset);
 
     traverseGraphAndPopulateGraphicsObjects();
@@ -257,6 +260,7 @@ void BasicGraphicsScene::onNodePositionUpdated(NodeId const nodeId)
     if (node) {
         node->setPos(_graphModel.nodeData(nodeId, NodeRole::Position).value<QPointF>());
         node->update();
+        _nodeDrag = true;
     }
 }
 
@@ -274,6 +278,13 @@ void BasicGraphicsScene::onNodeUpdated(NodeId const nodeId)
     }
 }
 
+void BasicGraphicsScene::onNodeClicked(NodeId const nodeId)
+{
+    if (_nodeDrag)
+        Q_EMIT nodeMoved(nodeId, _graphModel.nodeData(nodeId, NodeRole::Position).value<QPointF>());
+    _nodeDrag = false;
+}
+
 void BasicGraphicsScene::onModelReset()
 {
     _connectionGraphicsObjects.clear();

src/DataFlowGraphModel.cpp

@@ -15,9 +15,7 @@ DataFlowGraphModel::DataFlowGraphModel(std::shared_ptr<NodeDelegateModelRegistry
 std::unordered_set<NodeId> DataFlowGraphModel::allNodeIds() const
 {
     std::unordered_set<NodeId> nodeIds;
-    for_each(_models.begin(), _models.end(), [&nodeIds](auto const &p) {
-        nodeIds.insert(p.first);
-    });
+    for_each(_models.begin(), _models.end(), [&nodeIds](auto const &p) { nodeIds.insert(p.first); });
 
     return nodeIds;
 }

src/DefaultHorizontalNodeGeometry.cpp

@@ -52,8 +52,7 @@ void DefaultHorizontalNodeGeometry::recomputeSize(NodeId const nodeId) const
         width += w->width();
     }
 
-    width = std::max(width,
-                     static_cast<unsigned int>(capRect.width()) + 2 * _portSpasing);
+    width = std::max(width, static_cast<unsigned int>(capRect.width()) + 2 * _portSpasing);
 
     QSize size(width, height);
 

src/DefaultVerticalNodeGeometry.cpp

@@ -54,11 +54,13 @@ void DefaultVerticalNodeGeometry::recomputeSize(NodeId const nodeId) const
     unsigned int inPortWidth = maxPortsTextAdvance(nodeId, PortType::In);
     unsigned int outPortWidth = maxPortsTextAdvance(nodeId, PortType::Out);
 
-    unsigned int totalInPortsWidth =
-      nInPorts > 0 ? inPortWidth * nInPorts + _portSpasing * (nInPorts - 1) : 0;
+    unsigned int totalInPortsWidth = nInPorts > 0
+                                         ? inPortWidth * nInPorts + _portSpasing * (nInPorts - 1)
+                                         : 0;
 
-    unsigned int totalOutPortsWidth =
-      nOutPorts > 0 ? outPortWidth * nOutPorts + _portSpasing * (nOutPorts - 1) : 0;
+    unsigned int totalOutPortsWidth = nOutPorts > 0 ? outPortWidth * nOutPorts
+                                                          + _portSpasing * (nOutPorts - 1)
+                                                    : 0;
 
     unsigned int width = std::max(totalInPortsWidth, totalOutPortsWidth);