add node space bar

Author: ArnoChenFx

NodeGraphQt/base/graph.py

@@ -21,9 +21,21 @@
                          PIPE_LAYOUT_ANGLE,
                          IN_PORT, OUT_PORT)
 from ..widgets.viewer import NodeViewer
+from ..widgets.node_space_bar import node_space_bar
 
 
 class QWidgetDrops(QtWidgets.QWidget):
+    def __init__(self):
+        super(QWidgetDrops, self).__init__()
+        self.setAcceptDrops(True)
+        self.setWindowTitle("NodeGraphQt")
+        self.setStyleSheet('''
+        QWidget {
+            background-color: rgb(55,55,55);
+            color: rgb(200,200,200);
+            border-width: 0px;
+            }''')
+
     def dragEnterEvent(self, event):
         if event.mimeData().hasUrls:
             event.accept()
@@ -135,7 +147,7 @@ def __init__(self, parent=None):
         self._viewer.need_show_tab_search.connect(self._toggle_tab_search)
 
         self._wire_signals()
-        self.widget.setAcceptDrops(True)
+        self._node_space_bar = node_space_bar(self)
 
     def __repr__(self):
         return '<{} object at {}>'.format(self.__class__.__name__, hex(id(self)))
@@ -358,6 +370,7 @@ def widget(self):
 
             layout = QtWidgets.QVBoxLayout(self._widget)
             layout.setContentsMargins(0, 0, 0, 0)
+            layout.addWidget(self._node_space_bar)
             layout.addWidget(self._viewer)
         return self._widget
 
@@ -631,7 +644,12 @@ def fit_to_selection(self):
         Sets the zoom level to fit selected nodes.
         If no nodes are selected then all nodes in the graph will be framed.
         """
-        nodes = self.selected_nodes() or self.all_nodes()
+        if self._current_node_space is None:
+            all_nodes = self.all_nodes()
+        else:
+            all_nodes = self._current_node_space.children()
+
+        nodes = self.selected_nodes() or all_nodes
         if not nodes:
             return
         self._viewer.zoom_to_nodes([n.view for n in nodes])
@@ -720,7 +738,6 @@ def create_node(self, node_type, name=None, selected=True, color=None,
         NodeCls = self._node_factory.create_node_instance(node_type)
         if NodeCls:
             node = NodeCls()
-            node.set_graph(self)
             node.model._graph_model = self.model
 
             wid_types = node.model.__dict__.pop('_TEMP_property_widget_types')
@@ -737,6 +754,7 @@ def create_node(self, node_type, name=None, selected=True, color=None,
             node.NODE_NAME = self.get_unique_name(name or node.NODE_NAME)
             node.model.name = node.NODE_NAME
             node.model.selected = selected
+            node.set_graph(self)
 
             def format_color(clr):
                 if isinstance(clr, str):
@@ -758,7 +776,15 @@ def format_color(clr):
 
             undo_cmd = NodeAddedCmd(self, node, node.model.pos)
             undo_cmd.setText('create node: "{}"'.format(node.NODE_NAME))
-            self._undo_stack.push(undo_cmd)
+
+            if isinstance(node, SubGraph):
+                self.begin_undo('create sub graph node')
+                self._undo_stack.push(undo_cmd)
+                if node.get_property('create_from_select'):
+                    node.create_from_nodes(self.selected_nodes())
+                self.end_undo()
+            else:
+                self._undo_stack.push(undo_cmd)
             self.node_created.emit(node)
             return node
         raise Exception('\n\n>> Cannot find node:\t"{}"\n'.format(node_type))
@@ -798,14 +824,15 @@ def set_node_space(self, node):
         Args:
             node (NodeGraphQt.SubGraph): node object.
         """
+        if node is self._current_node_space:
+            return
         if self._current_node_space is not None:
-            [n.hide() for n in self._current_node_space.children()]
             self._current_node_space.exit()
 
         self._current_node_space = node
         if node is not None:
-            [n.show() for n in node.children()]
             node.enter()
+            self._node_space_bar.set_node(node)
 
     def get_node_space(self):
         """
@@ -826,9 +853,13 @@ 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))
-        if isinstance(node,SubGraph):
+        if isinstance(node, SubGraph):
+            self._undo_stack.beginMacro('delete sub graph')
             self.delete_nodes(node.children())
+            self._undo_stack.push(NodeRemovedCmd(self, node))
+            self._undo_stack.endMacro()
+        else:
+            self._undo_stack.push(NodeRemovedCmd(self, node))
 
     def delete_nodes(self, nodes):
         """
