continued groups

include/nodes/internal/FlowScene.hpp

@@ -67,6 +67,8 @@ class NODE_EDITOR_PUBLIC FlowScene
   void createGroup();
 
   Node&restoreNode(QJsonObject const& nodeJson);
+
+  Group& restoreGroup(QJsonObject const& nodeJson);
 
   QUuid pasteNode(QJsonObject &json, QPointF nodeGroupCentroid, QPointF mousePos);
 
@@ -89,6 +91,11 @@ class NODE_EDITOR_PUBLIC FlowScene
   void setNodePosition(Node& node, const QPointF& pos) const;
 
   QSizeF getNodeSize(const Node& node) const;
+
+  void resolveGroups(Group& node);
+
+  void resolveGroups(Node& n);
+
 public:
 
   std::unordered_map<QUuid, std::shared_ptr<Node> > const &nodes() const;
@@ -124,17 +131,26 @@ class NODE_EDITOR_PUBLIC FlowScene
 signals:
 
   void nodeCreated(Node &n);
+
+  void groupCreated(Group &g);
 
   void nodeDeleted(Node &n);
 
   void connectionCreated(Connection &c);
+
   void connectionDeleted(Connection &c);
 
   void nodeMoved(Node& n, const QPointF& newLocation);
+
+  void groupMoved(Group& n, const QPointF& newLocation);
 
   void nodeMoveFinished(Node& n, const QPointF& newLocation);
+
+  void groupMoveFinished(Group& g, const QPointF& newLocation);
 
   void nodeDoubleClicked(Node& n);
+
+  void groupDoubleClicked(Group& g);
 
   void connectionHovered(Connection& c, QPoint screenPos);
 
@@ -158,7 +174,7 @@ class NODE_EDITOR_PUBLIC FlowScene
   std::unordered_map<QUuid, SharedConnection> _connections;
   std::unordered_map<QUuid, UniqueNode>       _nodes;
   std::shared_ptr<DataModelRegistry>          _registry;
-  std::unordered_map<QUuid, std::unique_ptr<Group>> _groups;
+  std::unordered_map<QUuid, std::shared_ptr<Group>> _groups;
 
   int historyInx; 
   bool writeToHistory; 

include/nodes/internal/Group.hpp

@@ -14,52 +14,99 @@
 #include "NodeState.hpp"
 #include "NodeGeometry.hpp"
 #include "NodeData.hpp"
-#include "NodeGraphicsObject.hpp"
 #include "GroupGraphicsObject.hpp"
 #include "ConnectionGraphicsObject.hpp"
 #include "Serializable.hpp"
 #include "Node.hpp"
 namespace QtNodes
 {
 
+class GroupGraphicsObject;
+
 class NODE_EDITOR_PUBLIC Group
     : public QObject
     , public Serializable
 {
     Q_OBJECT
 public: 
+  GroupGraphicsObject &
+  groupGraphicsObject() {
+      return *_groupGraphicsObject.get();
+  }
+
+  GroupGraphicsObject const &
+  groupGraphicsObject() const {
+      return *_groupGraphicsObject.get();
+  }
 
   Group(FlowScene &scene): _scene(scene),
-                          _id(QUuid::createUuid())
-  {
-    _groupGraphicsObject = std::make_unique<GroupGraphicsObject>(scene);
-  }
+                          _id(QUuid::createUuid()),
+                          _groupGraphicsObject(nullptr),
+                          _name("New Group")
+  {  }
 
   void AddNode(std::shared_ptr<Node> node) {
     nodes.push_back(node);
   }
 
 
+  void
+  setGraphicsObject(std::shared_ptr<GroupGraphicsObject> graphics) {
+    // _groupGraphicsObject = std::move(graphics);
+    _groupGraphicsObject = graphics;
+  }
+
+
   virtual
   ~Group(){};
 
+  void SetName(QString _name);
+  QString GetName();
+
 public:
 
 
   QUuid
   id() const;
 
   QJsonObject save() const override{
-    QJsonObject object;
-    return object;
+    QJsonObject groupJson;
+    groupJson["name"] = _name;
+
+    QJsonObject posObj;
+    posObj["x"] = _groupGraphicsObject->pos().x();
+    posObj["y"] = _groupGraphicsObject->pos().y();
+    groupJson["position"] = posObj;    
+
+    QJsonObject colObj;
+    colObj["r"] = _groupGraphicsObject->r;
+    colObj["g"] = _groupGraphicsObject->g;
+    colObj["b"] = _groupGraphicsObject->b;
+    groupJson["color"] = colObj;    
+    return groupJson;
   };
 
-  void restore(QJsonObject const &json) override{};
+  void restore(QJsonObject const &json) override{
+    _id = QUuid(json["id"].toString());
+
+    QJsonObject positionJson = json["position"].toObject();
+    QPointF     point(positionJson["x"].toDouble(),
+                      positionJson["y"].toDouble());
+    _groupGraphicsObject->setPos(point);
+
+    QJsonObject colorJson = json["color"].toObject();
+    _groupGraphicsObject->r = colorJson["r"].toInt();
+    _groupGraphicsObject->g = colorJson["g"].toInt();
+    _groupGraphicsObject->b = colorJson["b"].toInt();
+
+    _name = json["name"].toString();
+  };
 
+  std::shared_ptr<GroupGraphicsObject> _groupGraphicsObject;
+  QString _name;
 private:
 
     FlowScene & _scene;
-    std::unique_ptr<GroupGraphicsObject> _groupGraphicsObject;
     std::vector<std::shared_ptr<Node>> nodes;
 
     QUuid _id;

include/nodes/internal/GroupGraphicsObject.hpp

@@ -15,6 +15,7 @@ namespace QtNodes
 
 class FlowScene;
 class FlowItemEntry;
+class Group;
 
 /// Class reacts on GUI events, mouse clicks and
 /// forwards painting operation.
@@ -23,17 +24,29 @@ class GroupGraphicsObject : public QGraphicsObject
   Q_OBJECT
 
 public:
-  GroupGraphicsObject(FlowScene &scene);
+  GroupGraphicsObject(FlowScene &scene, Group& group);
 
   virtual
   ~GroupGraphicsObject();
 
+  Group&
+  group();
+
+  Group const&
+  group() const;
+
+
   QRectF
   boundingRect() const override;
 
   void
   setGeometryChanged();
 
+  /// Visits all attached connections and corrects
+  /// their corresponding end points.
+  void
+  moveConnections() const;
+
   enum { Type = UserType + 1 };
 
   int
@@ -42,6 +55,7 @@ class GroupGraphicsObject : public QGraphicsObject
   void
   lock(bool locked);
 
+  uint8_t r, g, b;
 protected:
   void
   paint(QPainter*                       painter,
@@ -75,8 +89,16 @@ class GroupGraphicsObject : public QGraphicsObject
   void
   contextMenuEvent(QGraphicsSceneContextMenuEvent* event) override;
 
-
 private:
   FlowScene & _scene;
+  Group& _group;
+
+  bool isResizingX=false;
+  bool isResizingY=false;
+  bool isResizingXY=false;
+
+  int sizeX=1000;  
+  int sizeY=1000;  
+
 };
 }