update sub graph

Author: ArnoChenFx

NodeGraphQt/base/graph.py

@@ -171,13 +171,13 @@ def _insert_node(self, pipe, node_id, prev_node_pos):
         disconnected = [(pipe.input_port, pipe.output_port)]
         connected = []
 
-        if node.inputs():
+        if node.input_ports():
             connected.append(
-                (pipe.output_port, list(node.inputs().values())[0].view)
+                (pipe.output_port, node.input_ports()[0].view)
             )
-        if node.outputs():
+        if node.output_ports():
             connected.append(
-                (list(node.outputs().values())[0].view, pipe.input_port)
+                (node.output_ports()[0].view, pipe.input_port)
             )
 
         self._undo_stack.beginMacro('inserted node')
@@ -224,8 +224,8 @@ def _on_node_double_clicked(self, node_id):
         """
         node = self.get_node_by_id(node_id)
         self.node_double_clicked.emit(node)
-        if isinstance(node,SubGraph):
-            node.enter()
+        if isinstance(node, SubGraph):
+            self.set_node_space(node)
 
     def _on_node_selected(self, node_id):
         """
@@ -420,6 +420,7 @@ def set_background_color(self, r, g, b):
             b (int): blue value.
         """
         self.scene().background_color = (r, g, b)
+        self._viewer.force_update()
 
     def grid_color(self):
         """
@@ -440,6 +441,7 @@ def set_grid_color(self, r, g, b):
             b (int): blue value.
         """
         self.scene().grid_color = (r, g, b)
+        self._viewer.force_update()
 
     def display_grid(self, display=True):
         """
@@ -449,6 +451,7 @@ def display_grid(self, display=True):
             display: False to not draw the background grid.
         """
         self.scene().grid = display
+        self._viewer.force_update()
 
     def add_properties_bin(self, prop_bin):
         """
@@ -795,7 +798,14 @@ def set_node_space(self, node):
         Args:
             node (NodeGraphQt.SubGraph): node object.
         """
+        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()
 
     def get_node_space(self):
         """
@@ -1097,7 +1107,8 @@ def save_session(self, file_path):
         node_space = self.get_node_space()
         if node_space is not None:
             node_space = node_space.id
-        serliazed_data['graph'] = {'node_space':node_space,'pipe_layout':self._viewer.get_pipe_layout()}
+        serliazed_data['graph'] = {'node_space': node_space, 'pipe_layout': self._viewer.get_pipe_layout()}
+        serliazed_data['graph']['graph_rect'] = self._viewer.scene_rect()
         file_path = file_path.strip()
         with open(file_path, 'w') as file_out:
             json.dump(serliazed_data, file_out, indent=2, separators=(',', ':'))
@@ -1144,6 +1155,8 @@ def import_session(self, file_path):
         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._undo_stack.clear()
         self._model.session = file_path
         self.session_changed.emit(file_path)
@@ -1314,6 +1327,24 @@ def save_dialog(self, current_dir=None, ext=None):
 
     def use_opengl(self):
         """
-        use opengl to draw the graph
+        Use OpenGL to draw the graph.
         """
         self._viewer.use_opengl()
+
+    def graph_rect(self):
+        """
+        Get the graph viewer range.
+
+        Returns:
+            list: [x, y, width, height].
+        """
+        return self._viewer.scene_rect()
+
+    def set_graph_rect(self, rect):
+        """
+        Set the graph viewer range.
+
+        Args:
+            rect (list): [x, y, width, height].
+        """
+        self._viewer.set_scene_rect(rect)

NodeGraphQt/base/node.py

@@ -30,6 +30,7 @@ def __init__(self, f):
     def __get__(self, instance, owner):
         return self.f(owner)
 