@@ -839,7 +870,7 @@ def delete_nodes(self, nodes):
         """
         self.nodes_deleted.emit([n.id for n in nodes])
         self._undo_stack.beginMacro('delete nodes')
-        [self.delete_nodes(n.children()) for n in nodes if isinstance(n,SubGraph)]
+        [self.delete_nodes(n.children()) for n in nodes if isinstance(n, SubGraph)]
         [self._undo_stack.push(NodeRemovedCmd(self, n)) for n in nodes]
         self._undo_stack.endMacro()
 
@@ -880,17 +911,18 @@ def select_all(self):
         Select all nodes in the node graph.
         """
         self._undo_stack.beginMacro('select all')
-        for node in self.all_nodes():
-            node.set_selected(True)
+        if self._current_node_space is not None:
+            [node.set_selected(True) for node in self._current_node_space.children()]
+        else:
+            [node.set_selected(True) for node in self.all_nodes()]
         self._undo_stack.endMacro()
 
     def clear_selection(self):
         """
         Clears the selection in the node graph.
         """
         self._undo_stack.beginMacro('clear selection')
-        for node in self.all_nodes():
-            node.set_selected(False)
+        [node.set_selected(False) for node in self.all_nodes()]
         self._undo_stack.endMacro()
 
     def get_node_by_id(self, node_id=None):
@@ -905,6 +937,41 @@ def get_node_by_id(self, node_id=None):
         """
         return self._model.nodes.get(node_id, None)
 
+    def get_node_by_path(self, node_path):
+        """
+        Returns the node from the node path string.
+
+        Args:
+            node_path (str): node path (:attr:`NodeObject.path()`)
+
+        Returns:
+            NodeGraphQt.NodeObject: node object.
+        """
+        names = [name for name in node_path.split("/") if name]
+        root = names.pop(0)
+        node = self._current_node_space
+        if node is None:
+            node = self.get_node_by_name(root)
+            if node is None:
+                return None
+        else:
+            while True:
+                parent_node = node.parent()
+                if parent_node is None:
+                    break
+                node = parent_node
+
+        for name in names:
+            find = False
+            for n in node.children():
+                if n.name() == name:
+                    node = n
+                    find = True
+                    continue
+            if not find:
+                return None
+        return node
+
     def get_node_by_name(self, name):
         """
         Returns node that matches the name.
@@ -914,9 +981,14 @@ def get_node_by_name(self, name):
         Returns:
             NodeGraphQt.NodeObject: node object.
         """
-        for node_id, node in self._model.nodes.items():
+        if self._current_node_space is not None:
+            nodes = self._current_node_space.children()
+        else:
+            nodes = self.all_nodes()
+        for node in nodes:
             if node.name() == name:
                 return node
+        return None
 
     def get_unique_name(self, name):
         """
@@ -929,7 +1001,10 @@ def get_unique_name(self, name):
             str: unique node name.
         """
         name = ' '.join(name.split())
-        node_names = [n.name() for n in self.all_nodes()]
+        if self._current_node_space is not None:
+            node_names = [n.name() for n in self._current_node_space.children()]
+        else:
+            node_names = [n.name() for n in self.all_nodes()]
         if name not in node_names:
             return name
 
@@ -1149,13 +1224,15 @@ def import_session(self, file_path):
             return
 
         self._deserialize(layout_data)
-        node_space_id = layout_data['graph']['node_space']
+
+        if 'graph' in layout_data.keys():
+            node_space_id = layout_data['graph']['node_space']
 
-        # deserialize graph data
-        self.set_node_space(self.get_node_by_id(node_space_id))
-        self._viewer.set_pipe_layout(layout_data['graph']['pipe_layout'])
+            # deserialize graph data
+            self.set_node_space(self.get_node_by_id(node_space_id))
+            self._viewer.set_pipe_layout(layout_data['graph']['pipe_layout'])
 
-        self._viewer.set_scene_rect(layout_data['graph']['graph_rect'])
+            self._viewer.set_scene_rect(layout_data['graph']['graph_rect'])
 
         self._undo_stack.clear()
         self._model.session = file_path

NodeGraphQt/base/node.py

@@ -467,9 +467,9 @@ def path(self):
             str: current node path.
         """
         if self.parent_id is None:
