Adds zoom fit selected and zoom fit all functionalities.

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/AbstractGraphModel.hpp

@@ -1,16 +1,15 @@
 #pragma once
 
-#include "Export.hpp"
 #include "ConnectionIdHash.hpp"
 #include "Definitions.hpp"
+#include "Export.hpp"
 
 #include <QtCore/QJsonObject>
 #include <QtCore/QObject>
 #include <QtCore/QVariant>
 
 #include <unordered_set>
 
-
 namespace QtNodes {
 
 /**
@@ -51,8 +50,7 @@ class NODE_EDITOR_PUBLIC AbstractGraphModel : public QObject
      */
     virtual std::unordered_set<ConnectionId> connections(NodeId nodeId,
                                                          PortType portType,
-                                                         PortIndex index) const
-        = 0;
+                                                         PortIndex index) const = 0;
 
     /// Checks if two nodes with the given `connectionId` are connected.
     virtual bool connectionExists(ConnectionId const connectionId) const = 0;
@@ -132,8 +130,10 @@ class NODE_EDITOR_PUBLIC AbstractGraphModel : public QObject
      * @returns Port Data Type, Port Data, Connection Policy, Port
      * Caption.
      */
-    virtual QVariant portData(NodeId nodeId, PortType portType, PortIndex index, PortRole role) const
-        = 0;
+    virtual QVariant portData(NodeId nodeId,
+                              PortType portType,
+                              PortIndex index,
+                              PortRole role) const = 0;
 
     /**
      * A utility function that unwraps the `QVariant` value returned from the
@@ -188,6 +188,8 @@ class NODE_EDITOR_PUBLIC AbstractGraphModel : public QObject
 
     virtual bool loopsEnabled() const { return true; }
 
+    virtual bool nodeZoomFitMenu(NodeId) { return false; }
+
 public:
     /**
      * Function clears connections attached to the ports that are scheduled to be

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

@@ -17,7 +17,6 @@
 #include <tuple>
 #include <unordered_map>
 
-
 class QUndoStack;
 
 namespace QtNodes {
@@ -112,6 +111,8 @@ class NODE_EDITOR_PUBLIC BasicGraphicsScene : public QGraphicsScene
      */
     virtual QMenu *createSceneMenu(QPointF const scenePos);
 
+    QMenu *createZoomMenu(QPointF const scenePos);
+
 Q_SIGNALS:
     void modified(BasicGraphicsScene *);
     void nodeMoved(NodeId const nodeId, QPointF const &newLocation);
@@ -125,6 +126,9 @@ class NODE_EDITOR_PUBLIC BasicGraphicsScene : public QGraphicsScene
 
     /// Signal allows showing custom context menu upon clicking a node.
     void nodeContextMenu(NodeId const nodeId, QPointF const pos);
+    /// Signals to call Graphics View's zoomFit methods
+    void zoomFitAllClicked();
+    void zoomFitSelectedClicked();
 
 private:
     /**

include/QtNodes/internal/DataFlowGraphModel.hpp

@@ -11,10 +11,14 @@
 #include <QJsonObject>
 
 #include <memory>
+#include <unordered_map>
+#include <QString>
 
 namespace QtNodes {
 
-class NODE_EDITOR_PUBLIC DataFlowGraphModel : public AbstractGraphModel, public Serializable
+class NODE_EDITOR_PUBLIC DataFlowGraphModel
+    : public AbstractGraphModel
+    , public Serializable
 {
     Q_OBJECT
 
@@ -43,7 +47,6 @@ class NODE_EDITOR_PUBLIC DataFlowGraphModel : public AbstractGraphModel, public
 
     NodeId addNode(QString const nodeType) override;
 
-
     bool connectionPossible(ConnectionId const connectionId) const override;
 
     void addConnection(ConnectionId const connectionId) override;
@@ -75,7 +78,6 @@ class NODE_EDITOR_PUBLIC DataFlowGraphModel : public AbstractGraphModel, public
 
     void loadNode(QJsonObject const &nodeJson) override;
 
-
     // From Serializable
     QJsonObject save() const override;
 
@@ -101,6 +103,8 @@ class NODE_EDITOR_PUBLIC DataFlowGraphModel : public AbstractGraphModel, public
     /// Loops do not make any sense in uni-direction data propagation
     bool loopsEnabled() const override { return false; }
 
+    bool nodeZoomFitMenu(NodeId) override;
+
 Q_SIGNALS:
     void inPortDataWasSet(NodeId const, PortType const, PortIndex const);
 
@@ -137,6 +141,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/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

@@ -28,6 +28,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;
 };

include/QtNodes/internal/Definitions.hpp

@@ -18,23 +18,27 @@ NODE_EDITOR_PUBLIC Q_NAMESPACE
 Q_NAMESPACE_EXPORT(NODE_EDITOR_PUBLIC)
 #endif
 
-/**
+    /**
  * Constants used for fetching QVariant data from GraphModel.
  */
