add new property widgets:float,int,vector

Author: ArnoChenFx

NodeGraphQt/base/node.py

@@ -8,13 +8,16 @@
                                    NODE_PROP_QCOMBO,
                                    NODE_PROP_QCHECKBOX,
                                    IN_PORT, OUT_PORT,
-                                   NODE_PROP_FILE)
+                                   NODE_PROP_FILE,
+                                   NODE_PROP_FLOAT,
+                                   NODE_PROP_INT)
 from NodeGraphQt.errors import PortRegistrationError
 from NodeGraphQt.qgraphics.node_backdrop import BackdropNodeItem
 from NodeGraphQt.qgraphics.node_base import NodeItem
 from NodeGraphQt.widgets.node_widgets import (NodeComboBox,
                                               NodeLineEdit,
                                               NodeFloatEdit,
+                                              NodeIntEdit,
                                               NodeCheckBox,
                                               NodeFilePath)
 
@@ -529,10 +532,8 @@ def add_text_input(self, name, label='', text='', tab=None, multi_line=False):
             tab (str): name of the widget tab to display in.
             multi_line (bool): if create multi line property.
         """
-        if multi_line:
-            wid_type = NODE_PROP_QTEXTEDIT
-        else:
-            wid_type = NODE_PROP_QLINEEDIT
+        wid_type = NODE_PROP_QTEXTEDIT if multi_line else NODE_PROP_QLINEEDIT
+
         self.create_property(
             name, text, widget_type=wid_type, tab=tab)
         widget = NodeLineEdit(self.view, name, label, text)
@@ -579,11 +580,33 @@ def add_float_input(self, name, label='', value=0.0, tab=None):
             tab (str): name of the widget tab to display in.
         """
         self.create_property(
-            name, value, widget_type=NODE_PROP_QLINEEDIT, tab=tab)
+            name, value, widget_type=NODE_PROP_FLOAT, tab=tab)
         widget = NodeFloatEdit(self.view, name, label, value)
         widget.value_changed.connect(lambda k, v: self.set_property(k, v))
         self.view.add_widget(widget)
 
+    def add_int_input(self, name, label='', value=0, tab=None):
+        """
+        Creates a custom property with the :meth:`NodeObject.create_property`
+        function and embeds a :class:`PySide2.QtWidgets.QLineEdit` widget
+        into the node.
+
+        Note:
+            The embedded widget is wired up to the :meth:`NodeObject.set_property`
+            function use this function to to update the widget.
+
+        Args:
+            name (str): name for the custom property.
+            label (str): label to be displayed.
+            value (int): pre filled value.
+            tab (str): name of the widget tab to display in.
+        """
+        self.create_property(
+            name, value, widget_type=NODE_PROP_INT, tab=tab)
+        widget = NodeIntEdit(self.view, name, label, value)
+        widget.value_changed.connect(lambda k, v: self.set_property(k, v))
+        self.view.add_widget(widget)
+
     def add_checkbox(self, name, label='', text='', state=False, tab=None):
         """
         Creates a custom property with the :meth:`NodeObject.create_property`

NodeGraphQt/constants.py

@@ -71,6 +71,16 @@
 NODE_PROP_SLIDER = 9
 #: Property type represented with a file selector widget in the properties bin.
 NODE_PROP_FILE = 10
+#: Property type represented with a vector2 widget in the properties bin.
+NODE_PROP_VECTOR2 = 11
+#: Property type represented with vector3 widget in the properties bin.
+NODE_PROP_VECTOR3 = 12
+#: Property type represented with vector4 widget in the properties bin.
+NODE_PROP_VECTOR4 = 13
+#: Property type represented with float widget in the properties bin.
+NODE_PROP_FLOAT = 14
+#: Property type represented with int widget in the properties bin.
+NODE_PROP_INT = 15
 
 # === NODE VIEWER ===
 

NodeGraphQt/widgets/node_widgets.py

@@ -274,9 +274,7 @@ class NodeFloatEdit(NodeLineEdit):
 
     def __init__(self, parent=None, name='', label='', value=0.0):
         super(NodeFloatEdit, self).__init__(parent, name, label)
-        regex = '\\d+|\\d+\\.\\d+'
-        validator = QtGui.QRegExpValidator(regex, self._ledit)
-        self._ledit.setValidator(validator)
+        self._ledit.setValidator(QtGui.QDoubleValidator())
         self.text = str(value)
         self._ledit.setText(self.text)
 
@@ -288,12 +286,41 @@ def value(self):
         Returns:
             float: float value.
         """