+
 class NodeObject(object):
     """
     The ``NodeGraphQt.NodeObject`` class is the main base class that all
@@ -437,7 +438,7 @@ def set_parent(self, parent_node):
             parent = self.parent()
             if parent is not None:
                 parent.remove_child(self)
-        
+
         if parent_node is not None:
             self.model.parent_id = parent_node.id
             parent_node.add_child(self)
@@ -466,30 +467,33 @@ def path(self):
             str: current node path.
         """
         if self.parent_id is None:
-            return "/" + self.name()
+            return "/"
 
-        return self.parent().path() + "/" + self.name()
+        return self.parent().path() + self.name() + "/"
 
     def delete(self):
         """
         Delete node view.
         """
         self._view.delete()
-        if self.parent_id is not None:
-            self.parent().remove_child(self)
+        parent = self.parent()
+        if parent is not None:
+            parent.remove_child(self)
         # self.set_parent_id(None)
 
     def hide(self):
         """
         Hide node.
         """
-        self.set_property('visible', False)
+        self.view.visible = False
+        self.model.visible = False
 
     def show(self):
         """
         Show node.
         """
-        self.set_property('visible', True)
+        self.view.visible = True
+        self.model.visible = True
 
 
 class BaseNode(NodeObject):
@@ -538,20 +542,15 @@ def hide(self):
         """
         Hide node.
         """
-        self.set_property('visible', False)
-        [pipe.setVisible(False) for port in self._inputs+self._outputs for pipe in port.view.connected_pipes]
-
-        for port in self._inputs+self._outputs:
-            for pipe in port.view.connected_pipes:
-                print(pipe)
-                pipe.setVisible(False)
+        super(BaseNode, self).hide()
+        [pipe.hide() for port in self._inputs + self._outputs for pipe in port.view.connected_pipes]
 
     def show(self):
         """
         Show node.
         """
-        self.set_property('visible', True)
-        [pipe.setVisible(True) for port in self._inputs+self._outputs for pipe in port.view.connected_pipes]
+        super(BaseNode, self).show()
+        [pipe.show() for port in self._inputs + self._outputs for pipe in port.view.connected_pipes]
 
     def update_model(self):
         """
@@ -771,6 +770,7 @@ def add_input(self, name='input', multi_input=False, display_name=True,
             raise PortRegistrationError(
                 'port name "{}" already registered.'.format(name))
         view = self.view.add_input(name, multi_input, display_name)
+
         if color:
             view.color = color
             view.border_color = [min([255, max([0, i + 80])]) for i in color]

NodeGraphQt/base/utils.py

@@ -7,6 +7,7 @@
                          PIPE_LAYOUT_STRAIGHT,
                          PIPE_LAYOUT_ANGLE)
 
+
 def setup_context_menu(graph):
     """
     populate the specified graph's context menu with essential menus commands.
@@ -87,13 +88,14 @@ def setup_context_menu(graph):
 
     pipe_menu = edit_menu.add_menu('&Pipe')
     pipe_menu.add_command('Curved Pipe', _curved_pipe)
-    pipe_menu.add_command('Straght Pipe', _straght_pipe)
+    pipe_menu.add_command('Straght Pipe', _straight_pipe)
     pipe_menu.add_command('Angle Pipe', _angle_pipe)
 
     edit_menu.add_command('Toggle Disable Grid', _toggle_grid)
 
     edit_menu.add_separator()
 
+
 # --- menu command functions. ---
 
 
@@ -210,9 +212,11 @@ def _clear_undo(graph):
 def _copy_nodes(graph):
     graph.copy_nodes()
 
+
 def _cut_nodes(graph):
     graph.cut_nodes()
 
+
 def _paste_nodes(graph):
     graph.paste_nodes()
 
@@ -241,26 +245,33 @@ def _duplicate_nodes(graph):
 def _fit_to_selection(graph):
     graph.fit_to_selection()
 
+
 def _jump_in(graph):
     nodes = graph.selected_nodes()
     if nodes:
         node = nodes[0]
         if isinstance(node, SubGraph):
