Merge branch 'master' of https://github.com/jchanvfx/NodeGraphQt

Author: jchanvfx

NodeGraphQt/__init__.py

@@ -34,15 +34,23 @@
 __status__ = 'Work in Progress'
 __license__ = 'MIT'
 
-
 __author__ = 'Johnny Chan'
 __email__ = 'http://chantasticvfx.com/contact'
 
-
 __module_name__ = 'NodeGraphQt'
 __url__ = 'https://github.com/jchanvfx/NodeGraphQt'
 
 
+try:
+    from Qt import QtWidgets, QtGui, QtCore, QtCompat
+    from Qt import __version__ as qtpy_ver
+except ImportError as ie:
+    print('Cannot import "Qt.py" shim falling back on "NodeGraphQt.vendor.Qt"')
+    from .vendor.Qt import __version__ as qtpy_ver
+    from .vendor.Qt import QtWidgets, QtGui, QtCore, QtCompat
+
+print('Qt.py version: {}'.format(qtpy_ver))
+
 from .base.actions import setup_context_menu
 from .base.graph import NodeGraph
 from .base.node import NodeObject, Node, Backdrop

NodeGraphQt/base/actions.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 from distutils.version import LooseVersion
 
-from PySide2 import QtGui, QtCore
+from NodeGraphQt import QtGui, QtCore
 
 
 def setup_context_menu(graph):

NodeGraphQt/base/commands.py

@@ -1,10 +1,10 @@
 #!/usr/bin/python
-from PySide2.QtWidgets import QUndoCommand
+from NodeGraphQt import QtWidgets
 
 from NodeGraphQt.constants import IN_PORT, OUT_PORT
 
 
-class PropertyChangedCmd(QUndoCommand):
+class PropertyChangedCmd(QtWidgets.QUndoCommand):
     """
     Node property changed command.
 
@@ -15,29 +15,33 @@ class PropertyChangedCmd(QUndoCommand):
     """
 
     def __init__(self, node, name, value):
-        QUndoCommand.__init__(self)
-        self.setText('set {} ({})'.format(name, node.name()))
+        QtWidgets.QUndoCommand.__init__(self)
+        if name == 'name':
+            self.setText('renamed "{}" to "{}"'.format(node.name(), value))
+        else:
+            self.setText('property "{}:{}"'.format(node.name(), name))
         self.node = node
         self.name = name
         self.old_val = node.get_property(name)
         self.new_val = value
 
     def set_node_prop(self, name, value):
+        """
+        updates the node view and model.
+        """
         # set model data.
         model = self.node.model
-        if name in model.properties.keys():
-            setattr(model, name, value)
-        elif name in model.custom_properties.keys():
-            model.custom_properties[name] = value
-        else:
-            raise KeyError('No property "{}"'.format(name))
+        model.set_property(name, value)
 
         # set view data.
         view = self.node.view
 
         # view widgets.
         if hasattr(view, 'widgets') and name in view.widgets.keys():
-            view.widgets[name].value = value
+            # check if previous value is identical to current value,
+            # prevent signals from causing a infinite loop.
+            if view.widgets[name].value != value:
+                view.widgets[name].value = value
 
         # view properties.
         if name in view.properties.keys():
@@ -46,16 +50,32 @@ def set_node_prop(self, name, value):
                 name = 'xy_pos'
             setattr(view, name, value)
 
+    def update_prop_bin(self, name, value):
+        """
+        updates the property bin widget.
+        """
+        graph = self.node.graph
+        prop_bin = graph.properties_bin()
+        properties_wgt = prop_bin.prop_widget(self.node)
+        if properties_wgt:
+            prop_wgt = properties_wgt.get_widget(name)
+            # check if previous value is identical to current value,
+            # prevent signals from causing a infinite loop.
+            if prop_wgt.get_value() != value:
+                prop_wgt.set_value(value)
+
     def undo(self):
         if self.old_val != self.new_val:
             self.set_node_prop(self.name, self.old_val)
+            self.update_prop_bin(self.name, self.old_val)
 
     def redo(self):
         if self.old_val != self.new_val:
             self.set_node_prop(self.name, self.new_val)