-        try:
-            value = float(self._ledit.text())
-        except:
-            value = 0.0
-            self._ledit.setText(str(value))
+        value = float(self._ledit.text())
+        return value
+
+    @value.setter
+    def value(self, text=0.0):
+        if text != self.value:
+            self._ledit.setText(str(text))
+            self._value_changed()
+
+
+class NodeIntEdit(NodeLineEdit):
+    """
+    NodeIntEdit widget is subclassed from :class:`NodeLineEdit`,
+    this widget is displayed as a ``QLineEdit`` embedded in a node.
+
+    .. note::
+        `To embed a ``QLineEdit`` in a node see func:`
+        :meth:`NodeGraphQt.BaseNode.add_float_input`
+    """
+
+    def __init__(self, parent=None, name='', label='', value=0.0):
+        super(NodeIntEdit, self).__init__(parent, name, label)
+        self._ledit.setValidator(QtGui.QIntValidator())
+        self.text = str(value)
+        self._ledit.setText(self.text)
 
+    @property
+    def value(self):
+        """
+        Returns the widgets current int value.
+
+        Returns:
+            int: int value.
+        """
+        value = int(self._ledit.text())
         return value
 
     @value.setter

NodeGraphQt/widgets/properties.py

@@ -10,7 +10,12 @@
                                    NODE_PROP_QSPINBOX,
                                    NODE_PROP_COLORPICKER,
                                    NODE_PROP_SLIDER,
-                                   NODE_PROP_FILE)
+                                   NODE_PROP_FILE,
+                                   NODE_PROP_VECTOR2,
+                                   NODE_PROP_VECTOR3,
+                                   NODE_PROP_VECTOR4,
+                                   NODE_PROP_FLOAT,
+                                   NODE_PROP_INT)
 from NodeGraphQt.widgets.file_dialog import file_dialog
 
 
@@ -68,8 +73,6 @@ def __init__(self, parent=None):
         layout.addWidget(self._label, 0, QtCore.Qt.AlignCenter)
         layout.addWidget(self._button, 1, QtCore.Qt.AlignLeft)
 
-        self._label.setStyleSheet('QLabel {color: rgba(255, 255, 255, 150);}')
-
     def _on_select_color(self):
         color = QtWidgets.QColorDialog.getColor(QtGui.QColor(*self.get_value()),options=QtWidgets.QColorDialog.ShowAlphaChannel)
         if color.isValid():
@@ -180,22 +183,10 @@ class PropLineEdit(QtWidgets.QLineEdit):
 
     def __init__(self, parent=None):
         super(PropLineEdit, self).__init__(parent)
-        self.__prev_text = ''
-        self.editingFinished.connect(self._on_return_pressed)
-
-    def focusInEvent(self, event):
-        super(PropLineEdit, self).focusInEvent(event)
-        self.__prev_text = self.text()
+        self.editingFinished.connect(self._on_editing_finished)
 
-    def focusOutEvent(self, event):
-        super(PropLineEdit, self).focusOutEvent(event)
-        if self.__prev_text != self.text():
-            self.value_changed.emit(self.toolTip(), self.text())
-        self.__prev_text = ''
-
-    def _on_return_pressed(self):
-        if self.__prev_text != self.text():
-            self.value_changed.emit(self.toolTip(), self.text())
+    def _on_editing_finished(self):
+        self.value_changed.emit(self.toolTip(), self.text())
 
     def get_value(self):
         return self.text()
@@ -225,9 +216,6 @@ def focusOutEvent(self, event):
             self.value_changed.emit(self.toolTip(), self.toPlainText())
         self.__prev_text = ''
 
-    def _on_return_pressed(self):
-        self.value_changed.emit(self.toolTip(), self.get_value())
-
     def get_value(self):
         return self.toPlainText()
 
@@ -350,6 +338,115 @@ def set_value(self, value):
             self._on_value_change(_value)
 
 
