Auto layout support vertical layout.

Author: ArnoChenFx

NodeGraphQt/base/utils.py

@@ -4,7 +4,10 @@
 from .. import QtGui, QtCore
 from ..constants import (PIPE_LAYOUT_CURVED,
                          PIPE_LAYOUT_STRAIGHT,
-                         PIPE_LAYOUT_ANGLE)
+                         PIPE_LAYOUT_ANGLE,
+                         NODE_LAYOUT_VERTICAL,
+                         NODE_LAYOUT_HORIZONTAL,
+                         NODE_LAYOUT_DIRECTION)
 
 
 # menu
@@ -489,7 +492,7 @@ def __remove_BackdropNode(nodes):
     return nodes
 
 
-def topological_sort_by_down(start_nodes=[], all_nodes=[]):
+def topological_sort_by_down(start_nodes=None, all_nodes=None):
     """
     Topological sort method by down stream direction.
     'start_nodes' and 'all_nodes' only one needs to be given.
@@ -500,6 +503,8 @@ def topological_sort_by_down(start_nodes=[], all_nodes=[]):
     Returns:
         list[NodeGraphQt.BaseNode]: sorted nodes.
     """
+    if not start_nodes and not all_nodes:
+        return []
     if start_nodes:
         start_nodes = __remove_BackdropNode(start_nodes)
     if all_nodes:
@@ -517,7 +522,7 @@ def topological_sort_by_down(start_nodes=[], all_nodes=[]):
     return _sort_nodes(graph, start_nodes, True)
 
 
-def topological_sort_by_up(start_nodes=[], all_nodes=[]):
+def topological_sort_by_up(start_nodes=None, all_nodes=None):
     """
     Topological sort method by up stream direction.
     'start_nodes' and 'all_nodes' only one needs to be given.
@@ -528,6 +533,8 @@ def topological_sort_by_up(start_nodes=[], all_nodes=[]):
     Returns:
         list[NodeGraphQt.BaseNode]: sorted nodes.
     """
+    if not start_nodes and not all_nodes:
+        return []
     if start_nodes:
         start_nodes = __remove_BackdropNode(start_nodes)
     if all_nodes:
@@ -664,14 +671,16 @@ def _compute_rank_up(start_nodes):
     return nodes_rank
 
 
-def auto_layout_up(start_nodes=[], all_nodes=[]):
+def auto_layout_up(start_nodes=None, all_nodes=None):
     """
     Auto layout the nodes by up stream direction.
 
     Args:
         start_nodes (list[NodeGraphQt.BaseNode])(Optional): the end nodes of the graph.
         all_nodes (list[NodeGraphQt.BaseNode])(Optional): if 'start_nodes' is None the function can calculate start nodes from 'all_nodes'.
     """
+    if not start_nodes and not all_nodes:
+        return
     if start_nodes:
         start_nodes = __remove_BackdropNode(start_nodes)
     if all_nodes:
@@ -680,7 +689,7 @@ def auto_layout_up(start_nodes=[], all_nodes=[]):
     if not start_nodes:
         start_nodes = [n for n in all_nodes if not _has_output_node(n)]
     if not start_nodes:
-        return []
+        return
 
     nodes_rank = _compute_rank_up(start_nodes)
 
@@ -691,30 +700,48 @@ def auto_layout_up(start_nodes=[], all_nodes=[]):
         else:
             rank_map[rank] = [node]
 
-    current_x = 0
-    node_height = 50
-    for rank in reversed(range(len(rank_map))):
-        nodes = rank_map[rank]
-        max_width = max([node.view.width for node in nodes])
-        current_x += max_width
+    if NODE_LAYOUT_DIRECTION is NODE_LAYOUT_HORIZONTAL:
+        current_x = 0
+        node_height = 80
+        for rank in reversed(range(len(rank_map))):
+            nodes = rank_map[rank]
+            max_width = max([node.view.width for node in nodes])
+            current_x += max_width
+            current_y = 0
+            for idx, node in enumerate(nodes):
+                dy = max(node_height, node.view.height)
+                current_y += 0 if idx == 0 else dy
+                node.set_pos(current_x, current_y)
+                current_y += dy * 0.5 + 10
+
+            current_x += max_width * 0.5 + 100
+    elif NODE_LAYOUT_DIRECTION is NODE_LAYOUT_VERTICAL:
         current_y = 0