+            self.update_prop_bin(self.name, self.new_val)
 
 
-class NodeMovedCmd(QUndoCommand):
+class NodeMovedCmd(QtWidgets.QUndoCommand):
     """
     Node moved command.
 
@@ -66,7 +86,7 @@ class NodeMovedCmd(QUndoCommand):
     """
 
     def __init__(self, node, pos, prev_pos):
-        QUndoCommand.__init__(self)
+        QtWidgets.QUndoCommand.__init__(self)
         self.node = node
         self.pos = pos
         self.prev_pos = prev_pos
@@ -82,7 +102,7 @@ def redo(self):
         self.node.model.pos = self.pos
 
 
-class NodeAddedCmd(QUndoCommand):
+class NodeAddedCmd(QtWidgets.QUndoCommand):
     """
     Node added command.
 
@@ -93,7 +113,7 @@ class NodeAddedCmd(QUndoCommand):
     """
 
     def __init__(self, graph, node, pos=None):
-        QUndoCommand.__init__(self)
+        QtWidgets.QUndoCommand.__init__(self)
         self.setText('added node')
         self.graph = graph
         self.node = node
@@ -109,7 +129,7 @@ def redo(self):
         self.graph.viewer().add_node(self.node.view, self.pos)
 
 
-class NodeRemovedCmd(QUndoCommand):
+class NodeRemovedCmd(QtWidgets.QUndoCommand):
     """
     Node deleted command.
 
@@ -119,7 +139,7 @@ class NodeRemovedCmd(QUndoCommand):
     """
 
     def __init__(self, graph, node):
-        QUndoCommand.__init__(self)
+        QtWidgets.QUndoCommand.__init__(self)
         self.setText('deleted node')
         self.graph = graph
         self.node = node
@@ -149,7 +169,7 @@ def redo(self):
         self.node.view.delete()
 
 
-class PortConnectedCmd(QUndoCommand):
+class PortConnectedCmd(QtWidgets.QUndoCommand):
     """
     Port connected command.
 
@@ -159,7 +179,7 @@ class PortConnectedCmd(QUndoCommand):
     """
 
     def __init__(self, src_port, trg_port):
-        QUndoCommand.__init__(self)
+        QtWidgets.QUndoCommand.__init__(self)
         self.source = src_port
         self.target = trg_port
 
@@ -195,7 +215,7 @@ def redo(self):
         self.source.view.connect_to(self.target.view)
 
 
-class PortDisconnectedCmd(QUndoCommand):
+class PortDisconnectedCmd(QtWidgets.QUndoCommand):
     """
     Port disconnected command.
 
@@ -205,7 +225,7 @@ class PortDisconnectedCmd(QUndoCommand):
     """
 
     def __init__(self, src_port, trg_port):
-        QUndoCommand.__init__(self)
+        QtWidgets.QUndoCommand.__init__(self)
         self.source = src_port
         self.target = trg_port
 
@@ -241,7 +261,7 @@ def redo(self):
         self.source.view.disconnect_from(self.target.view)
 
 
-class PortVisibleCmd(QUndoCommand):
+class PortVisibleCmd(QtWidgets.QUndoCommand):
     """
     Port visibility command.
 
@@ -250,7 +270,7 @@ class PortVisibleCmd(QUndoCommand):
     """
 
     def __init__(self, port):
-        QUndoCommand.__init__(self)
+        QtWidgets.QUndoCommand.__init__(self)
         self.port = port
         self.visible = port.visible()
 
@@ -259,9 +279,9 @@ def set_visible(self, visible):
         self.port.view.setVisible(visible)
         node_view = self.port.node().view
         text_item = None
-        if self.port.type() == IN_PORT:
+        if self.port.type_() == IN_PORT:
             text_item = node_view.get_input_text_item(self.port.view)
-        elif self.port.type() == OUT_PORT:
+        elif self.port.type_() == OUT_PORT:
             text_item = node_view.get_output_text_item(self.port.view)
         if text_item:
             text_item.setVisible(visible)

NodeGraphQt/base/vendor.py renamed to NodeGraphQt/base/factory.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 
-class NodeVendor(object):
+class NodeFactory(object):
     """
     Node factory that stores all the node types.
     """
@@ -54,7 +54,7 @@ def register_node(self, node, alias=None):
             return
 
         name = node.NODE_NAME
-        node_type = node.type
+        node_type = node.type_
 
         if self._nodes.get(node_type):
             raise AssertionError(