solve conflicts

Author: g-abilio

CMakeLists.txt

@@ -165,6 +165,9 @@ target_compile_definitions(QtNodes
     QT_NO_KEYWORDS
 )
 
+if(MSVC)
+  string(REGEX REPLACE "/W[0-4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+endif()
 
 target_compile_options(QtNodes
   PRIVATE

README.rst

@@ -1,7 +1,8 @@
 QtNodes
 #######
 
-https://github.com/paceholder/nodeeditor/actions/workflows/cmake_build.yml/badge.svg
+.. image:: https://github.com/paceholder/nodeeditor/actions/workflows/cmake_build.yml/badge.svg
+   :target: https://github.com/paceholder/nodeeditor/actions/workflows/cmake_build.yml
 
 Introduction
 ============

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

include/QtNodes/internal/BasicGraphicsScene.hpp

@@ -125,6 +125,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

@@ -14,7 +14,9 @@
 
 namespace QtNodes {
 
-class NODE_EDITOR_PUBLIC DataFlowGraphModel : public AbstractGraphModel, public Serializable
+class NODE_EDITOR_PUBLIC DataFlowGraphModel
+    : public AbstractGraphModel
+    , public Serializable
 {
     Q_OBJECT
 
@@ -43,7 +45,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 +76,6 @@ class NODE_EDITOR_PUBLIC DataFlowGraphModel : public AbstractGraphModel, public
 
     void loadNode(QJsonObject const &nodeJson) override;
 
-
     // From Serializable
     QJsonObject save() const override;
 

include/QtNodes/internal/GraphicsView.hpp

@@ -58,6 +58,10 @@ public Q_SLOTS:
 
     virtual void onPasteObjects();
 
+    void zoomFitAll();
+
+    void zoomFitSelected();
+
 Q_SIGNALS:
     void scaleChanged(double scale);
 

src/AbstractGraphModel.cpp

@@ -40,7 +40,9 @@ void AbstractGraphModel::portsAboutToBeDeleted(NodeId const nodeId,
             // Erases the information about the port on one side;
             auto c = makeIncompleteConnectionId(connectionId, portType);
 
-            c = makeCompleteConnectionId(c, nodeId, portIndex - nRemovedPorts);
+            c = makeCompleteConnectionId(c,
+                                         nodeId,
+                                         portIndex - static_cast<QtNodes::PortIndex>(nRemovedPorts));
 
             _shiftedByDynamicPortsConnections.push_back(c);
 
@@ -84,7 +86,9 @@ void AbstractGraphModel::portsAboutToBeInserted(NodeId const nodeId,
             // Erases the information about the port on one side;
             auto c = makeIncompleteConnectionId(connectionId, portType);
 
-            c = makeCompleteConnectionId(c, nodeId, portIndex + nNewPorts);
+            c = makeCompleteConnectionId(c,
+                                         nodeId,
+                                         portIndex + static_cast<QtNodes::PortIndex>(nNewPorts));
 
             _shiftedByDynamicPortsConnections.push_back(c);
 

src/DataFlowGraphModel.cpp

@@ -268,7 +268,7 @@ QVariant DataFlowGraphModel::nodeData(NodeId nodeId, NodeRole role) const
         break;
 
     case NodeRole::Style: {
-        auto style = StyleCollection::nodeStyle();
+        auto style = _models.at(nodeId)->nodeStyle();
         result = style.toJson().toVariantMap();
     } break;
 

src/GraphicsView.cpp

@@ -444,3 +444,22 @@ QPointF GraphicsView::scenePastePosition()
 
     return mapToScene(origin);
 }
+
+void GraphicsView::zoomFitAll()
+{
+    fitInView(scene()->itemsBoundingRect(), Qt::KeepAspectRatio);
+}
+
+void GraphicsView::zoomFitSelected()
+{
+    if (scene()->selectedItems().count() > 0) {
+        QRectF unitedBoundingRect{};
+
+        for (QGraphicsItem *item : scene()->selectedItems()) {
+            unitedBoundingRect = unitedBoundingRect.united(
+                item->mapRectToScene(item->boundingRect()));
+        }
+
+        fitInView(unitedBoundingRect, Qt::KeepAspectRatio);
+    }
+}