emit node deletion signals from undo #373

Author: jchanvfx

NodeGraphQt/base/commands.py

@@ -198,29 +198,40 @@ def redo(self):
             self.graph.node_created.emit(self.node)
 
 
-class NodeRemovedCmd(QtWidgets.QUndoCommand):
+class NodesRemovedCmd(QtWidgets.QUndoCommand):
     """
     Node deleted command.
 
     Args:
         graph (NodeGraphQt.NodeGraph): node graph.
-        node (NodeGraphQt.BaseNode or NodeGraphQt.NodeObject): node.
+        nodes (list[NodeGraphQt.BaseNode or NodeGraphQt.NodeObject]): nodes.
+        emit_signal (bool): emit node deletion signals. (default: True)
     """
 
-    def __init__(self, graph, node):
+    def __init__(self, graph, nodes, emit_signal=True):
         QtWidgets.QUndoCommand.__init__(self)
-        self.setText('deleted node')
-        self.scene = graph.scene()
-        self.model = graph.model
-        self.node = node
+        self.setText('deleted node(s)')
+        self.graph = graph
+        self.nodes = nodes
+        self.emit_signal = emit_signal
 
     def undo(self):
-        self.model.nodes[self.node.id] = self.node
-        self.scene.addItem(self.node.view)
+        for node in self.nodes:
+            self.graph.model.nodes[node.id] = node
+            self.graph.scene().addItem(node.view)
+
+            if self.emit_signal:
+                self.graph.node_created.emit(node)
 
     def redo(self):
-        self.model.nodes.pop(self.node.id)
-        self.node.view.delete()
+        node_ids = []
+        for node in self.nodes:
+            node_ids.append(node.id)
+            self.graph.model.nodes.pop(node.id)
+            node.view.delete()
+
+        if self.emit_signal:
+            self.graph.nodes_deleted.emit(node_ids)
 
 
 class NodeInputConnectedCmd(QtWidgets.QUndoCommand):

NodeGraphQt/base/graph.py

@@ -8,7 +8,7 @@
 from Qt import QtCore, QtWidgets
 
 from NodeGraphQt.base.commands import (NodeAddedCmd,
-                                       NodeRemovedCmd,
+                                       NodesRemovedCmd,
                                        NodeMovedCmd,
                                        PortConnectedCmd)
 from NodeGraphQt.base.factory import NodeFactory
@@ -1385,13 +1385,12 @@ def delete_node(self, node, push_undo=True):
         if isinstance(node, GroupNode) and node.is_expanded:
             node.collapse()
 
+        undo_cmd = NodesRemovedCmd(self, [node], emit_signal=True)
         if push_undo:
-            self._undo_stack.push(NodeRemovedCmd(self, node))
+            self._undo_stack.push(undo_cmd)
             self._undo_stack.endMacro()
         else:
-            NodeRemovedCmd(self, node).redo()
-
-        self.nodes_deleted.emit([node_id])
+            undo_cmd.redo()
 
     def remove_node(self, node, push_undo=True):
         """
@@ -1428,11 +1427,12 @@ def remove_node(self, node, push_undo=True):
                                  push_undo=push_undo)
                 p.clear_connections(push_undo=push_undo)
 
+        undo_cmd = NodesRemovedCmd(self, [node], emit_signal=False)
         if push_undo:
-            self._undo_stack.push(NodeRemovedCmd(self, node))
+            self._undo_stack.push(undo_cmd)
             self._undo_stack.endMacro()
         else:
-            NodeRemovedCmd(self, node).redo()
+            undo_cmd.redo()
 
     def delete_nodes(self, nodes, push_undo=True):
         """
@@ -1471,12 +1471,14 @@ def delete_nodes(self, nodes, push_undo=True):
                                      connected_ports=False,
                                      push_undo=push_undo)
                     p.clear_connections(push_undo=push_undo)
-            if push_undo:
-                self._undo_stack.push(NodeRemovedCmd(self, node))
-            else:
-                NodeRemovedCmd(self, node).redo()
+
+        undo_cmd = NodesRemovedCmd(self, nodes, emit_signal=True)
         if push_undo:
+            self._undo_stack.push(undo_cmd)
             self._undo_stack.endMacro()
+        else:
+            undo_cmd.redo()
+
         self.nodes_deleted.emit(node_ids)
 
     def extract_nodes(self, nodes, push_undo=True, prompt_warning=True):