Merge pull request #401 from jchanvfx/node_drawing_bugfixes

Node drawing bugfixes

NodeGraphQt/base/commands.py

@@ -36,7 +36,7 @@ def set_node_property(self, name, value):
         # view widgets.
         if hasattr(view, 'widgets') and name in view.widgets.keys():
             # check if previous value is identical to current value,
-            # prevent signals from causing a infinite loop.
+            # prevent signals from causing an infinite loop.
             if view.widgets[name].get_value() != value:
                 view.widgets[name].set_value(value)
 

NodeGraphQt/base/node.py

@@ -204,9 +204,6 @@ def update(self):
         """
         settings = self.model.to_dict[self.model.id]
         settings['id'] = self.model.id
-        if settings.get('custom'):
-            settings['widgets'] = settings.pop('custom')
-
         self.view.from_dict(settings)
 
     def serialize(self):

NodeGraphQt/nodes/base_node.py

@@ -237,7 +237,8 @@ def add_combo_menu(self, name, label='', items=None, tooltip=None,
         #: redraw node to address calls outside the "__init__" func.
         self.view.draw_node()
 
-    def add_text_input(self, name, label='', text='', tooltip=None, tab=None):
+    def add_text_input(self, name, label='', text='', placeholder_text='',
+                       tooltip=None, tab=None):
         """
         Creates a custom property with the :meth:`NodeObject.create_property`
         function and embeds a :class:`PySide2.QtWidgets.QLineEdit` widget
@@ -250,7 +251,8 @@ def add_text_input(self, name, label='', text='', tooltip=None, tab=None):
         Args:
             name (str): name for the custom property.
             label (str): label to be displayed.
-            text (str): pre filled text.
+            text (str): pre-filled text.
+            placeholder_text (str): placeholder text.
             tooltip (str): widget tooltip.
             tab (str): name of the widget tab to display in.
         """
@@ -261,7 +263,7 @@ def add_text_input(self, name, label='', text='', tooltip=None, tab=None):
             widget_tooltip=tooltip,
             tab=tab
         )
-        widget = NodeLineEdit(self.view, name, label, text)
+        widget = NodeLineEdit(self.view, name, label, text, placeholder_text)
         widget.setToolTip(tooltip or '')
         widget.value_changed.connect(lambda k, v: self.set_property(k, v))
         self.view.add_widget(widget)

NodeGraphQt/pkg_info.py

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

NodeGraphQt/qgraphics/node_abstract.py

@@ -55,6 +55,15 @@ def setSelected(self, selected):
         self._properties['selected'] = selected
         super(AbstractNodeItem, self).setSelected(selected)
 
+    def draw_node(self):
+        """
+        Re-draw the node item in the scene with proper
+        calculated size and widgets aligned.
+
+        (this is called from the builtin custom widgets.)
+        """
+        return
+
     def pre_init(self, viewer, pos=None):
         """
         Called before node has been added into the scene.
@@ -63,7 +72,7 @@ def pre_init(self, viewer, pos=None):
             viewer (NodeGraphQt.widgets.viewer.NodeViewer): main viewer.
             pos (tuple): the cursor pos if node is called with tab search.
         """
-        pass
+        return
 
     def post_init(self, viewer, pos=None):
         """
@@ -73,7 +82,7 @@ def post_init(self, viewer, pos=None):
             viewer (NodeGraphQt.widgets.viewer.NodeViewer): main viewer
             pos (tuple): the cursor pos if node is called with tab search.
         """
-        pass
+        return
 
     @property
     def id(self):

NodeGraphQt/qgraphics/node_backdrop.py

@@ -67,7 +67,7 @@ def mouseReleaseEvent(self, event):
 
     def paint(self, painter, option, widget):
         """
-        Draws the backdrop sizer on the bottom right corner.
+        Draws the backdrop sizer in the bottom right corner.
 
         Args:
             painter (QtGui.QPainter): painter used for drawing the item.
@@ -302,3 +302,10 @@ def width(self, width=0.0):
     def height(self, height=0.0):
         AbstractNodeItem.height.fset(self, height)
         self._sizer.set_pos(self._width, self._height)
+
+    def from_dict(self, node_dict):
+        super().from_dict(node_dict)
+        custom_props = node_dict.get('custom') or {}
+        for prop_name, value in custom_props.items():
+            if prop_name == 'backdrop_text':
+                self.backdrop_text = value

NodeGraphQt/qgraphics/node_base.py

@@ -1049,7 +1049,8 @@ def has_widget(self, name):
 
     def from_dict(self, node_dict):
         super(NodeItem, self).from_dict(node_dict)
-        widgets = node_dict.pop('widgets', {})
-        for name, value in widgets.items():
-            if self._widgets.get(name):
-                self._widgets[name].set_value(value)
+        custom_prop = node_dict.get('custom') or {}
+        for prop_name, value in custom_prop.items():
+            prop_widget = self._widgets.get(prop_name)
+            if prop_widget:
+                prop_widget.set_value(value)

NodeGraphQt/widgets/node_widgets.py

@@ -326,7 +326,7 @@ class NodeLineEdit(NodeBaseWidget):
         :meth:`NodeGraphQt.BaseNode.add_text_input`
     """
 
-    def __init__(self, parent=None, name='', label='', text=''):
+    def __init__(self, parent=None, name='', label='', text='', placeholder_text=''):
         super(NodeLineEdit, self).__init__(parent, name, label)
         bg_color = ViewerEnum.BACKGROUND_COLOR.value
         text_color = tuple(map(lambda i, j: i - j, (255, 255, 255),
@@ -352,6 +352,7 @@ def __init__(self, parent=None, name='', label='', text=''):
             stylesheet += style
         ledit = QtWidgets.QLineEdit()
         ledit.setText(text)
+        ledit.setPlaceholderText(placeholder_text)
         ledit.setStyleSheet(stylesheet)
         ledit.setAlignment(QtCore.Qt.AlignCenter)
         ledit.editingFinished.connect(self.on_value_changed)