Merge branch 'ArnoChenFx-master'

Author: jchanvfx

NodeGraphQt/base/commands.py

@@ -139,6 +139,7 @@ def __init__(self, graph, node):
         self.node = node
         self.inputs = []
         self.outputs = []
+
         if hasattr(self.node, 'inputs'):
             input_ports = self.node.inputs().values()
             self.inputs = [(p, p.connected_ports()) for p in input_ports]

NodeGraphQt/base/graph.py

@@ -115,11 +115,38 @@ def _wire_signals(self):
         self._viewer.connection_changed.connect(self._on_connection_changed)
         self._viewer.moved_nodes.connect(self._on_nodes_moved)
         self._viewer.node_double_clicked.connect(self._on_node_double_clicked)
+        self._viewer.insert_node.connect(self._insert_node)
 
         # pass through signals.
         self._viewer.node_selected.connect(self._on_node_selected)
         self._viewer.data_dropped.connect(self._on_node_data_dropped)
 
+    def _insert_node(self, pipe, node_id, prev_node_pos):
+        """
+        Slot function triggered when a selected node has collided with a pipe.
+
+        Args:
+            pipe (Pipe): collided pipe item.
+            node_id (str): selected node id to insert.
+            prev_node_pos (dict): previous node position. {NodeItem: [prev_x, prev_y]}
+        """
+        node = self.get_node_by_id(node_id)
+
+        disconnected = [(pipe.input_port, pipe.output_port)]
+        connected = []
+
+        if node.inputs():
+            connected.append(
+                (pipe.output_port, list(node.inputs().values())[0].view)
+            )
+        if node.outputs():
+            connected.append((node.output(0).view, pipe.input_port))
+
+        self._undo_stack.beginMacro('inserted node')
+        self._on_connection_changed(disconnected, connected)
+        self._on_nodes_moved(prev_node_pos)
+        self._undo_stack.endMacro()
+
     def _toggle_tab_search(self):
         """
         toggle the tab search widget.
@@ -735,6 +762,16 @@ def delete_nodes(self, nodes):
         [self._undo_stack.push(NodeRemovedCmd(self, n)) for n in nodes]
         self._undo_stack.endMacro()
 
+    def delete_pipe(self, pipe):
+        self._on_connection_changed([(pipe.input_port, pipe.output_port)], [])
+
+    def delete_pipes(self, pipes):
+        disconnected = []
+        for pipe in pipes:
+            disconnected.append((pipe.input_port, pipe.output_port))
+        if disconnected:
+            self._on_connection_changed(disconnected, [])
+
     def all_nodes(self):
         """
         Return all nodes in the node graph.
@@ -862,7 +899,6 @@ def _serialize(self, nodes):
         serial_data = {'nodes': {}, 'connections': []}
         nodes_data = {}
         for n in nodes:
-
             # update the node model.
             n.update_model()
 

NodeGraphQt/base/node.py

@@ -13,6 +13,7 @@
 from NodeGraphQt.qgraphics.node_base import NodeItem
 from NodeGraphQt.widgets.node_widgets import (NodeComboBox,
                                               NodeLineEdit,
+                                              NodeFloatEdit,
                                               NodeCheckBox)
 
 
@@ -528,6 +529,28 @@ def add_text_input(self, name, label='', text='', tab=None):
         widget.value_changed.connect(lambda k, v: self.set_property(k, v))
         self.view.add_widget(widget)
 
