node creation emit signals from undo #373

Author: jchanvfx

NodeGraphQt/base/commands.py

@@ -165,30 +165,38 @@ class NodeAddedCmd(QtWidgets.QUndoCommand):
         graph (NodeGraphQt.NodeGraph): node graph.
         node (NodeGraphQt.NodeObject): node.
         pos (tuple(float, float)): initial node position (optional).
+        emit_signal (bool): emit node creation signals. (default: True)
     """
 
-    def __init__(self, graph, node, pos=None):
+    def __init__(self, graph, node, pos=None, emit_signal=True):
         QtWidgets.QUndoCommand.__init__(self)
         self.setText('added node')
-        self.viewer = graph.viewer()
-        self.model = graph.model
+        self.graph = graph
         self.node = node
         self.pos = pos
+        self.emit_signal = emit_signal
 
     def undo(self):
+        node_id = self.node.id
         self.pos = self.pos or self.node.pos()
-        self.model.nodes.pop(self.node.id)
+        self.graph.model.nodes.pop(self.node.id)
         self.node.view.delete()
 
+        if self.emit_signal:
+            self.graph.nodes_deleted.emit([node_id])
+
     def redo(self):
-        self.model.nodes[self.node.id] = self.node
-        self.viewer.add_node(self.node.view, self.pos)
+        self.graph.model.nodes[self.node.id] = self.node
+        self.graph.viewer().add_node(self.node.view, self.pos)
 
         # node width & height is calculated when it's added to the scene,
         # so we have to update the node model here.
         self.node.model.width = self.node.view.width
         self.node.model.height = self.node.view.height
 
+        if self.emit_signal:
+            self.graph.node_created.emit(self.node)
+
 
 class NodeRemovedCmd(QtWidgets.QUndoCommand):
     """

NodeGraphQt/base/graph.py

@@ -1255,7 +1255,9 @@ def format_color(clr):
 
             node.update()
 
-            undo_cmd = NodeAddedCmd(self, node, node.model.pos)
+            undo_cmd = NodeAddedCmd(
+                self, node, pos=node.model.pos, emit_signal=True
+            )
             if push_undo:
                 undo_label = 'create node: "{}"'.format(node.NODE_NAME)
                 self._undo_stack.beginMacro(undo_label)
@@ -1266,10 +1268,10 @@ def format_color(clr):
             else:
                 for n in self.selected_nodes():
                     n.set_property('selected', False, push_undo=False)
-                NodeAddedCmd(self, node, node.model.pos).redo()
+                undo_cmd.redo()
 
-            self.node_created.emit(node)
             return node
+
         raise NodeCreationError('Can\'t find node: "{}"'.format(node_type))
 
     def add_node(self, node, pos=None, selected=True, push_undo=True):
@@ -1341,14 +1343,15 @@ def add_node(self, node, pos=None, selected=True, push_undo=True):
         # update method must be called before it's been added to the viewer.
         node.update()
 
+        undo_cmd = NodeAddedCmd(self, node, pos=pos, emit_signal=False)
         if push_undo:
             self._undo_stack.beginMacro('add node: "{}"'.format(node.name()))
-            self._undo_stack.push(NodeAddedCmd(self, node, pos))
+            self._undo_stack.push(undo_cmd)
             if selected:
                 node.set_selected(True)
             self._undo_stack.endMacro()
         else:
-            NodeAddedCmd(self, node, pos).redo()
+            undo_cmd.redo()
 
     def delete_node(self, node, push_undo=True):
         """