Skip to content

Commit 575a47e

Browse files
committed
fix PyQt5 OpenGL issues, target PySide6 for GitHub builds
1 parent c1ba9a3 commit 575a47e

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

src/CLGui/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66

77
pg.setConfigOption('background', clp.GRAPH_BG)
88
pg.setConfigOption('foreground', clp.GRAPH_FG)
9-
pg.setConfigOptions(useOpenGL=True)
9+
if pg.Qt.QT_LIB=='PySide6':
10+
pg.setConfigOptions(useOpenGL=True)
1011

1112

1213
# version of the pyqtgraph AxisItem that formats ticks with engineering notation prefixes (1e4 -> 10k)

src/requirements.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
numpy
22
scipy
3-
pyqt5 # should be able to use any standard Qt bindings. PyQt5 used for most development and testing
3+
pyside6 # should be able to use any standard Qt bindings. PySide6 used for default GitHub Windows builds
44
qtpy
55
pyqtgraph
6-
pyopengl
7-
matplotlib # replaced with pyqtgraph but pyqtgraph allows exporting to matplotlib, may remove that from right-click menu at some point
6+
pyopengl # OpenGL packages not actually needed for PyQt5
7+
pyopengl_accelerate
8+
matplotlib # replaced with pyqtgraph (for everything except for waterfall at this point) but pyqtgraph allows exporting to matplotlib, may remove that from right-click menu at some point
89
engineering_notation
910
requests
1011
pandas

0 commit comments

Comments
 (0)