Merge pull request #293 from jchanvfx/enable_disable_fix_#291

Enable disable fix #291

Author: jchanvfx

NodeGraphQt/base/graph.py

@@ -1813,14 +1813,16 @@ def disable_nodes(self, nodes, mode=None):
             return
         if mode is None:
             mode = not nodes[0].disabled()
-        if len(nodes) > 1:
-            text = {False: 'enable', True: 'disable'}[mode]
-            text = '{} ({}) nodes'.format(text, len(nodes))
-            self._undo_stack.beginMacro(text)
-            [n.set_disabled(mode) for n in nodes]
-            self._undo_stack.endMacro()
+        if len(nodes) == 1:
+            nodes[0].set_disabled(mode)
             return
-        nodes[0].set_disabled(mode)
+
+        text = '{} ({}) nodes'.format(
+            {False: 'enable', True: 'disable'}[mode], len(nodes)
+        )
+        self._undo_stack.beginMacro(text)
+        [n.set_disabled(mode) for n in nodes]
+        self._undo_stack.endMacro()
 
     def use_OpenGL(self):
         """

NodeGraphQt/base/model.py

@@ -114,7 +114,8 @@ def __repr__(self):
     def add_property(self, name, value, items=None, range=None,
                      widget_type=None, tab=None):
         """
-        add custom property.
+        add custom property or raises an error if the property name is already
+        taken.
 
         Args:
             name (str): name of the property.
@@ -159,6 +160,11 @@ def add_property(self, name, value, items=None, range=None,
             self._graph_model.set_node_common_properties(attrs)
 
     def set_property(self, name, value):
+        """
+        Args:
+            name (str): property name.
+            value (object): property value.
+        """
         if name in self.properties.keys():
             setattr(self, name, value)
         elif name in self._custom_prop.keys():
@@ -167,17 +173,48 @@ def set_property(self, name, value):
             raise NodePropertyError('No property "{}"'.format(name))
 
     def get_property(self, name):
+        """
+        Args:
+            name (str): property name.
+
+        Returns:
+            object: property value.
+        """
         if name in self.properties.keys():
             return self.properties[name]
         return self._custom_prop.get(name)
 
+    def is_custom_property(self, name):
+        """
+        Args:
+            name (str): property name.
+
+        Returns:
+            bool: true if custom property.
+        """
+        return name in self._custom_prop
+
     def get_widget_type(self, name):
+        """
+        Args:
+            name (str): property name.
+
+        Returns:
+            int: node property widget type.
+        """
         model = self._graph_model
         if model is None:
             return self._TEMP_property_widget_types.get(name)
         return model.get_node_common_properties(self.type_)[name]['widget_type']
 
     def get_tab_name(self, name):
+        """
+        Args:
+            name (str): property name.
+
+        Returns:
+            str: name of the tab for the properties bin.
+        """
         model = self._graph_model
         if model is None:
             attrs = self._TEMP_property_attrs.get(name)

NodeGraphQt/base/node.py

@@ -376,8 +376,10 @@ def set_property(self, name, value, push_undo=True):
             if hasattr(self.view, name):
                 setattr(self.view, name, value)
             self.model.set_property(name, value)
-        
-        self.update()
+
+        # redraw the node for custom properties.
+        if self.model.is_custom_property(name):
+            self.view.draw_node()
 
     def has_property(self, name):
         """

NodeGraphQt/custom_widgets/properties_bin/node_property_widgets.py

@@ -61,7 +61,11 @@ def __init__(self, parent=None):
         self.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
 
     def wheelEvent(self, event):
-        delta = event.delta() * 0.2
+        """
+        Args:
+            event (QtGui.QWheelEvent):
+        """
+        delta = event.angleDelta().y() * 0.2
         self.verticalScrollBar().setValue(
             self.verticalScrollBar().value() - delta
         )