-enum class NodeRole {
-    Type = 0,             ///< Type of the current node, usually a string.
-    Position = 1,         ///< `QPointF` positon of the node on the scene.
-    Size = 2,             ///< `QSize` for resizable nodes.
-    CaptionVisible = 3,   ///< `bool` for caption visibility.
-    Caption = 4,          ///< `QString` for node caption.
-    Style = 5,            ///< Custom NodeStyle as QJsonDocument
-    InternalData = 6,     ///< Node-stecific user data as QJsonObject
-    InPortCount = 7,      ///< `unsigned int`
-    OutPortCount = 9,     ///< `unsigned int`
-    Widget = 10,          ///< Optional `QWidget*` or `nullptr`
-    ValidationState = 11, ///< Enum NodeValidationState of the node
-    ProcessingStatus = 12 ///< Enum NodeProcessingStatus of the node
-};
+    enum class NodeRole {
+        Type = 0,              ///< Type of the current node, usually a string.
+        Position = 1,          ///< `QPointF` positon of the node on the scene.
+        Size = 2,              ///< `QSize` for resizable nodes.
+        CaptionVisible = 3,    ///< `bool` for caption visibility.
+        Caption = 4,           ///< `QString` for node caption.
+        Style = 5,             ///< Custom NodeStyle as QJsonDocument
+        InternalData = 6,      ///< Node-stecific user data as QJsonObject
+        InPortCount = 7,       ///< `unsigned int`
+        OutPortCount = 9,      ///< `unsigned int`
+        Widget = 10,           ///< Optional `QWidget*` or `nullptr`
+        ValidationState = 11,  ///< Enum NodeValidationState of the node
+        LabelVisible = 12,     ///< `bool` for label visibility.
+        ProcessingStatus = 13, ///< Enum NodeProcessingStatus of the node
+        Label = 14,            ///< `QString` for node label.
+        LabelEditable = 15,    ///< `bool` to indicate label editing support.
+    };
+
 Q_ENUM_NS(NodeRole)
 
 /**

include/QtNodes/internal/GraphicsView.hpp

@@ -2,8 +2,11 @@
 
 #include <QtWidgets/QGraphicsView>
 
+#include "Definitions.hpp"
 #include "Export.hpp"
 
+class QLineEdit;
+
 namespace QtNodes {
 
 class BasicGraphicsScene;
@@ -58,6 +61,10 @@ public Q_SLOTS:
 
     virtual void onPasteObjects();
 
+    void zoomFitAll();
+
+    void zoomFitSelected();
+
 Q_SIGNALS:
     void scaleChanged(double scale);
 
@@ -93,5 +100,8 @@ public Q_SLOTS:
 
     QPointF _clickPos;
     ScaleRange _scaleRange;
+
+    QLineEdit *_labelEdit = nullptr;
+    NodeId _editingNodeId = InvalidNodeId;
 };
 } // namespace QtNodes

include/QtNodes/internal/NodeDelegateModel.hpp

@@ -4,14 +4,14 @@
 
 #include <QMetaType>
 #include <QPixmap>
-#include <QtGui/QColor>
 #include <QtWidgets/QWidget>
 
 #include "Definitions.hpp"
 #include "Export.hpp"
 #include "NodeData.hpp"
 #include "NodeStyle.hpp"
 #include "Serializable.hpp"
+#include <QtGui/QColor>
 
 namespace QtNodes {
 
@@ -83,6 +83,15 @@ class NODE_EDITOR_PUBLIC NodeDelegateModel
     /// Validation State will default to Valid, but you can manipulate it by overriding in an inherited class
     virtual NodeValidationState validationState() const { return _nodeValidationState; }
 
+    /// Nicknames can be assigned to nodes and shown in GUI
+    virtual QString label() const { return QString(); }
+
+    /// It is possible to hide the nickname in GUI
+    virtual bool labelVisible() const { return true; }
+
+    /// Controls whether the label can be edited or not
+    virtual bool labelEditable() const { return false; }
+
     /// Returns the curent processing status
     virtual NodeProcessingStatus processingStatus() const { return _processingStatus; }
 
@@ -132,6 +141,10 @@ class NODE_EDITOR_PUBLIC NodeDelegateModel
 
     virtual bool resizable() const { return false; }
 
+    bool zoomFitMenu() const { return _zoomFitMenu; }
+
+    void setZoomFitMenu(bool state) { _zoomFitMenu = state; }
+
 public Q_SLOTS:
     virtual void inputConnectionCreated(ConnectionId const &) {}
     virtual void inputConnectionDeleted(ConnectionId const &) {}
@@ -188,6 +201,8 @@ public Q_SLOTS:
     NodeValidationState _nodeValidationState;
 
     NodeProcessingStatus _processingStatus{NodeProcessingStatus::NoStatus};
+
+    bool _zoomFitMenu{false};
 };
 
 } // namespace QtNodes

include/QtNodes/internal/UndoCommands.hpp

@@ -3,9 +3,9 @@
 #include "Definitions.hpp"
 #include "Export.hpp"
 
+#include <QUndoCommand>
 #include <QtCore/QJsonObject>
 #include <QtCore/QPointF>
-#include <QUndoCommand>
 
 #include <unordered_set>