+    def add_float_input(self, name, label='', value=0.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 (float): pre filled value.
+            tab (str): name of the widget tab to display in.
+        """
+        self.create_property(
+            name, value, widget_type=NODE_PROP_QLINEEDIT, 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_checkbox(self, name, label='', text='', state=False, tab=None):
         """
         Creates a custom property with the :meth:`NodeObject.create_property`

NodeGraphQt/base/utils.py

@@ -62,7 +62,7 @@ def setup_context_menu(graph):
 
     edit_menu.add_command('Copy', _copy_nodes, QtGui.QKeySequence.Copy)
     edit_menu.add_command('Paste', _paste_nodes, QtGui.QKeySequence.Paste)
-    edit_menu.add_command('Delete', _delete_nodes, QtGui.QKeySequence.Delete)
+    edit_menu.add_command('Delete', _delete_items, QtGui.QKeySequence.Delete)
 
     edit_menu.add_separator()
 
@@ -183,8 +183,9 @@ def _paste_nodes(graph):
     graph.paste_nodes()
 
 
-def _delete_nodes(graph):
+def _delete_items(graph):
     graph.delete_nodes(graph.selected_nodes())
+    graph.delete_pipes(graph._viewer.selected_pipes())
 
 
 def _select_all_nodes(graph):

NodeGraphQt/qgraphics/pipe.py

@@ -27,6 +27,7 @@ def __init__(self, input_port=None, output_port=None):
         super(Pipe, self).__init__()
         self.setZValue(Z_VAL_PIPE)
         self.setAcceptHoverEvents(True)
+        self.setFlag(QtWidgets.QGraphicsItem.ItemIsSelectable)
         self._color = PIPE_DEFAULT_COLOR
         self._style = PIPE_STYLE_DEFAULT
         self._active = False
@@ -55,6 +56,8 @@ def hoverLeaveEvent(self, event):
                 self.highlight()
             elif self.output_port.node.selected:
                 self.highlight()
+        if self.isSelected():
+            self.highlight()
 
     def paint(self, painter, option, widget):
         """
@@ -243,6 +246,7 @@ def highlight(self):
     def highlighted(self):
         return self._highlight
 
+
     def reset(self):
         self._active = False
         self._highlight = False
@@ -267,6 +271,13 @@ def disabled(self):
             return True
         return False
 
+    def itemChange(self, change, value):
+        if change == self.ItemSelectedChange and self.scene():
+            self.reset()
+            if value:
+                self.highlight()
+        return super(Pipe, self).itemChange(change, value)
+
     @property
     def input_port(self):
         return self._input_port

NodeGraphQt/widgets/node_widgets.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from NodeGraphQt import QtCore, QtWidgets
+from NodeGraphQt import QtCore, QtWidgets, QtGui
 
 from NodeGraphQt.constants import Z_VAL_NODE_WIDGET
 from NodeGraphQt.widgets.stylesheet import *
@@ -252,6 +252,40 @@ def value(self, text=''):
             self._value_changed()
 
 
+class NodeFloatEdit(NodeLineEdit):
+    """
+    NodeFloatEdit 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(NodeFloatEdit, self).__init__(parent, name, label)
+        regex = '\\d+|\\d+\\.\\d+'
+        validator = QtGui.QRegExpValidator(regex, self._ledit)
+        self._ledit.setValidator(validator)
+        self.text = str(value)
+
+    @property
+    def value(self):
+        """
+        Returns the widgets current float value.
+
+        Returns:
+            float: float value.
+        """
+        return float(self._ledit.text() or '0')
+
+    @value.setter
+    def value(self, text=0.0):
+        if text != self.value:
+            self._ledit.setText(str(text))
+            self._value_changed()
+
+
 class NodeCheckBox(NodeBaseWidget):
     """
     NodeCheckBox widget is subclassed from :class:`NodeBaseWidget`,
@@ -268,8 +302,7 @@ def __init__(self, parent=None, name='', label='', text='', state=False):
         self._cbox.setChecked(state)
         self._cbox.setMinimumWidth(80)
 
-        # issue #144: disabled stylesheet for now
-        # self._cbox.setStyleSheet(STYLE_QCHECKBOX)
+        self._cbox.setStyleSheet(STYLE_QCHECKBOX)
 
         font = self._cbox.font()
         font.setPointSize(11)

NodeGraphQt/widgets/properties.py

@@ -197,7 +197,7 @@ def get_value(self):
 
     def set_value(self, value):
         if value != self.get_value():
-            self.setText(value)
+            self.setText(str(value))
             self.value_changed.emit(self.toolTip(), value)
 
 

NodeGraphQt/widgets/properties_bin.py

@@ -16,14 +16,15 @@ def paint(self, painter, option, index):
         painter.save()
         painter.setRenderHint(QtGui.QPainter.Antialiasing, False)
         painter.setPen(QtCore.Qt.NoPen)
-        painter.setBrush(option.palette.midlight())
+
+        painter.setBrush(QtCore.Qt.NoBrush)
         painter.drawRect(option.rect)
 
         if option.state & QtWidgets.QStyle.State_Selected:
             bdr_clr = option.palette.highlight().color()
             painter.setPen(QtGui.QPen(bdr_clr, 1.5))
         else:
-            bdr_clr = option.palette.alternateBase().color()
+            bdr_clr = QtGui.QColor(100, 100, 100)
             painter.setPen(QtGui.QPen(bdr_clr, 1))
 
         painter.setBrush(QtCore.Qt.NoBrush)
@@ -69,19 +70,27 @@ def __init__(self, parent=None, node_graph=None):
         self._limit.setToolTip('Set display nodes limit.')
         self._limit.setMaximum(10)
         self._limit.setMinimum(0)
-        self._limit.setValue(5)
+        self._limit.setValue(2)
         self._limit.valueChanged.connect(self.__on_limit_changed)
-        self.resize(400, 400)
+        self.resize(450, 400)
 
         self._block_signal = False
 
+        self._lock = False
+        self.btn_lock = QtWidgets.QPushButton('lock')
+        self.btn_lock.setToolTip(
+            'Lock the properties bin prevent nodes from being loaded.')
+        self.btn_lock.clicked.connect(self.lock_bin)
+
         btn_clr = QtWidgets.QPushButton('clear')
         btn_clr.setToolTip('Clear the properties bin.')
         btn_clr.clicked.connect(self.clear_bin)
 
         top_layout = QtWidgets.QHBoxLayout()
+        top_layout.setSpacing(2)
         top_layout.addWidget(self._limit)
         top_layout.addStretch(1)
+        top_layout.addWidget(self.btn_lock)
         top_layout.addWidget(btn_clr)
 
         layout = QtWidgets.QVBoxLayout(self)
@@ -129,7 +138,8 @@ def __on_graph_property_changed(self, node, prop_name, prop_value):
             return
 
         property_window = properties_widget.get_widget(prop_name)
-        if prop_value != property_window.get_value():
+
+        if property_window and prop_value != property_window.get_value():
             self._block_signal = True
             property_window.set_value(prop_value)
             self._block_signal = False
@@ -173,13 +183,14 @@ def add_node(self, node):
         """
         if self.limit() == 0:
             return
-
-        rows = self._prop_list.rowCount()
-        if rows >= self.limit():
-            self._prop_list.removeRow(rows - 1)
+        if self._lock:
+            return
 
         itm_find = self._prop_list.findItems(node.id, QtCore.Qt.MatchExactly)
+
         if itm_find:
+            if itm_find[0].row() == 0:
+                return
             self._prop_list.removeRow(itm_find[0].row())
 
         self._prop_list.insertRow(0)
@@ -192,6 +203,10 @@ def add_node(self, node):
         self._prop_list.setItem(0, 0, item)
         self._prop_list.selectRow(0)
 
+        rows = self._prop_list.rowCount()
+        if rows > self.limit():
+            self._prop_list.removeRow(rows - 1)
+
     def remove_node(self, node):
         """
         Remove node from the properties bin.
@@ -202,6 +217,16 @@ def remove_node(self, node):
         node_id = node if isinstance(node, str) else node.id
         self.__on_prop_close(node_id)
 
+    def lock_bin(self):
+        """
+        Lock/UnLock the properties bin.
+        """
+        self._lock = not self._lock
+        if self._lock:
+            self.btn_lock.setText('UnLock')
+        else:
+            self.btn_lock.setText('Lock')
+
     def clear_bin(self):
         """
         Clear the properties bin.
@@ -266,7 +291,7 @@ def prop_changed(node_id, prop_name, prop_value):
     graph = NodeGraph()
     graph.register_node(TestNode)
 
-    prop_bin = PropertiesBinWidget()
+    prop_bin = PropertiesBinWidget(node_graph=graph)
     prop_bin.property_changed.connect(prop_changed)
 
     node = graph.create_node('nodeGraphQt.nodes.TestNode')

NodeGraphQt/widgets/stylesheet.py

@@ -17,7 +17,7 @@
     padding-bottom: 2px;
     padding-left: 1px;
     padding-right: 1px;
-    font-size: 10pt;
+    font-size: 8pt;
 }
 QGroupBox::title {
     subcontrol-origin: margin;
@@ -158,6 +158,7 @@
 STYLE_QCHECKBOX = '''
 QCheckBox {
     color: rgba(255, 255, 255, 150);
+    background-color: transparent;
     spacing: 8px 2px;
     padding-top: 2px;
     padding-bottom: 2px;