solve conflicts

Author: g-abilio

examples/calculator/MathOperationDataModel.cpp

@@ -1,5 +1,4 @@
 #include "MathOperationDataModel.hpp"
-
 #include "DecimalData.hpp"
 
 unsigned int MathOperationDataModel::nPorts(PortType portType) const

examples/styles/models.hpp

@@ -36,6 +36,8 @@ class MyDataModel : public NodeDelegateModel
 
     QString name() const override { return QString("MyDataModel"); }
 
+    bool labelEditable() const override { return true; }
+
 public:
     QJsonObject save() const override
     {

include/QtNodes/internal/AbstractNodeGeometry.hpp

@@ -36,8 +36,7 @@ class NODE_EDITOR_PUBLIC AbstractNodeGeometry
     /// Port position in node's coordinate system.
     virtual QPointF portPosition(NodeId const nodeId,
                                  PortType const portType,
-                                 PortIndex const index) const
-        = 0;
+                                 PortIndex const index) const = 0;
 
     /// A convenience function using the `portPosition` and a given transformation.
     virtual QPointF portScenePosition(NodeId const nodeId,
@@ -48,8 +47,7 @@ class NODE_EDITOR_PUBLIC AbstractNodeGeometry
     /// Defines where to draw port label. The point corresponds to a font baseline.
     virtual QPointF portTextPosition(NodeId const nodeId,
                                      PortType const portType,
-                                     PortIndex const portIndex) const
-        = 0;
+                                     PortIndex const portIndex) const = 0;
 
     /**
    * Defines where to start drawing the caption. The point corresponds to a font
@@ -60,6 +58,15 @@ class NODE_EDITOR_PUBLIC AbstractNodeGeometry
     /// Caption rect is needed for estimating the total node size.
     virtual QRectF captionRect(NodeId const nodeId) const = 0;
 
+    /**
+   * Defines where to start drawing the label. The point corresponds to a font
+   * baseline.
+   */
+    virtual QPointF labelPosition(NodeId const nodeId) const = 0;
+
+    /// Caption rect is needed for estimating the total node size.
+    virtual QRectF labelRect(NodeId const nodeId) const = 0;
+
     /// Position for an embedded widget. Return any value if you don't embed.
     virtual QPointF widgetPosition(NodeId const nodeId) const = 0;
 
@@ -69,6 +76,8 @@ class NODE_EDITOR_PUBLIC AbstractNodeGeometry
 
     virtual QRect resizeHandleRect(NodeId const nodeId) const = 0;
 
+    virtual int getPortSpacing() = 0;
+
 protected:
     AbstractGraphModel &_graphModel;
 };

include/QtNodes/internal/BasicGraphicsScene.hpp

@@ -7,9 +7,10 @@
 #include "Export.hpp"
 #include "GroupGraphicsObject.hpp"
 #include "NodeGroup.hpp"
+#include "QUuidStdHash.hpp"
 #include "UndoCommands.hpp"
-
 #include <QtCore/QJsonObject>
+#include <QtCore/QUuid>
 #include <QtWidgets/QGraphicsScene>
 #include <QtWidgets/QMenu>
 
@@ -34,7 +35,7 @@ class NodeGroup;
 class GroupGraphicsObject;
 struct ConnectionId;
 
-/// An instance of QGraphicsScene, holds connections and nodes.
+/// An instance of QGraphicsScene , holds connections and nodes.
 class NODE_EDITOR_PUBLIC BasicGraphicsScene : public QGraphicsScene
 {
     Q_OBJECT
@@ -205,6 +206,12 @@ class NODE_EDITOR_PUBLIC BasicGraphicsScene : public QGraphicsScene
      */
     virtual QMenu *createSceneMenu(QPointF const scenePos);
 
+    /**
+     * @brief Freezes and unfreezes the model and connections of the selected nodes.
+     * @param isFreeze reference for freezing or unfreezing the model and connections of the selected nodes.
+     */
+    void freezeModelAndConnections(bool isFreeze);
+
     /**
      * @brief Creates the default menu when a node is selected.
      */

include/QtNodes/internal/ConnectionState.hpp

@@ -25,6 +25,7 @@ class NODE_EDITOR_PUBLIC ConnectionState
     ConnectionState(ConnectionGraphicsObject &cgo)
         : _cgo(cgo)
         , _hovered(false)
+        , _frozen(false)
     {}
 
     ConnectionState(ConnectionState const &) = delete;
@@ -42,6 +43,9 @@ class NODE_EDITOR_PUBLIC ConnectionState
     bool hovered() const;
     void setHovered(bool hovered);
 
+    bool frozen() const { return _frozen; }
+    void setFrozen(bool frozen) { _frozen = frozen; }
+
 public:
     /// Caches NodeId for further interaction.
     void setLastHoveredNode(NodeId const nodeId);
@@ -56,5 +60,7 @@ class NODE_EDITOR_PUBLIC ConnectionState
     bool _hovered;
 
     NodeId _lastHoveredNode{InvalidNodeId};
+
+    bool _frozen;
 };
 } // namespace QtNodes