+class PropVector(BaseProperty):
+    def __init__(self, parent=None,dim=3):
+        super(PropVector, self).__init__(parent)
+        hbox = QtWidgets.QHBoxLayout()
+        self._value = []
+        self._items = []
+
+        for i in range(dim):
+            self._add_item(i, hbox)
+
+        self._can_emit = True
+        self.setLayout(hbox)
+
+    def _add_item(self,index,hbox):
+        _ledit = QtWidgets.QLineEdit()
+        _ledit.index = index
+        _ledit.setText("0")
+        _ledit.setAlignment(QtCore.Qt.AlignLeft)
+        _ledit.editingFinished.connect(lambda: self._on_value_change(_ledit.text(), _ledit.index))
+        _ledit.setValidator(QtGui.QDoubleValidator())
+        _ledit.setStyleSheet("QLineEdit{border:1px solid}")
+
+        hbox.addWidget(_ledit)
+        self._value.append(0.0)
+        self._items.append(_ledit)
+
+    def _on_value_change(self, value=None,index=None):
+        if self._can_emit:
+            if index is not None:
+                self._value[index] = float(value)
+
+            self.value_changed.emit(self.toolTip(), self._value)
+
+    def _update_items(self):
+        for index ,value in enumerate(self._value):
+            if float(self._items[index].text()) != value:
+                self._items[index].setText(str(value))
+
+    def get_value(self):
+        return self._value
+
+    def set_value(self, value):
+        if value != self.get_value():
+            self._value = value.copy()
+            self._can_emit = False
+            self._update_items()
+            self._can_emit = True
+            self._on_value_change()
+
+
+class PropVector2(PropVector):
+    def __init__(self,parent=None):
+        super(PropVector2,self).__init__(parent,2)
+
+
+class PropVector3(PropVector):
+    def __init__(self,parent=None):
+        super(PropVector3,self).__init__(parent,3)
+
+
+class PropVector4(PropVector):
+    def __init__(self,parent=None):
+        super(PropVector4,self).__init__(parent,4)
+
+
+class PropFloat(QtWidgets.QLineEdit):
+
+    value_changed = QtCore.Signal(str, object)
+
+    def __init__(self, parent=None):
+        super(PropFloat, self).__init__(parent)
+        self.setText("0.0")
+        self.setValidator(QtGui.QDoubleValidator())
+        self.editingFinished.connect(self._on_editing_finished)
+
+    def _on_editing_finished(self):
+        self.value_changed.emit(self.toolTip(), float(self.text()))
+
+    def get_value(self):
+        return float(self.text())
+
+    def set_value(self, value):
+        if value != self.get_value():
+            self.setText(str(value))
+            self.value_changed.emit(self.toolTip(), value)
+
+
+class PropInt(QtWidgets.QLineEdit):
+
+    value_changed = QtCore.Signal(str, object)
+
+    def __init__(self, parent=None):
+        super(PropInt, self).__init__(parent)
+        self.setText("0")
+        self.setValidator(QtGui.QIntValidator())
+        self.editingFinished.connect(self._on_editing_finished)
+
+    def _on_editing_finished(self):
+        self.value_changed.emit(self.toolTip(), int(self.text()))
+
+    def get_value(self):
+        return int(self.text())
+
+    def set_value(self, value):
+        if value != self.get_value():
+            self.setText(str(value))
+            self.value_changed.emit(self.toolTip(), value)
+
+
 WIDGET_MAP = {
     NODE_PROP_QLABEL:       PropLabel,
     NODE_PROP_QLINEEDIT:    PropLineEdit,
@@ -359,7 +456,12 @@ def set_value(self, value):
     NODE_PROP_QSPINBOX:     PropSpinBox,
     NODE_PROP_COLORPICKER:  PropColorPicker,
     NODE_PROP_SLIDER:       PropSlider,
-    NODE_PROP_FILE:         PropFilePath
+    NODE_PROP_FILE:         PropFilePath,
+    NODE_PROP_VECTOR2:      PropVector2,
+    NODE_PROP_VECTOR3:      PropVector3,
+    NODE_PROP_VECTOR4:      PropVector4,
+    NODE_PROP_FLOAT:        PropFloat,
+    NODE_PROP_INT:          PropInt,
 }
 
 

example_auto_nodes/data_node.py

@@ -3,37 +3,6 @@
 from .node_base.auto_node import AutoNode
 
 
-class VectorValue(AutoNode):
-    """
-    Create a basic vector data
-    """
-
-    __identifier__ = 'Data'
-    NODE_NAME = 'Vector'
-
-    def __init__(self):
-        super(VectorValue, self).__init__()
-        value = [0.0, 0.0, 0.0]
-
-        self.add_output('out',list)
-        self.create_property("out", value)
-
-        self.add_float_input('0', 'X', value=value[0])
-        self.view.widgets['0'].value_changed.connect(lambda: self.updateValue(0))
-
-        self.add_float_input('1', 'Y', value=value[1])
-        self.view.widgets['1'].value_changed.connect(lambda: self.updateValue(1))
-
-        self.add_float_input('2', 'Z', value=value[2])
-        self.view.widgets['2'].value_changed.connect(lambda: self.updateValue(2))
-
-        self.defaultValue = value
-
-    def updateValue(self, index):
-        self.get_property("out")[index] = self.get_property(str(index))
-        self.cook()
-
-
 class VectorSplit(AutoNode):
     """
     Splict a vector to x,y,z
@@ -107,7 +76,6 @@ def __init__(self):
         items.append("eval string")
         items.append("all to list")
         self.add_combo_menu('method', 'Method', items=items)
-        self.view.widgets['method'].value_changed.connect(self.cook)
 
     def run(self):
         method = self.get_property("method")