MAINT: port code from PySide2 to PySide6.

python/oddkiva/sara/__init__.py

@@ -1,8 +1,5 @@
 from oddkiva.sara.timer import *
 # The following imports may fail because PySide2 may not be available on recent
 # Python versions.
-try:
-    from oddkiva.sara.graphics import *
-except:
-    pass
+from oddkiva.sara.graphics import *
 from pysara_pybind11 import *

python/oddkiva/sara/graphics/__init__.py

@@ -1,5 +1,5 @@
-from PySide2.QtGui import QImage
-from PySide2.QtWidgets import QApplication
+from PySide6.QtGui import QImage
+from PySide6.QtWidgets import QApplication
 
 from oddkiva.sara.graphics.derived_qobjects.graphics_context import GraphicsContext
 import oddkiva.sara.graphics.image_draw as image_draw

python/oddkiva/sara/graphics/derived_qobjects/graphics_context.py

@@ -1,5 +1,5 @@
-from PySide2.QtCore import QObject, Qt
-from PySide2.QtWidgets import QApplication
+from PySide6.QtCore import QObject, Qt
+from PySide6.QtWidgets import QApplication
 
 from oddkiva.sara.graphics.derived_qobjects.painting_window import PaintingWindow
 from oddkiva.sara.graphics.derived_qobjects.user_thread import UserThread

python/oddkiva/sara/graphics/derived_qobjects/painting_window.py

