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

Author: jchanvfx

NodeGraphQt/base/graph.py

@@ -772,7 +772,7 @@ def set_context_menu(self, menu_name, data):
         """
         Populate a context menu from serialized data.
 
-        serialized menu data example:
+        example of serialized menu data:
 
         .. highlight:: python
         .. code-block:: python
@@ -795,6 +795,15 @@ def set_context_menu(self, menu_name, data):
                 },
             ]
 
+        the ``run_test`` example function:
+
+        .. highlight:: python
+        .. code-block:: python
+
+            def run_test(graph):
+                print(graph.selected_nodes())
+
+
         Args:
             menu_name (str): name of the parent context menu to populate under.
             data (dict): serialized menu data.
@@ -806,7 +815,8 @@ def set_context_menu_from_file(self, file_path, menu=None):
         """
         Populate a context menu from a serialized json file.
 
-        Menu Types:
+        menu types:
+
             - ``"graph"`` context menu from the node graph.
             - ``"nodes"`` context menu for the nodes.
 
@@ -1202,13 +1212,13 @@ def delete_node(self, node, push_undo=True):
                     p.set_locked(False,
                                  connected_ports=False,
                                  push_undo=push_undo)
-                p.clear_connections()
+                p.clear_connections(push_undo=push_undo)
             for p in node.output_ports():
                 if p.locked():
                     p.set_locked(False,
                                  connected_ports=False,
                                  push_undo=push_undo)
-                p.clear_connections()
+                p.clear_connections(push_undo=push_undo)
 
         # collapse group node before removing.
         if isinstance(node, GroupNode) and node.is_expanded:
@@ -1249,13 +1259,13 @@ def remove_node(self, node, push_undo=True):
                     p.set_locked(False,
                                  connected_ports=False,
                                  push_undo=push_undo)
-                p.clear_connections()
+                p.clear_connections(push_undo=push_undo)
             for p in node.output_ports():
                 if p.locked():
                     p.set_locked(False,
                                  connected_ports=False,
                                  push_undo=push_undo)
-                p.clear_connections()
+                p.clear_connections(push_undo=push_undo)
 
         if push_undo:
             self._undo_stack.push(NodeRemovedCmd(self, node))

NodeGraphQt/nodes/base_node.py

@@ -167,6 +167,8 @@ def add_custom_widget(self, widget, widget_type=None, tab=None):
         widget.value_changed.connect(lambda k, v: self.set_property(k, v))
         widget._node = self
         self.view.add_widget(widget)
+        #: redraw node to address calls outside the "__init__" func.
+        self.view.draw_node()
 
     def add_combo_menu(self, name, label='', items=None, tab=None):
         """
@@ -194,6 +196,8 @@ def add_combo_menu(self, name, label='', items=None, tab=None):
         widget = NodeComboBox(self.view, name, label, items)
         widget.value_changed.connect(lambda k, v: self.set_property(k, v))
         self.view.add_widget(widget)
+        #: redraw node to address calls outside the "__init__" func.
+        self.view.draw_node()
 
     def add_text_input(self, name, label='', text='', tab=None):
         """
@@ -220,6 +224,8 @@ def add_text_input(self, name, label='', text='', tab=None):
         widget = NodeLineEdit(self.view, name, label, text)
         widget.value_changed.connect(lambda k, v: self.set_property(k, v))
         self.view.add_widget(widget)
+        #: redraw node to address calls outside the "__init__" func.
+        self.view.draw_node()
 
     def add_checkbox(self, name, label='', text='', state=False, tab=None):
         """
@@ -247,6 +253,8 @@ def add_checkbox(self, name, label='', text='', state=False, tab=None):
         widget = NodeCheckBox(self.view, name, label, text, state)
         widget.value_changed.connect(lambda k, v: self.set_property(k, v))
         self.view.add_widget(widget)
+        #: redraw node to address calls outside the "__init__" func.
+        self.view.draw_node()
 
     def add_input(self, name='input', multi_input=False, display_name=True,
                   color=None, locked=False, painter_func=None):

NodeGraphQt/pkg_info.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
-__version__ = '0.5.0'
+__version__ = '0.5.2'
 __status__ = 'Work in Progress'
 __license__ = 'MIT'
 

NodeGraphQt/qgraphics/node_base.py

@@ -1024,4 +1024,4 @@ def from_dict(self, node_dict):
         widgets = node_dict.pop('widgets', {})
         for name, value in widgets.items():
             if self._widgets.get(name):
-                self._widgets[name].get_value = value
+                self._widgets[name].set_value(value)

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = NodeGraphQt
-version=0.5.0
+version=0.5.2
 author=Johnny Chan
 license = MIT License
 license_file = LICENSE.md