layout switching tweaks.

Author: jchanvfx

NodeGraphQt/base/graph.py

@@ -126,6 +126,15 @@ def __init__(self, parent=None, **kwargs):
         self.setObjectName('NodeGraph')
         self._model = (
             kwargs.get('model') or NodeGraphModel())
+
+        layout_direction = kwargs.get('layout_direction')
+        if layout_direction:
+            if layout_direction not in [e.value for e in LayoutDirectionEnum]:
+                layout_direction = LayoutDirectionEnum.HORIZONTAL.value
+            self._model.layout_direction = layout_direction
+        else:
+            layout_direction = self._model.layout_direction
+
         self._node_factory = (
             kwargs.get('node_factory') or NodeFactory())
 
@@ -139,6 +148,7 @@ def __init__(self, parent=None, **kwargs):
 
         self._viewer = (
             kwargs.get('viewer') or NodeViewer(undo_stack=self._undo_stack))
+        self._viewer.set_layout_direction(layout_direction)
 
         self._build_context_menu()
         self._register_builtin_nodes()
@@ -802,6 +812,8 @@ def set_layout_direction(self, direction):
         This function will also override the layout direction on all
         nodes in the current node graph.
 
+        `Implemented in` ``v0.3.0``
+
         Note:
             By default node graph direction is set to "NODE_LAYOUT_HORIZONTAL".
 
@@ -1906,7 +1918,11 @@ def expand_group_node(self, node):
 
         # build new sub graph.
         node_factory = copy.deepcopy(self.node_factory)
-        sub_graph = SubGraph(self, node=node, node_factory=node_factory)
+        layout_direction = self.layout_direction()
+        sub_graph = SubGraph(self,
+                             node=node,
+                             node_factory=node_factory,
+                             layout_direction=layout_direction)
 
         # populate the sub graph.
         session = node.get_sub_graph_session()
@@ -1958,14 +1974,17 @@ class SubGraph(NodeGraph):
     -
     """
 
-    def __init__(self, parent=None, node=None, node_factory=None):
+    def __init__(self, parent=None, node=None, node_factory=None, **kwargs):
         """
         Args:
             parent (object): object parent.
             node (GroupNode): group node related to this sub graph.
             node_factory (NodeFactory): override node factory.
+            **kwargs (dict): additional kwargs.
         """
-        super(SubGraph, self).__init__(parent, node_factory=node_factory)
+        super(SubGraph, self).__init__(
+            parent, node_factory=node_factory, **kwargs
+        )
 
         # sub graph attributes.
         self._node = node
@@ -2329,7 +2348,10 @@ def expand_group_node(self, node):
 
         # build new sub graph.
         node_factory = copy.deepcopy(self.node_factory)
-        sub_graph = SubGraph(self, node=node, node_factory=node_factory)
+        sub_graph = SubGraph(self,
+                             node=node,
+                             node_factory=node_factory,
+                             layout_direction=self.layout_direction())
 
         # populate the sub graph.
         serialized_session = node.get_sub_graph_session()

NodeGraphQt/base/graph_actions.py

@@ -56,13 +56,13 @@ def build_context_menu(graph):
     graph_menu = context_menu.add_menu('&Graph')
 
     bg_menu = graph_menu.add_menu('&Background')
-    bg_menu.add_command('None', _bg_grid_none)
-    bg_menu.add_command('Lines', _bg_grid_lines)
-    bg_menu.add_command('Dots', _bg_grid_dots)
+    bg_menu.add_command('None', _bg_grid_none, 'Alt+1')
+    bg_menu.add_command('Lines', _bg_grid_lines, 'Alt+2')
+    bg_menu.add_command('Dots', _bg_grid_dots, 'Alt+3')
 
     layout_menu = graph_menu.add_menu('&Layout')
-    layout_menu.add_command('Horizontal', _layout_h_mode)
-    layout_menu.add_command('Vertical', _layout_v_mode)
+    layout_menu.add_command('Horizontal', _layout_h_mode, 'Shift+1')
+    layout_menu.add_command('Vertical', _layout_v_mode, 'Shift+2')
 
     # "Node" menu.
     # --------------------------------------------------------------------------

NodeGraphQt/base/node.py

@@ -474,6 +474,8 @@ def set_layout_direction(self, value=0):
         """
         Sets the node layout direction to either horizontal or vertical.
 
+        `Implemented in` ``v0.3.0``
+
         Note:
             This function does not register to the undo stack.
 
@@ -482,3 +484,4 @@ def set_layout_direction(self, value=0):
         """
         self.model.layout_direction = value
         self.view.layout_direction = value
+

NodeGraphQt/nodes/base_node.py

@@ -3,8 +3,7 @@
 
 from NodeGraphQt.base.node import NodeObject
 from NodeGraphQt.base.port import Port
-from NodeGraphQt.constants import (LayoutDirectionEnum,
-                                   NODE_PROP_QLABEL,
+from NodeGraphQt.constants import (NODE_PROP_QLABEL,
                                    NODE_PROP_QLINEEDIT,
                                    NODE_PROP_QCOMBO,
                                    NODE_PROP_QCHECKBOX,
@@ -77,6 +76,8 @@ def set_layout_direction(self, value=0):
         """
         Sets the node layout direction to either horizontal or vertical.
 
+        `Implemented in` ``v0.3.0``
+
         Note:
             This function does not register to the undo stack.
 

NodeGraphQt/qgraphics/node_port_in.py

@@ -188,7 +188,7 @@ def _align_label_horizontal(self, h_offset, v_offset):
     def _align_label_vertical(self, h_offset, v_offset):
         rect = self.boundingRect()
         text_rect = self._text_item.boundingRect()
-        x = rect.center().x() - (text_rect.width() / 2)
+        x = rect.center().x() - (text_rect.width() / 1.5) - 2.0
         y = rect.center().y() - text_rect.height() - 2.0
         self._text_item.setPos(x + h_offset, y + v_offset)
 
@@ -202,7 +202,7 @@ def _align_ports_horizontal(self, v_offset):
                 if ports:
                     v_offset -= ports[0].boundingRect().height() / 2
                     break
-        super(PortInputNodeItem, self).align_ports(v_offset=v_offset)
+        super(PortInputNodeItem, self)._align_ports_horizontal(v_offset)
 
     def _align_ports_vertical(self, v_offset):
         super(PortInputNodeItem, self)._align_ports_vertical(v_offset)

NodeGraphQt/qgraphics/node_port_out.py

@@ -188,7 +188,7 @@ def _align_label_horizontal(self, h_offset, v_offset):
     def _align_label_vertical(self, h_offset, v_offset):
         rect = self.boundingRect()
         text_rect = self._text_item.boundingRect()
-        x = rect.center().x() - (text_rect.width() / 2)
+        x = rect.center().x() - (text_rect.width() / 1.5) - 2.0
         y = rect.height() - text_rect.height() - 4.0
         self._text_item.setPos(x + h_offset, y + v_offset)
 
@@ -202,7 +202,7 @@ def _align_ports_horizontal(self, v_offset):
                 if ports:
                     v_offset -= ports[0].boundingRect().height() / 2
                     break
-        super(PortOutputNodeItem, self).align_ports(v_offset=v_offset)
+        super(PortOutputNodeItem, self)._align_ports_horizontal(v_offset)
 
     def _align_ports_vertical(self, v_offset):
         super(PortOutputNodeItem, self)._align_ports_vertical(v_offset)