-            return "/"
+            return "/" + self.name()
 
-        return self.parent().path() + self.name() + "/"
+        return self.parent().path() + "/" + self.name()
 
     def delete(self):
         """

NodeGraphQt/widgets/node_space_bar.py

@@ -0,0 +1,57 @@
+from .. import QtWidgets, QtCore
+from . stylesheet import STYLE_SLASH_BUTTON, STYLE_NODE_BUTTON
+
+
+class node_space_bar(QtWidgets.QWidget):
+    def __init__(self, graph):
+        super(node_space_bar, self).__init__()
+        self.setMaximumHeight(20)
+        self.hbox = QtWidgets.QHBoxLayout(self)
+        self.hbox.setContentsMargins(0, 0, 0, 0)
+        self.hbox.setSpacing(0)
+        self.graph = graph
+        self.update()
+
+    def update(self):
+        self.set_node(self.graph.get_node_space())
+
+    def add_slash(self):
+        btn_slash = QtWidgets.QPushButton("/")
+        btn_slash.setFixedWidth(7)
+        btn_slash.setStyleSheet(STYLE_SLASH_BUTTON)
+        btn_slash.setFixedHeight(20)
+        self.hbox.addWidget(btn_slash, QtCore.Qt.AlignLeft)
+
+    def add_node(self, node):
+        node_name = node.name()
+        btn_node = QtWidgets.QPushButton(node_name)
+        btn_node.setFixedWidth(len(node_name)*8)
+        btn_node.setStyleSheet(STYLE_NODE_BUTTON)
+        btn_node.setFixedHeight(20)
+        btn_node.clicked.connect(lambda: self.graph.set_node_space(node))
+        self.hbox.addWidget(btn_node, QtCore.Qt.AlignLeft)
+
+    def clear(self):
+        while self.hbox.count():
+            child = self.hbox.takeAt(0)
+            if child.widget():
+                child.widget().deleteLater()
+
+    def set_node(self, node):
+        self.clear()
+        if node is None:
+            self.add_slash()
+            return
+        nodes = [node]
+        while True:
+            parent_node = node.parent()
+            if parent_node is None:
+                break
+            nodes.append(parent_node)
+            node = parent_node
+
+        for node in reversed(nodes):
+            self.add_slash()
+            self.add_node(node)
+
+        self.hbox.addStretch()

NodeGraphQt/widgets/stylesheet.py

@@ -220,4 +220,32 @@
     background-color: rgb(55, 55, 55);
     color: rgb(200 ,200, 200);
 }
-'''
+'''
+
+STYLE_SLASH_BUTTON = '''
+QPushButton {
+    border-radius: 0px;
+    border-width: 0px;
+    font-size:15px;
+    padding-left: 0px;
+    padding-right: 0px;
+    background-color:transparent;
+}
+'''
+STYLE_NODE_BUTTON = '''
+QPushButton {
+    border-radius: 0px;
+    border-width: 1px;
+    font-size:15px;
+    padding-left: 0px;
+    padding-right: 0px;
+    background-color: rgb(20,100,180);
+    }
+QPushButton::pressed {
+    border-style: inset;
+    border-color: rgb(100,100,100);
+    background-color: rgb(30,30,30);
+    }
+QPushButton::hover {
+    background-color: rgb(10,80,150);
+}'''

example_auto_nodes.py

@@ -56,6 +56,10 @@ def print_path(graph, node):
     print(node.path())
 
 
+def find_node(graph, node):
+    print(graph.get_node_by_path(node.path()))
+
+
 if __name__ == '__main__':
     app = QtWidgets.QApplication([])
 
@@ -100,8 +104,9 @@ def print_path(graph, node):
     node_menu.add_command('Cook Node', cook_node, node_class=AutoNode)
     node_menu.add_command('Toggle Auto Cook', toggle_auto_cook, node_class=AutoNode)
     node_menu.add_command('Print Path', print_path, node_class=AutoNode)
+    node_menu.add_command('Find Node', find_node, node_class=AutoNode)
 
-    graph.create_node('Utility.RootGraph')
+    graph.create_node('Utility.RootGraph', name='root', selected=False)
     mathNodeA = graph.create_node('Module.MathModuleNode',
                                   name='Math Functions A',
                                   color='#0a1e20',