Expose Node and Connection classes (paceholder#97)

paceholder · paceholder · commit 276940926de4 · 2017-06-08T09:17:06.000+02:00
diff --git a/include/nodes/Connection b/include/nodes/Connection
@@ -0,0 +1 @@
+#include "../../src/Connection.hpp"
diff --git a/include/nodes/Node b/include/nodes/Node
@@ -0,0 +1 @@
+#include "../../src/Node.hpp"
diff --git a/src/Connection.hpp b/src/Connection.hpp
@@ -12,23 +12,11 @@
 #include "Serializable.hpp"
 #include "ConnectionState.hpp"
 #include "ConnectionGeometry.hpp"
+#include "QUuidStdHash.hpp"
+#include "Export.hpp"
 
 class QPointF;
 
-namespace std
-{
-template<>
-struct hash<QUuid>
-{
-  inline
-  std::size_t
-  operator()(QUuid const& uid) const
-  {
-    return qHash(uid);
-  }
-};
-}
-
 namespace QtNodes
 {
 
@@ -37,7 +25,7 @@ class NodeData;
 class ConnectionGraphicsObject;
 
 ///
-class Connection
+class NODE_EDITOR_PUBLIC Connection
   : public QObject
   , public Serializable
 {
diff --git a/src/DataModelRegistry.hpp b/src/DataModelRegistry.hpp
@@ -18,7 +18,7 @@ class NODE_EDITOR_PUBLIC DataModelRegistry
 {
 
 public:
-  
+
   using RegistryItemPtr             = std::unique_ptr<NodeDataModel>;
   using RegisteredModelsMap         = std::unordered_map<QString, RegistryItemPtr>;
   using RegisteredModelsCategoryMap = std::unordered_map<QString, QString>;
diff --git a/src/FlowScene.cpp b/src/FlowScene.cpp
@@ -22,6 +22,8 @@
 #include "NodeGraphicsObject.hpp"
 #include "ConnectionGraphicsObject.hpp"
 
+#include "Connection.hpp"
+
 #include "FlowItemInterface.hpp"
 #include "FlowView.hpp"
 #include "DataModelRegistry.hpp"
diff --git a/src/FlowScene.hpp b/src/FlowScene.hpp
@@ -8,7 +8,7 @@
 #include <memory>
 #include <functional>
 
-#include "Connection.hpp"
+#include "QUuidStdHash.hpp"
 #include "Export.hpp"
 #include "DataModelRegistry.hpp"
 
@@ -19,6 +19,7 @@ class NodeDataModel;
 class FlowItemInterface;
 class Node;
 class NodeGraphicsObject;
+class Connection;
 class ConnectionGraphicsObject;
 class NodeStyle;
 
@@ -36,113 +37,80 @@ class NODE_EDITOR_PUBLIC FlowScene
 
 public:
 
-  std::shared_ptr<Connection>
-  createConnection(PortType connectedPort,
-                   Node& node,
-                   PortIndex portIndex);
+  std::shared_ptr<Connection>createConnection(PortType connectedPort,
+                                              Node& node,
+                                              PortIndex portIndex);
 
-  std::shared_ptr<Connection>
-  createConnection(Node& nodeIn,
-                   PortIndex portIndexIn,
-                   Node& nodeOut,
-                   PortIndex portIndexOut);
+  std::shared_ptr<Connection>createConnection(Node& nodeIn,
+                                              PortIndex portIndexIn,
+                                              Node& nodeOut,
+                                              PortIndex portIndexOut);
 
-  std::shared_ptr<Connection>
-  restoreConnection(QJsonObject const &connectionJson);
+  std::shared_ptr<Connection>restoreConnection(QJsonObject const &connectionJson);
 
-  void
-  deleteConnection(Connection& connection);
+  void deleteConnection(Connection& connection);
 
-  Node&
-  createNode(std::unique_ptr<NodeDataModel> && dataModel);
+  Node&createNode(std::unique_ptr<NodeDataModel> && dataModel);
 
-  Node&
-  restoreNode(QJsonObject const& nodeJson);
+  Node&restoreNode(QJsonObject const& nodeJson);
 
-  void
-  removeNode(Node& node);
+  void removeNode(Node& node);
 
-  DataModelRegistry&
-  registry() const;
+  DataModelRegistry&registry() const;
 
-  void
-  setRegistry(std::shared_ptr<DataModelRegistry> registry);
+  void setRegistry(std::shared_ptr<DataModelRegistry> registry);
 
-  void
-  iterateOverNodes(std::function<void(Node*)> visitor);
+  void iterateOverNodes(std::function<void(Node*)> visitor);
 
-  void
-  iterateOverNodeData(std::function<void(NodeDataModel*)> visitor);
+  void iterateOverNodeData(std::function<void(NodeDataModel*)> visitor);
 
-  void
-  iterateOverNodeDataDependentOrder(std::function<void(NodeDataModel*)> visitor);
+  void iterateOverNodeDataDependentOrder(std::function<void(NodeDataModel*)> visitor);
 
-  QPointF
-  getNodePosition(const Node& node) const;
+  QPointF getNodePosition(const Node& node) const;
 
-  void
-  setNodePosition(Node& node, const QPointF& pos) const;
-  
-  QSizeF
-  getNodeSize(const Node& node) const;
+  void setNodePosition(Node& node, const QPointF& pos) const;
+
+  QSizeF getNodeSize(const Node& node) const;
 public:
 
-  std::unordered_map<QUuid, std::unique_ptr<Node> > const &
-  nodes() const;
+  std::unordered_map<QUuid, std::unique_ptr<Node> > const &nodes() const;
 
-  std::unordered_map<QUuid, std::shared_ptr<Connection> > const &
-  connections() const;
+  std::unordered_map<QUuid, std::shared_ptr<Connection> > const &connections() const;
 
-  std::vector<Node*>
-  selectedNodes() const;
+  std::vector<Node*>selectedNodes() const;
 
 public:
 
-  void
-  clearScene();
+  void clearScene();
 
-  void
-  save() const;
+  void save() const;
 
-  void
-  load();
+  void load();
 
-  QByteArray 
-  saveToMemory() const;
+  QByteArray saveToMemory() const;
 
-  void 
-  loadFromMemory(const QByteArray& data);
+  void loadFromMemory(const QByteArray& data);
 
-  signals:
+signals:
 
-  void
-  nodeCreated(Node &n);
+  void nodeCreated(Node &n);
 
-  void
-  nodeDeleted(Node &n);
+  void nodeDeleted(Node &n);
 
-  void
-  connectionCreated(Connection &c);
-  void
-  connectionDeleted(Connection &c);
+  void connectionCreated(Connection &c);
+  void connectionDeleted(Connection &c);
 
-  void
-  nodeMoved(Node& n, const QPointF& newLocation);
+  void nodeMoved(Node& n, const QPointF& newLocation);
 
-  void
-  nodeDoubleClicked(Node& n);
+  void nodeDoubleClicked(Node& n);
 
-  void
-  connectionHovered(Connection& c, QPoint screenPos);
+  void connectionHovered(Connection& c, QPoint screenPos);
 
-  void
-  nodeHovered(Node& n, QPoint screenPos);
+  void nodeHovered(Node& n, QPoint screenPos);
 
-  void
-  connectionHoverLeft(Connection& c);
+  void connectionHoverLeft(Connection& c);
 
-  void
-  nodeHoverLeft(Node& n);
+  void nodeHoverLeft(Node& n);
 
 private:
 
diff --git a/src/Node.hpp b/src/Node.hpp
@@ -25,7 +25,7 @@ class ConnectionState;
 class NodeGraphicsObject;
 class NodeDataModel;
 
-class Node
+class NODE_EDITOR_PUBLIC Node
   : public QObject
   , public Serializable
 {
diff --git a/src/QStringStdHash.hpp b/src/QStringStdHash.hpp
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <functional>
+
 #include <QtCore/QString>
 #include <QtCore/QVariant>
 
diff --git a/src/QUuidStdHash.hpp b/src/QUuidStdHash.hpp
@@ -0,0 +1,21 @@
+#pragma once
+
+#include <functional>
+
+#include <QtCore/QUuid>
+#include <QtCore/QVariant>
+
+namespace std
+{
+template<>
+struct hash<QUuid>
+{
+  inline
+  std::size_t
+  operator()(QUuid const& uid) const
+  {
+    return qHash(uid);
+  }
+};
+}
+

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class NODE_EDITOR_PUBLIC DataModelRegistry`
`18`	`18`	`{`
`19`	`19`
`20`	`20`	`public:`
`21`		`-`
	`21`	`+`
`22`	`22`	`using RegistryItemPtr = std::unique_ptr<NodeDataModel>;`
`23`	`23`	`using RegisteredModelsMap = std::unordered_map<QString, RegistryItemPtr>;`
`24`	`24`	`using RegisteredModelsCategoryMap = std::unordered_map<QString, QString>;`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class ConnectionState;`
`25`	`25`	`class NodeGraphicsObject;`
`26`	`26`	`class NodeDataModel;`
`27`	`27`
`28`		`-class Node`
	`28`	`+class NODE_EDITOR_PUBLIC Node`
`29`	`29`	`: public QObject`
`30`	`30`	`, public Serializable`
`31`	`31`	`{`