Merge pull request #1 from jimkring/PySide2-to-PySide6-Upgrade

PySide2 to PySide6 upgrade

Author: Bryan Howard

main.py

@@ -1,6 +1,6 @@
 import sys
 
-from PySide2 import QtWidgets, QtCore, QtGui
+from PySide6 import QtWidgets, QtCore, QtGui
 
 import logging
 import os
@@ -61,5 +61,5 @@ def closeEvent(self, event):
     app.setPalette(palette)
     launcher = NodeEditor()
     launcher.show()
-    app.exec_()
+    app.exec()
     sys.exit()

node_editor/gui/connection.py

@@ -1,4 +1,4 @@
-from PySide2 import QtWidgets, QtGui, QtCore
+from PySide6 import QtWidgets, QtGui, QtCore
 
 
 class Connection(QtWidgets.QGraphicsPathItem):

node_editor/gui/node.py

@@ -1,4 +1,4 @@
-from PySide2 import QtWidgets, QtGui, QtCore
+from PySide6 import QtWidgets, QtGui, QtCore
 
 from node_editor.gui.port import Port
 
@@ -87,12 +87,12 @@ def build(self):
 
         # Get the dimentions of the title and type
         title_dim = {
-            "w": QtGui.QFontMetrics(title_font).width(self._title_text),
+            "w": QtGui.QFontMetrics(title_font).horizontalAdvance(self._title_text),
             "h": QtGui.QFontMetrics(title_font).height(),
         }
 
         title_type_dim = {
-            "w": QtGui.QFontMetrics(title_type_font).width("(" + self._type_text + ")"),
+            "w": QtGui.QFontMetrics(title_type_font).horizontalAdvance("(" + self._type_text + ")"),
             "h": QtGui.QFontMetrics(title_type_font).height(),
         }
 
@@ -108,7 +108,7 @@ def build(self):
         # Add the heigth for each of the ports
         for port in self._ports:
             port_dim = {
-                "w": QtGui.QFontMetrics(port_font).width(port.name()),
+                "w": QtGui.QFontMetrics(port_font).horizontalAdvance(port.name()),
                 "h": QtGui.QFontMetrics(port_font).height(),
             }
 

node_editor/gui/node_editor.py

@@ -1,4 +1,4 @@
-from PySide2 import QtWidgets, QtCore
+from PySide6 import QtWidgets, QtCore
 
 from node_editor.gui.connection import Connection
 from node_editor.gui.node import Node

node_editor/gui/node_list.py

@@ -1,4 +1,4 @@
-from PySide2 import QtWidgets, QtCore, QtGui
+from PySide6 import QtWidgets, QtCore, QtGui
 
 
 class NodeList(QtWidgets.QListWidget):

node_editor/gui/node_widget.py

@@ -1,6 +1,6 @@
-# from PySide2.QtWidgets import QWidget, QVBoxLayout, QGraphicsScene
+# from PySide6.QtWidgets import QWidget, QVBoxLayout, QGraphicsScene
 
-from PySide2 import QtWidgets, QtGui
+from PySide6 import QtWidgets, QtGui
 
 from node_editor.gui.view import View
 from node_editor.gui.node import Node

node_editor/gui/palette.py

@@ -1,6 +1,6 @@
-from PySide2 import QtGui
-from PySide2.QtGui import QPalette, QColor
-from PySide2.QtCore import Qt
+from PySide6 import QtGui
+from PySide6.QtGui import QPalette, QColor
+from PySide6.QtCore import Qt
 
 palette = QtGui.QPalette()
 

node_editor/gui/port.py

@@ -1,4 +1,4 @@
-from PySide2 import QtWidgets, QtGui, QtCore
+from PySide6 import QtWidgets, QtGui, QtCore
 
 
 class Port(QtWidgets.QGraphicsPathItem):
@@ -35,7 +35,7 @@ def set_is_output(self, is_output):
     def set_name(self, name):
         self._name = name
         nice_name = self._name.replace("_", " ").title()
-        self.port_text_width = self.font_metrics.width(nice_name)
+        self.port_text_width = self.font_metrics.horizontalAdvance(nice_name)
 
         if self._is_output:
             x = -self.radius_ - self.margin - self.port_text_width

node_editor/gui/view.py

@@ -1,4 +1,4 @@
-from PySide2 import QtCore, QtGui, QtWidgets, QtOpenGL
+from PySide6 import QtCore, QtGui, QtWidgets, QtOpenGLWidgets
 
 from node_editor.gui.connection import Connection
 from node_editor.gui.node import Node
@@ -22,9 +22,10 @@ def __init__(self, parent):
         self.setRenderHint(QtGui.QPainter.Antialiasing)
         self._manipulationMode = 0
 
-        gl_format = QtOpenGL.QGLFormat(QtOpenGL.QGL.SampleBuffers)
+        gl_format = QtGui.QSurfaceFormat()
         gl_format.setSamples(10)
-        gl_widget = QtOpenGL.QGLWidget(gl_format)
+        QtGui.QSurfaceFormat.setDefaultFormat(gl_format)
+        gl_widget = QtOpenGLWidgets.QOpenGLWidget()
 
         self.currentScale = 1
         self._pan = False

requirements.txt

@@ -1 +1 @@
-PySide2
+PySide6