Add functionality to add a node to an existing group.

Author: kovacsv

Sources/NodeEngine/NE_NodeGroupList.cpp

@@ -55,6 +55,10 @@ void NodeGroupList::DeleteGroup (const NodeGroupConstPtr& group)
 
 void NodeGroupList::AddNodeToGroup (const NodeGroupPtr& group, const NodeId& nodeId)
 {
+	NodeGroupConstPtr existingGroup = GetNodeGroup (nodeId);
+	if (existingGroup != nullptr && group == existingGroup) {
+		return;
+	}
 	RemoveNodeFromGroup (nodeId);
 	groupToNodes[group].Insert (nodeId);
 	nodeToGroup.insert ({ nodeId, group });

Sources/NodeUIEngine/NUIE_NodeMenuCommands.cpp

@@ -689,6 +689,35 @@ class RemoveNodesFromGroupMenuCommand : public SingleMenuCommand
 	NE::NodeCollection	relevantNodes;
 };
 
+class AddNodesToGroupMenuCommand : public SingleMenuCommand
+{
+public:
+	AddNodesToGroupMenuCommand (NodeUIManager& uiManager, const UINodeGroupPtr& uiNodeGroup, const NE::NodeCollection& relevantNodes) :
+		SingleMenuCommand (std::wstring (L"Add To Group \"") + uiNodeGroup->GetName () + std::wstring (L"\""), false),
+		uiManager (uiManager),
+		uiNodeGroup (uiNodeGroup),
+		relevantNodes (relevantNodes)
+	{
+
+	}
+
+	virtual ~AddNodesToGroupMenuCommand ()
+	{
+
+	}
+
+	virtual void Do () override
+	{
+		AddNodesToGroupCommand command (uiNodeGroup, relevantNodes);
+		uiManager.ExecuteCommand (command);
+	}
+
+private:
+	NodeUIManager&		uiManager;
+	UINodeGroupPtr		uiNodeGroup;
+	NE::NodeCollection	relevantNodes;
+};
+
 NE::NodeCollection GetNodesForCommand (const NodeUIManager& uiManager, const UINodePtr& uiNode)
 {
 	const NE::NodeCollection& selectedNodes = uiManager.GetSelectedNodes ();
@@ -720,10 +749,17 @@ MenuCommandStructure CreateNodeCommandStructure (NodeUIManager& uiManager, NodeU
 
 	GroupMenuCommandPtr groupingCommandGroup (new GroupMenuCommand (L"Grouping"));
 	groupingCommandGroup->AddChildCommand (MenuCommandPtr (new CreateGroupMenuCommand (uiManager, relevantNodes)));
+	
 	UINodeGroupConstPtr nodeGroup = uiManager.GetUINodeGroup (uiNode->GetId ());
 	if (nodeGroup != nullptr) {
 		groupingCommandGroup->AddChildCommand (MenuCommandPtr (new RemoveNodesFromGroupMenuCommand (uiManager, relevantNodes)));
 	}
+	
+	uiManager.EnumerateUINodeGroups ([&] (const UINodeGroupPtr& group) {
+		groupingCommandGroup->AddChildCommand (MenuCommandPtr (new AddNodesToGroupMenuCommand (uiManager, group, relevantNodes)));
+		return true;
+	});
+
 	commandStructureBuilder.RegisterCommand (groupingCommandGroup);
 
 	return commandStructureBuilder.GetCommandStructure ();

Sources/NodeUIEngine/NUIE_NodeUIManagerCommands.cpp

@@ -202,6 +202,19 @@ void DeleteGroupCommand::Do (NodeUIManager& uiManager)
 	uiManager.DeleteUINodeGroup (uiGroup);
 }
 
+AddNodesToGroupCommand::AddNodesToGroupCommand (const UINodeGroupPtr& uiGroup, const NE::NodeCollection& nodes) :
+	UndoableCommand (),
+	uiGroup (uiGroup),
+	nodes (nodes)
+{
+
+}
+
+void AddNodesToGroupCommand::Do (NodeUIManager& uiManager)
+{
+	uiManager.AddNodesToUIGroup (uiGroup, nodes);
+}
+
 RemoveNodesFromGroupCommand::RemoveNodesFromGroupCommand (const NE::NodeCollection& nodes) :
 	UndoableCommand (),
 	nodes (nodes)

Sources/NodeUIEngine/NUIE_NodeUIManagerCommands.hpp

@@ -151,6 +151,18 @@ class DeleteGroupCommand : public UndoableCommand
 	const UINodeGroupPtr& uiGroup;
 };
 
+class AddNodesToGroupCommand : public UndoableCommand
+{
+public:
+	AddNodesToGroupCommand (const UINodeGroupPtr& uiGroup, const NE::NodeCollection& nodes);
+
+	virtual void Do (NodeUIManager& uiManager) override;
+
+private:
+	const UINodeGroupPtr& uiGroup;
+	const NE::NodeCollection& nodes;
+};
+
 class RemoveNodesFromGroupCommand : public UndoableCommand
 {
 public: