Merge pull request #427 from jchanvfx/attrs_clean_up

attr clean up and version bump.

Author: jchanvfx

NodeGraphQt/base/graph.py

@@ -519,7 +519,11 @@ def widget(self):
             self._widget.addTab(self._viewer, 'Node Graph')
             # hide the close button on the first tab.
             tab_bar = self._widget.tabBar()
-            for btn_flag in [tab_bar.RightSide, tab_bar.LeftSide]:
+            tab_flags = [
+                QtWidgets.QTabBar.RightSide,
+                QtWidgets.QTabBar.LeftSide
+            ]
+            for btn_flag in tab_flags:
                 tab_btn = tab_bar.tabButton(0, btn_flag)
                 if tab_btn:
                     tab_btn.deleteLater()

NodeGraphQt/base/menu.py

@@ -120,7 +120,7 @@ def _set_shortcut(action, shortcut):
                 shortcut = getattr(QtGui.QKeySequence, search.group(1))
             elif all([i in ['Alt', 'Enter'] for i in shortcut.split('+')]):
                 shortcut = QtGui.QKeySequence(
-                    QtCore.Qt.ALT + QtCore.Qt.Key_Return
+                    QtCore.Qt.ALT | QtCore.Qt.Key_Return
                 )
             elif all([i in ['Return', 'Enter'] for i in shortcut.split('+')]):
                 shortcut = QtCore.Qt.Key_Return

NodeGraphQt/custom_widgets/nodes_palette.py

@@ -136,11 +136,11 @@ class NodesGridView(QtWidgets.QListView):
 
     def __init__(self, parent=None):
         super(NodesGridView, self).__init__(parent)
-        self.setSelectionMode(self.ExtendedSelection)
+        self.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection)
         self.setUniformItemSizes(True)
-        self.setResizeMode(self.Adjust)
-        self.setViewMode(self.IconMode)
-        self.setDragDropMode(self.DragOnly)
+        self.setResizeMode(QtWidgets.QListView.Adjust)
+        self.setViewMode(QtWidgets.QListView.IconMode)
+        self.setDragDropMode(QtWidgets.QListView.DragOnly)
         self.setDragEnabled(True)
         self.setMinimumSize(300, 100)
         self.setSpacing(4)

NodeGraphQt/custom_widgets/nodes_tree.py

@@ -51,7 +51,7 @@ class NodesTreeWidget(QtWidgets.QTreeWidget):
     def __init__(self, parent=None, node_graph=None):
         super(NodesTreeWidget, self).__init__(parent)
         self.setDragDropMode(QtWidgets.QAbstractItemView.DragOnly)
-        self.setSelectionMode(self.ExtendedSelection)
+        self.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection)
         self.setHeaderHidden(True)
         self.setWindowTitle('Nodes')
 

NodeGraphQt/pkg_info.py

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

NodeGraphQt/qgraphics/node_abstract.py

@@ -16,7 +16,10 @@ class AbstractNodeItem(QtWidgets.QGraphicsItem):
 
     def __init__(self, name='node', parent=None):
         super(AbstractNodeItem, self).__init__(parent)
-        self.setFlags(self.ItemIsSelectable | self.ItemIsMovable)
+        self.setFlags(
+            QtWidgets.QGraphicsItem.ItemIsSelectable |
+            QtWidgets.QGraphicsItem.ItemIsMovable
+        )
         self.setCacheMode(ITEM_CACHE_MODE)
         self.setZValue(Z_VAL_NODE)
         self._properties = {

NodeGraphQt/qgraphics/node_backdrop.py

@@ -18,9 +18,9 @@ class BackdropSizer(QtWidgets.QGraphicsItem):
 
     def __init__(self, parent=None, size=6.0):
         super(BackdropSizer, self).__init__(parent)
-        self.setFlag(self.ItemIsSelectable, True)
-        self.setFlag(self.ItemIsMovable, True)
-        self.setFlag(self.ItemSendsScenePositionChanges, True)
+        self.setFlag(QtWidgets.QGraphicsItem.ItemIsSelectable, True)
+        self.setFlag(QtWidgets.QGraphicsItem.ItemIsMovable, True)
+        self.setFlag(QtWidgets.QGraphicsItem.ItemSendsScenePositionChanges, True)
         self.setCursor(QtGui.QCursor(QtCore.Qt.SizeFDiagCursor))
         self.setToolTip('double-click auto resize')
         self._size = size
@@ -38,7 +38,7 @@ def boundingRect(self):
         return QtCore.QRectF(0.5, 0.5, self._size, self._size)
 
     def itemChange(self, change, value):
-        if change == self.ItemPositionChange:
+        if change == QtWidgets.QGraphicsItem.ItemPositionChange:
             item = self.parentItem()
             mx, my = item.minimum_size
             x = mx if value.x() < mx else value.x()

NodeGraphQt/qgraphics/node_base.py

@@ -258,7 +258,7 @@ def itemChange(self, change, value):
             change:
             value:
         """
-        if change == self.ItemSelectedChange and self.scene():
+        if change == QtWidgets.QGraphicsItem.ItemSelectedChange and self.scene():
             self.reset_pipes()
             if value:
                 self.highlight_pipes()

NodeGraphQt/qgraphics/node_overlay_disabled.py

@@ -87,7 +87,7 @@ def paint(self, painter, option, widget):
 
             painter.setFont(font)
             font_metrics = QtGui.QFontMetrics(font)
-            font_width = font_metrics.width(self.text)
+            font_width = font_metrics.horizontalAdvance(self.text)
             font_height = font_metrics.height()
             txt_w = font_width * 1.25
             txt_h = font_height * 2.25

NodeGraphQt/qgraphics/pipe.py

@@ -48,7 +48,9 @@ def __init__(self, input_port=None, output_port=None):
 
         self._dir_pointer = QtWidgets.QGraphicsPolygonItem(self)
         self._dir_pointer.setPolygon(self._poly)
-        self._dir_pointer.setFlag(self.ItemIsSelectable, False)
+        self._dir_pointer.setFlag(
+            QtWidgets.QGraphicsPathItem.ItemIsSelectable, False
+        )
 
         self.reset()
 
@@ -72,7 +74,7 @@ def hoverLeaveEvent(self, event):
             self.highlight()
 
     def itemChange(self, change, value):
-        if change == self.ItemSelectedChange and self.scene():
+        if change == QtWidgets.QGraphicsPathItem.ItemSelectedChange and self.scene():
             if value:
                 self.highlight()
             else:
@@ -100,7 +102,7 @@ def paint(self, painter, option, widget):
 
         painter.setPen(pen)
         painter.setBrush(self.brush())
-        painter.setRenderHint(painter.Antialiasing, True)
+        painter.setRenderHint(QtGui.QPainter.Antialiasing, True)
         painter.drawPath(self.path())
 
         # QPaintDevice: Cannot destroy paint device that is being painted.