-            node.enter()
+            graph.set_node_space(node)
+
 
 def _jump_out(graph):
     node = graph.get_node_space()
     if node:
-        node.exit()
+        if node.parent() is not None:
+            graph.set_node_space(node.parent())
+
 
 def _curved_pipe(graph):
     graph.set_pipe_style(PIPE_LAYOUT_CURVED)
 
-def _straght_pipe(graph):
+
+def _straight_pipe(graph):
     graph.set_pipe_style(PIPE_LAYOUT_STRAIGHT)
 
+
 def _angle_pipe(graph):
     graph.set_pipe_style(PIPE_LAYOUT_ANGLE)
 
+
 def _toggle_grid(graph):
-    graph.display_grid(not graph.scene().grid)
+    graph.display_grid(not graph.scene().grid)

NodeGraphQt/qgraphics/node_abstract.py

@@ -144,7 +144,7 @@ def selected(self, selected=False):
 
     @property
     def visible(self):
-        return  self._properties['visible']
+        return self._properties['visible']
 
     @visible.setter
     def visible(self, visible=False):

NodeGraphQt/qgraphics/node_base.py

@@ -170,13 +170,10 @@ def paint(self, painter, option, widget):
             painter.setBrush(QtGui.QColor(*NODE_SEL_COLOR))
             painter.drawRoundedRect(rect, radius, radius)
 
-        label_rect = QtCore.QRectF(rect.left() + (radius / 2),
-                                   rect.top() + (radius / 2),
-                                   self._width - (radius / 1.25),
-                                   28)
+        label_rect = QtCore.QRectF(rect.left(), rect.top(), self._width, 28)
         path = QtGui.QPainterPath()
-        path.addRoundedRect(label_rect, radius / 1.5, radius / 1.5)
-        painter.setBrush(QtGui.QColor(0, 0, 0, 50))
+        path.addRoundedRect(label_rect, radius, radius)
+        painter.setBrush(QtGui.QColor(30, 30, 30, 200))
         painter.fillPath(path, painter.brush())
 
         border_width = 0.8
@@ -456,7 +453,6 @@ def draw_node(self):
         Draw the node item in the scene.
         """
         height = self._text_item.boundingRect().height()
-
         # setup initial base size.
         self._set_base_size(add_w=0.0, add_h=height)
         # set text color when node is initialized.

NodeGraphQt/qgraphics/pipe.py

@@ -248,7 +248,6 @@ def highlight(self):
     def highlighted(self):
         return self._highlight
 
-
     def reset(self):
         self._active = False
         self._highlight = False
@@ -400,4 +399,4 @@ def paint(self, painter, option, widget):
             scale = dist / 20.0
         transform.scale(scale, scale)
         painter.drawPolygon(transform.map(self._arrow))
-        painter.restore()
+        painter.restore()

NodeGraphQt/widgets/viewer.py

@@ -669,6 +669,8 @@ def establish_connection(self, start_port, end_port):
         pipe.draw_path(pipe.input_port, pipe.output_port)
         if start_port.node.selected or end_port.node.selected:
             pipe.highlight()
+        if not start_port.node.visible or not end_port.node.visible:
+            pipe.hide()
 
     def acyclic_check(self, start_port, end_port):
         """
@@ -884,6 +886,16 @@ def zoom_to_nodes(self, nodes):
         if self.get_zoom() > 0.1:
             self.reset_zoom(self._scene_range.center())
 
+    def force_update(self):
+        self._update_scene()
+
+    def scene_rect(self):
+        return [self._scene_range.x(), self._scene_range.y(), self._scene_range.width(), self._scene_range.height()]
+
+    def set_scene_rect(self, rect):
+        self._scene_range = QtCore.QRectF(*rect)
+        self._update_scene()
+
     def use_opengl(self):
         format = QtOpenGL.QGLFormat(QtOpenGL.QGL.SampleBuffers)
         format.setSamples(4)