-        for idx, node in enumerate(nodes):
-            dy = max(node_height, node.view.height)
-            current_y += 0 if idx == 0 else dy
-            node.set_pos(current_x, current_y)
-            current_y += dy * 0.5 + 10
+        node_width = 250
+        for rank in reversed(range(len(rank_map))):
+            nodes = rank_map[rank]
+            max_height = max([node.view.height for node in nodes])
+            current_y += max_height
+            current_x = 0
+            for idx, node in enumerate(nodes):
+                dx = max(node_width, node.view.width)
+                current_x += 0 if idx == 0 else dx
+                node.set_pos(current_x, current_y)
+                current_x += dx * 0.5 + 10
 
-        current_x += max_width * 0.5 + 100
+            current_y += max_height * 0.5 + 100
 
 
-def auto_layout_down(start_nodes=[], all_nodes=[]):
+def auto_layout_down(start_nodes=None, all_nodes=None):
     """
     Auto layout the nodes by down stream direction.
 
     Args:
         start_nodes (list[NodeGraphQt.BaseNode])(Optional): the start update nodes of the graph.
         all_nodes (list[NodeGraphQt.BaseNode])(Optional): if 'start_nodes' is None the function can calculate start nodes from 'all_nodes'.
     """
+    if not start_nodes and not all_nodes:
+        return
     if start_nodes:
         start_nodes = __remove_BackdropNode(start_nodes)
     if all_nodes:
@@ -723,7 +750,7 @@ def auto_layout_down(start_nodes=[], all_nodes=[]):
     if not start_nodes:
         start_nodes = [n for n in all_nodes if not _has_input_node(n)]
     if not start_nodes:
-        return []
+        return
 
     nodes_rank = _compute_rank_down(start_nodes)
 
@@ -734,20 +761,36 @@ def auto_layout_down(start_nodes=[], all_nodes=[]):
         else:
             rank_map[rank] = [node]
 
-    current_x = 0
-    node_height = 50
-    for rank in range(len(rank_map)):
-        nodes = rank_map[rank]
-        max_width = max([node.view.width for node in nodes])
-        current_x += max_width
+    if NODE_LAYOUT_DIRECTION is NODE_LAYOUT_HORIZONTAL:
+        current_x = 0
+        node_height = 120
+        for rank in range(len(rank_map)):
+            nodes = rank_map[rank]
+            max_width = max([node.view.width for node in nodes])
+            current_x += max_width
+            current_y = 0
+            for idx, node in enumerate(nodes):
+                dy = max(node_height, node.view.height)
+                current_y += 0 if idx == 0 else dy
+                node.set_pos(current_x, current_y)
+                current_y += dy * 0.5 + 10
+
+            current_x += max_width * 0.5 + 100
+    elif NODE_LAYOUT_DIRECTION is NODE_LAYOUT_VERTICAL:
         current_y = 0
-        for idx, node in enumerate(nodes):
-            dy = max(node_height, node.view.height)
-            current_y += 0 if idx == 0 else dy
-            node.set_pos(current_x, current_y)
-            current_y += dy * 0.5 + 10
-
-        current_x += max_width * 0.5 + 100
+        node_width = 250
+        for rank in range(len(rank_map)):
+            nodes = rank_map[rank]
+            max_height = max([node.view.height for node in nodes])
+            current_y += max_height
+            current_x = 0
+            for idx, node in enumerate(nodes):
+                dx = max(node_width, node.view.width)
+                current_x += 0 if idx == 0 else dx
+                node.set_pos(current_x, current_y)
+                current_x += dx * 0.5 + 10
+
+            current_y += max_height * 0.5 + 100
 
 
 # garbage collect

NodeGraphQt/qgraphics/node_base.py

@@ -489,17 +489,26 @@ def post_init(self, viewer=None, pos=None):
             self.xy_pos = pos
 
     def auto_switch_mode(self):
+        """
+        Decide whether to draw the node with proxy mode.
+        """
         if ITEM_CACHE_MODE is QtWidgets.QGraphicsItem.ItemCoordinateCache:
             return
         rect = self.sceneBoundingRect()
         l = self.viewer().mapToGlobal(self.viewer().mapFromScene(rect.topLeft()))
         r = self.viewer().mapToGlobal(self.viewer().mapFromScene(rect.topRight()))
-        # with is the node with in screen
+        # width is the node with in screen
         width = r.x() - l.x()
 
         self.set_proxy_mode(width < self._proxy_mode_threshold)
 
     def set_proxy_mode(self, mode):
+        """
+        Set whether to draw the node with proxy mode.
+
+        Args:
+            mode (bool).
+        """
         if mode is self._proxy_mode:
             return