Merge pull request #192 from jlalleve-EA/master

Bug fixes, consistent ordering of node ports, and increased python 2.7 compatibility

Author: jchanvfx

NodeGraphQt/qgraphics/node_base.py

@@ -1,5 +1,6 @@
 #!/usr/bin/python
 
+from collections import OrderedDict
 from .node_abstract import AbstractNodeItem
 from .node_text_item import NodeTextItem
 from .port import PortItem, CustomPortItem
@@ -130,8 +131,8 @@ def __init__(self, name='node', parent=None):
         self._icon_item.setTransformationMode(QtCore.Qt.SmoothTransformation)
         self._text_item = NodeTextItem(self.name, self)
         self._x_item = XDisabledItem(self, 'DISABLED')
-        self._input_items = {}
-        self._output_items = {}
+        self._input_items = OrderedDict()
+        self._output_items = OrderedDict()
         self._widgets = {}
         self._proxy_mode = False
         self._proxy_mode_threshold = 70
@@ -559,7 +560,7 @@ def set_proxy_mode(self, mode):
         visible = not mode
 
         for w in self._widgets.values():
-            w.widget.setVisible(visible)
+            w.widget().setVisible(visible)
         for port, text in self._input_items.items():
             port.setVisible(visible)
             if text.visible_:

NodeGraphQt/widgets/node_widgets.py

@@ -357,7 +357,7 @@ def get_value(self):
         """
         return self.get_custom_widget().value()
 
-    def value(self, value):
+    def set_value(self, value):
         if value != self.get_value():
             self.get_custom_widget().setValue(value)
             self.on_value_changed()

NodeGraphQt/widgets/tab_search.py

@@ -191,7 +191,7 @@ def _clear_actions(self):
         for action in self._searched_actions:
             self.removeAction(action)
             action.triggered.connect(self._on_search_submitted)
-        self._searched_actions.clear()
+        del self._searched_actions[:]
 
     def _set_menu_visible(self, visible):
         [menu.menuAction().setVisible(visible) for menu in self._menus.values()]