@@ -1,7 +1,7 @@
-from PySide2.QtCore import (QObject, QPointF, QRectF, QTimer, Qt, qWarning,
+from PySide6.QtCore import (QObject, QPointF, QRectF, QTimer, Qt, qWarning,
                             Signal, Slot)
-from PySide2.QtWidgets import QApplication, QScrollArea, QWidget
-from PySide2.QtGui import QColor, QFont, QPainter, QPen, QPixmap
+from PySide6.QtWidgets import QApplication, QScrollArea, QWidget
+from PySide6.QtGui import QColor, QFont, QPainter, QPen, QPixmap
 
 
 class ScrollArea(QScrollArea):
@@ -60,8 +60,12 @@ def __init__(self, sizes, window_title="Sara", position=None, parent=None):
         self._scroll_area.setFocusProxy(self)
 
         # Maximize if necessary.
-        if w >= QApplication.instance().desktop().width() or \
-                h >= QApplication.instance().desktop().height():
+        w_screen, h_screen = QApplication.instance()\
+            .screens()[0]\
+            .size()\
+            .toTuple()
+        if w >= w_screen or \
+                h >= h_screen:
             self._scroll_area.showMaximized()
         # Resize the scroll area with the size plus a two-pixel offset.
         else:

python/oddkiva/sara/graphics/derived_qobjects/user_thread.py

@@ -1,5 +1,5 @@
-from PySide2.QtCore import QMutex, QObject, QThread, Qt, QWaitCondition, Signal
-from PySide2.QtWidgets import QApplication
+from PySide6.QtCore import QMutex, QObject, QThread, Qt, QWaitCondition, Signal
+from PySide6.QtWidgets import QApplication
 
 
 class UserThreadSignals(QObject):

python/oddkiva/sara/graphics/examples/hello_coordinate_systems.py

@@ -5,18 +5,18 @@
 
 import OpenGL.GL as gl
 
-from PySide2.QtCore import QObject, QElapsedTimer, QTimer
-from PySide2.QtGui import (QGuiApplication,
+from PySide6.QtCore import QObject, QElapsedTimer, QTimer
+from PySide6.QtGui import (QGuiApplication,
                            QImage,
                            QMatrix4x4,
-                           QOpenGLBuffer,
-                           QOpenGLShader,
-                           QOpenGLShaderProgram,
-                           QOpenGLTexture,
-                           QOpenGLVertexArrayObject,
-                           QOpenGLWindow,
                            QSurfaceFormat,
                            QVector3D)
+from PySide6.QtOpenGL import (QOpenGLBuffer,
+                              QOpenGLShader,
+                              QOpenGLShaderProgram,
+                              QOpenGLTexture,
+                              QOpenGLVertexArrayObject,
+                              QOpenGLWindow)
 
 
 DATA_DIR = path.join(path.dirname(__file__), '../../../../..', 'data')
@@ -155,7 +155,7 @@ def initialize_geometry_on_gpu(self):
             raise ValueError('Could not create VBO')
         self.vbo.bind()
         self.vbo.setUsagePattern(QOpenGLBuffer.StaticDraw)
-        vertices_data = self.vertices.tostring()
+        vertices_data = self.vertices.tobytes()
         self.vbo.allocate(len(vertices_data))
         self.vbo.write(0, vertices_data, len(vertices_data))
 
@@ -292,4 +292,4 @@ def cleanup():
 
     app.aboutToQuit.connect(cleanup)
 
-    sys.exit(app.exec_())
+    sys.exit(app.exec())

python/oddkiva/sara/graphics/examples/hello_sara.py

@@ -1,6 +1,6 @@
 import sys
 
-from PySide2.QtCore import Qt
+from PySide6.QtCore import Qt
 
 import numpy as np
 

python/oddkiva/sara/graphics/examples/hello_square.py

@@ -4,14 +4,14 @@
 
 import OpenGL.GL as gl
 
-from PySide2.QtCore import QObject
-from PySide2.QtGui import (QGuiApplication,
-                           QOpenGLBuffer,
-                           QOpenGLShader,
-                           QOpenGLShaderProgram,
-                           QOpenGLVertexArrayObject,
-                           QOpenGLWindow,
+from PySide6.QtCore import QObject
+from PySide6.QtGui import (QGuiApplication,
                            QSurfaceFormat)
+from PySide6.QtOpenGL import (QOpenGLBuffer,
+                              QOpenGLShader,
+                              QOpenGLShaderProgram,
+                              QOpenGLVertexArrayObject,
+                              QOpenGLWindow)
 
 
 class SquareObject(QObject):
@@ -161,4 +161,4 @@ def paintGL(self):
     win.resize(800, 600)
     win.show()
 
-    sys.exit(app.exec_())
+    sys.exit(app.exec())

python/oddkiva/sara/graphics/examples/hello_transformations.py

@@ -5,18 +5,18 @@
 
 import OpenGL.GL as gl
 
-from PySide2.QtCore import QObject, QElapsedTimer, QTimer
-from PySide2.QtGui import (QGuiApplication,
+from PySide6.QtCore import QObject, QElapsedTimer, QTimer
+from PySide6.QtGui import (QGuiApplication,
                            QImage,
                            QMatrix4x4,
-                           QOpenGLBuffer,
-                           QOpenGLShader,
-                           QOpenGLShaderProgram,
-                           QOpenGLTexture,
-                           QOpenGLVertexArrayObject,
-                           QOpenGLWindow,
                            QSurfaceFormat,
                            QVector3D)
+from PySide6.QtOpenGL import (QOpenGLBuffer,
+                              QOpenGLShader,
+                              QOpenGLShaderProgram,
+                              QOpenGLTexture,
+                              QOpenGLVertexArrayObject,
+                              QOpenGLWindow)
 
 
 DATA_DIR = path.join(path.dirname(__file__), '../../../../..', 'data')
@@ -128,7 +128,7 @@ def initialize_geometry_on_gpu(self):
             raise ValueError('Could not create VBO')
         self.vbo.bind()
         self.vbo.setUsagePattern(QOpenGLBuffer.StaticDraw)
-        vertices_data = self.vertices.tostring()
+        vertices_data = self.vertices.tobytes()
         self.vbo.allocate(len(vertices_data))
         self.vbo.write(0, vertices_data, len(vertices_data))
 
@@ -137,7 +137,7 @@ def initialize_geometry_on_gpu(self):
             raise ValueError('Could not create EBO')
         self.ebo.bind()
         self.ebo.setUsagePattern(QOpenGLBuffer.StaticDraw)
-        triangles_data = self.triangles.tostring()
+        triangles_data = self.triangles.tobytes()
         self.ebo.allocate(len(triangles_data))
         self.ebo.write(0, triangles_data, len(triangles_data))
 
@@ -260,4 +260,4 @@ def cleanup():
 
     app.aboutToQuit.connect(cleanup)
 
-    sys.exit(app.exec_())
+    sys.exit(app.exec())

python/oddkiva/sara/graphics/examples/hello_triangle.py

@@ -4,16 +4,16 @@
 
 import OpenGL.GL as gl
 
-from PySide2 import QtGui
+from PySide6 import QtGui, QtOpenGL
 
 
-class TriangleWindow(QtGui.QOpenGLWindow):
+class TriangleWindow(QtOpenGL.QOpenGLWindow):
 
     def __init__(self):
         super(TriangleWindow, self).__init__()
 
     def setup_shader_program(self):
-        self._program = QtGui.QOpenGLShaderProgram(self.context())
+        self._program = QtOpenGL.QOpenGLShaderProgram(self.context())
         self._vertex_shader = """
 #version 330 core
   layout (location = 0) in vec3 in_coords;
@@ -50,15 +50,15 @@ def setup_shader_program(self):
         self._arg_pos = {'in_coords': 0, 'in_color': 1, 'out_color': 0}
 
         self._program.addCacheableShaderFromSourceCode(
-            QtGui.QOpenGLShader.Vertex, self._vertex_shader)
+            QtOpenGL.QOpenGLShader.Vertex, self._vertex_shader)
         self._program.addCacheableShaderFromSourceCode(
-            QtGui.QOpenGLShader.Fragment, self._fragment_shader)
+            QtOpenGL.QOpenGLShader.Fragment, self._fragment_shader)
 
-        self._vao = QtGui.QOpenGLVertexArrayObject(self.context())
+        self._vao = QtOpenGL.QOpenGLVertexArrayObject(self.context())
         if not self._vao.create():
             raise QtCore.QException()
 
-        self._vbo = QtGui.QOpenGLBuffer()
+        self._vbo = QtOpenGL.QOpenGLBuffer()
         if not self._vbo.create():
             raise QtCore.QException()
 
@@ -72,7 +72,7 @@ def setup_shader_program(self):
         self._program.bind()
         self._vao.bind()
         self._vbo.bind()
-        self._vbo.setUsagePattern(QtGui.QOpenGLBuffer.StaticDraw)
+        self._vbo.setUsagePattern(QtOpenGL.QOpenGLBuffer.StaticDraw)
         self._vbo.allocate(len(self._data))
         self._vbo.write(0, self._data, len(self._data))
 
@@ -119,4 +119,4 @@ def paintGL(self):
     win.setFormat(format)
     win.show()
 
-    sys.exit(app.exec_())
+    sys.exit(app.exec())

python/oddkiva/sara/graphics/examples/hello_world.py

@@ -1,7 +1,7 @@
 import random
 import sys
 
-from PySide2 import QtCore, QtWidgets
+from PySide6 import QtCore, QtWidgets
 
 
 class MyWidget(QtWidgets.QWidget):
@@ -32,4 +32,4 @@ def magic(self):
     widget.resize(800, 600)
     widget.show()
 
-    sys.exit(app.exec_())
+    sys.exit(app.exec())

python/oddkiva/sara/graphics/image_draw.py

@@ -1,5 +1,5 @@
-from PySide2.QtCore import QPointF
-from PySide2.QtGui import QColor, QFont, QImage, QPainter, QPen
+from PySide6.QtCore import QPointF
+from PySide6.QtGui import QColor, QFont, QImage, QPainter, QPen
 
 
 def to_qimage(array):

requirements.txt

@@ -15,4 +15,4 @@ torchaudio==2.1.1
 coremltools
 
 PyOpenGL
-# PySide2
+pyside6