fix bug node deleted signal.

Author: jchanvfx

NodeGraphQt/__init__.py

@@ -30,7 +30,7 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-__version__ = '0.0.3'
+__version__ = '0.0.4'
 __status__ = 'Work in Progress'
 __license__ = 'MIT'
 

NodeGraphQt/base/graph.py

@@ -23,11 +23,13 @@ class NodeGraph(QtCore.QObject):
     base node graph controller.
     """
 
-    #: signal for when a node has been created in the node graph.
+    #: signal triggered when a node has been created in the node graph.
     node_created = QtCore.Signal(NodeObject)
-    #: signal for when a node is selected.
+    #: signal triggered when nodes has been deleted in the node graph.
+    nodes_deleted = QtCore.Signal(list)
+    #: signal triggered when a node is selected.
     node_selected = QtCore.Signal(NodeObject)
-    #: signal for when a node is double clicked.
+    #: signal triggered when a node is double clicked.
     node_double_clicked = QtCore.Signal(NodeObject)
     #: signal for when a node has been connected.
     port_connected = QtCore.Signal(Port, Port)
@@ -527,6 +529,7 @@ def delete_node(self, node):
         """
         assert isinstance(node, NodeObject), \
             'node must be a instance of a NodeObject.'
+        self.nodes_deleted.emit([node.id])
         self._undo_stack.push(NodeRemovedCmd(self, node))
 
     def delete_nodes(self, nodes):
@@ -536,8 +539,9 @@ def delete_nodes(self, nodes):
         Args:
             nodes (list[NodeGraphQt.BaseNode]): list of node instances.
         """
+        self.nodes_deleted.emit([n.id for n in nodes])
         self._undo_stack.beginMacro('delete nodes')
-        [self.delete_node(n) for n in nodes]
+        [self._undo_stack.push(NodeRemovedCmd(self, n)) for n in nodes]
         self._undo_stack.endMacro()
 
     def all_nodes(self):

NodeGraphQt/widgets/properties_bin.py

@@ -91,6 +91,7 @@ def __init__(self, parent=None, node_graph=None):
         # wire up node graph.
         node_graph.add_properties_bin(self)
         node_graph.node_double_clicked.connect(self.add_node)
+        node_graph.nodes_deleted.connect(self.__on_nodes_deleted)
         node_graph.property_changed.connect(self.__on_graph_property_changed)
 
     def __repr__(self):
@@ -105,6 +106,15 @@ def __on_limit_changed(self, value):
         if rows > value:
             self._prop_list.removeRow(rows - 1)
 
+    def __on_nodes_deleted(self, nodes):
+        """
+        Slot function when a node has been deleted.
+
+        Args:
+            nodes (list[str]): list of node ids.
+        """
+        [self.__on_prop_close(n) for n in nodes]
+
     def __on_graph_property_changed(self, node, prop_name, prop_value):
         """
         Slot function that updates the property bin from the node graph signal.
@@ -187,9 +197,10 @@ def remove_node(self, node):
         Remove node from the properties bin.
 
         Args:
-            node (NodeGraphQt.BaseNode): node object.
+            node (str or NodeGraphQt.BaseNode): node id or node object.
         """
-        self.__on_prop_close(node.id)
+        node_id = node if isinstance(node, str) else node.id
+        self.__on_prop_close(node_id)
 
     def clear_bin(self):
         """
@@ -202,12 +213,13 @@ def prop_widget(self, node):
         Returns the node property widget.
 
         Args:
-            node (NodeGraphQt.NodeObject): node object.
+            node (str or NodeGraphQt.NodeObject): node id or node object.
 
         Returns:
             NodePropWidget: node property widget.
         """
-        itm_find = self._prop_list.findItems(node.id, QtCore.Qt.MatchExactly)
+        node_id = node if isinstance(node, str) else node.id
+        itm_find = self._prop_list.findItems(node_id, QtCore.Qt.MatchExactly)
         if itm_find:
             item = itm_find[0]
             return self._prop_list.cellWidget(item.row(), 0)