pipe style bug

Author: jchanvfx

NodeGraphQt/base/graph.py

@@ -14,7 +14,9 @@
 from NodeGraphQt.base.model import NodeGraphModel
 from NodeGraphQt.base.node import NodeObject
 from NodeGraphQt.base.port import Port
-from NodeGraphQt.constants import DRAG_DROP_ID
+from NodeGraphQt.constants import (DRAG_DROP_ID,
+                                   PIPE_LAYOUT_CURVED,
+                                   PIPE_LAYOUT_STRAIGHT)
 from NodeGraphQt.widgets.viewer import NodeViewer
 
 
@@ -381,15 +383,20 @@ def set_acyclic(self, mode=False):
         self._model.acyclic = mode
         self._viewer.acyclic = mode
 
-    def set_pipe_layout(self, layout='curved'):
+    def set_pipe_style(self, style=None):
         """
         Set node graph pipes to be drawn straight or curved by default
-        all pipes are set curved. (default='curved')
+        all pipes are set curved. (default=0)
+
+        PIPE_LAYOUT_CURVED = 0
+        PIPE_LAYOUT_STRAIGHT = 1
 
         Args:
-            layout (str): 'straight' or 'curved'
+            style (int): pipe style.
         """
-        self._viewer.set_pipe_layout(layout)
+        pipe_default = max([PIPE_LAYOUT_CURVED, PIPE_LAYOUT_STRAIGHT])
+        style = PIPE_LAYOUT_STRAIGHT if style > pipe_default else style
+        self._viewer.set_pipe_layout(style)
 
     def fit_to_selection(self):
         """

NodeGraphQt/widgets/viewer.py

@@ -5,7 +5,6 @@
 from NodeGraphQt import QtGui, QtCore, QtWidgets
 from NodeGraphQt.constants import (IN_PORT, OUT_PORT,
                                    PIPE_LAYOUT_CURVED,
-                                   PIPE_LAYOUT_STRAIGHT,
                                    PIPE_STYLE_DASHED,
                                    SCENE_AREA,
                                    Z_VAL_NODE_WIDGET)
@@ -677,12 +676,8 @@ def center_selection(self, nodes=None):
     def get_pipe_layout(self):
         return self._pipe_layout
 
-    def set_pipe_layout(self, layout=''):
-        layout_types = {
-            'curved': PIPE_LAYOUT_CURVED,
-            'straight': PIPE_LAYOUT_STRAIGHT
-        }
-        self._pipe_layout = layout_types.get(layout, 'curved')
+    def set_pipe_layout(self, layout):
+        self._pipe_layout = layout
         for pipe in self.all_pipes():
             pipe.draw_path(pipe.input_port, pipe.output_port)