include/QtNodes/internal/DataFlowGraphModel.hpp

@@ -11,6 +11,8 @@
 #include <QJsonObject>
 
 #include <memory>
+#include <unordered_map>
+#include <QString>
 
 namespace QtNodes {
 
@@ -137,6 +139,9 @@ private Q_SLOTS:
     std::unordered_set<ConnectionId> _connectivity;
 
     mutable std::unordered_map<NodeId, NodeGeometryData> _nodeGeometryData;
+
+    std::unordered_map<NodeId, QString> _labels;
+    std::unordered_map<NodeId, bool> _labelsVisible;
 };
 
 } // namespace QtNodes

include/QtNodes/internal/DataFlowGraphicsScene.hpp

@@ -1,8 +1,10 @@
 #pragma once
 
 #include "BasicGraphicsScene.hpp"
+#include "ConnectionGraphicsObject.hpp"
 #include "DataFlowGraphModel.hpp"
 #include "Export.hpp"
+#include "NodeConnectionInteraction.hpp"
 
 namespace QtNodes {
 
@@ -22,6 +24,7 @@ class NODE_EDITOR_PUBLIC DataFlowGraphicsScene : public BasicGraphicsScene
 public:
     std::vector<NodeId> selectedNodes() const;
     QMenu *createSceneMenu(QPointF const scenePos) override;
+    void updateConnectionGraphics(const std::unordered_set<ConnectionId> &connections, bool state);
 
 public Q_SLOTS:
     bool save() const;

include/QtNodes/internal/DefaultHorizontalNodeGeometry.hpp

@@ -28,14 +28,21 @@ class NODE_EDITOR_PUBLIC DefaultHorizontalNodeGeometry : public AbstractNodeGeom
     QPointF portTextPosition(NodeId const nodeId,
                              PortType const portType,
                              PortIndex const PortIndex) const override;
+
     QPointF captionPosition(NodeId const nodeId) const override;
 
     QRectF captionRect(NodeId const nodeId) const override;
 
+    QPointF labelPosition(const NodeId nodeId) const override;
+
+    QRectF labelRect(NodeId const nodeId) const override;
+
     QPointF widgetPosition(NodeId const nodeId) const override;
 
     QRect resizeHandleRect(NodeId const nodeId) const override;
 
+    int getPortSpacing() override { return _portSpacing; }
+
 private:
     QRectF portTextRect(NodeId const nodeId,
                         PortType const portType,
@@ -52,7 +59,7 @@ class NODE_EDITOR_PUBLIC DefaultHorizontalNodeGeometry : public AbstractNodeGeom
     // constness of the Node.
 
     mutable unsigned int _portSize;
-    unsigned int _portSpasing;
+    unsigned int _portSpacing;
     mutable QFontMetrics _fontMetrics;
     mutable QFontMetrics _boldFontMetrics;
 };

include/QtNodes/internal/DefaultNodePainter.hpp

@@ -1,10 +1,9 @@
 #pragma once
 
-#include <QIcon>
-#include <QtGui/QPainter>
-
 #include "AbstractNodePainter.hpp"
 #include "Definitions.hpp"
+#include <QIcon>
+#include <QtGui/QPainter>
 
 namespace QtNodes {
 
@@ -28,6 +27,8 @@ class NODE_EDITOR_PUBLIC DefaultNodePainter : public AbstractNodePainter
 
     void drawNodeCaption(QPainter *painter, NodeGraphicsObject &ngo) const;
 
+    void drawNodeLabel(QPainter *painter, NodeGraphicsObject &ngo) const;
+
     void drawEntryLabels(QPainter *painter, NodeGraphicsObject &ngo) const;
 
     void drawResizeRect(QPainter *painter, NodeGraphicsObject &ngo) const;

include/QtNodes/internal/DefaultVerticalNodeGeometry.hpp

@@ -33,10 +33,16 @@ class NODE_EDITOR_PUBLIC DefaultVerticalNodeGeometry : public AbstractNodeGeomet
 
     QRectF captionRect(NodeId const nodeId) const override;
 
+    QPointF labelPosition(const NodeId nodeId) const override;
+
+    QRectF labelRect(NodeId const nodeId) const override;
+
     QPointF widgetPosition(NodeId const nodeId) const override;
 
     QRect resizeHandleRect(NodeId const nodeId) const override;
 
+    int getPortSpacing() override { return _portSpacing; }
+
 private:
     QRectF portTextRect(NodeId const nodeId,
                         PortType const portType,
@@ -54,7 +60,7 @@ class NODE_EDITOR_PUBLIC DefaultVerticalNodeGeometry : public AbstractNodeGeomet
     // constness of the Node.
 
     mutable unsigned int _portSize;
-    unsigned int _portSpasing;
+    unsigned int _portSpacing;
     mutable QFontMetrics _fontMetrics;
     mutable QFontMetrics _boldFontMetrics;
 };