From 59fd72a3d1bb3d214e133b41727f9e70ecf85703 Mon Sep 17 00:00:00 2001 From: KIU Shueng Chuan Date: Sat, 23 Jan 2021 10:39:54 +0800 Subject: [PATCH] exampleLoaderTemplate.ui : add Qt6 and remove Qt4 --- examples/ScatterPlotSpeedTestTemplate_pyqt.py | 49 ---- .../ScatterPlotSpeedTestTemplate_pyside.py | 44 ---- examples/VideoTemplate_pyqt.py | 216 ------------------ examples/VideoTemplate_pyside.py | 203 ---------------- examples/exampleLoaderTemplate.ui | 20 +- examples/exampleLoaderTemplate_pyqt.py | 105 --------- examples/exampleLoaderTemplate_pyqt5.py | 11 +- examples/exampleLoaderTemplate_pyqt6.py | 10 +- examples/exampleLoaderTemplate_pyside.py | 94 -------- examples/exampleLoaderTemplate_pyside2.py | 18 +- examples/exampleLoaderTemplate_pyside6.py | 8 +- test.py | 14 +- 12 files changed, 38 insertions(+), 754 deletions(-) delete mode 100644 examples/ScatterPlotSpeedTestTemplate_pyqt.py delete mode 100644 examples/ScatterPlotSpeedTestTemplate_pyside.py delete mode 100644 examples/VideoTemplate_pyqt.py delete mode 100644 examples/VideoTemplate_pyside.py delete mode 100644 examples/exampleLoaderTemplate_pyqt.py delete mode 100644 examples/exampleLoaderTemplate_pyside.py diff --git a/examples/ScatterPlotSpeedTestTemplate_pyqt.py b/examples/ScatterPlotSpeedTestTemplate_pyqt.py deleted file mode 100644 index 896525eb..00000000 --- a/examples/ScatterPlotSpeedTestTemplate_pyqt.py +++ /dev/null @@ -1,49 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file './examples/ScatterPlotSpeedTestTemplate.ui' -# -# Created: Fri Sep 21 15:39:09 2012 -# by: PyQt4 UI code generator 4.9.1 -# -# WARNING! All changes made in this file will be lost! - -from PyQt4 import QtCore, QtGui - -try: - _fromUtf8 = QtCore.QString.fromUtf8 -except AttributeError: - _fromUtf8 = lambda s: s - -class Ui_Form(object): - def setupUi(self, Form): - Form.setObjectName(_fromUtf8("Form")) - Form.resize(400, 300) - self.gridLayout = QtGui.QGridLayout(Form) - self.gridLayout.setObjectName(_fromUtf8("gridLayout")) - self.sizeSpin = QtGui.QSpinBox(Form) - self.sizeSpin.setProperty("value", 10) - self.sizeSpin.setObjectName(_fromUtf8("sizeSpin")) - self.gridLayout.addWidget(self.sizeSpin, 1, 1, 1, 1) - self.pixelModeCheck = QtGui.QCheckBox(Form) - self.pixelModeCheck.setObjectName(_fromUtf8("pixelModeCheck")) - self.gridLayout.addWidget(self.pixelModeCheck, 1, 3, 1, 1) - self.label = QtGui.QLabel(Form) - self.label.setObjectName(_fromUtf8("label")) - self.gridLayout.addWidget(self.label, 1, 0, 1, 1) - self.plot = PlotWidget(Form) - self.plot.setObjectName(_fromUtf8("plot")) - self.gridLayout.addWidget(self.plot, 0, 0, 1, 4) - self.randCheck = QtGui.QCheckBox(Form) - self.randCheck.setObjectName(_fromUtf8("randCheck")) - self.gridLayout.addWidget(self.randCheck, 1, 2, 1, 1) - - self.retranslateUi(Form) - QtCore.QMetaObject.connectSlotsByName(Form) - - def retranslateUi(self, Form): - Form.setWindowTitle(QtGui.QApplication.translate("Form", "PyQtGraph", None, QtGui.QApplication.UnicodeUTF8)) - self.pixelModeCheck.setText(QtGui.QApplication.translate("Form", "pixel mode", None, QtGui.QApplication.UnicodeUTF8)) - self.label.setText(QtGui.QApplication.translate("Form", "Size", None, QtGui.QApplication.UnicodeUTF8)) - self.randCheck.setText(QtGui.QApplication.translate("Form", "Randomize", None, QtGui.QApplication.UnicodeUTF8)) - -from pyqtgraph import PlotWidget diff --git a/examples/ScatterPlotSpeedTestTemplate_pyside.py b/examples/ScatterPlotSpeedTestTemplate_pyside.py deleted file mode 100644 index 798ebccd..00000000 --- a/examples/ScatterPlotSpeedTestTemplate_pyside.py +++ /dev/null @@ -1,44 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file './examples/ScatterPlotSpeedTestTemplate.ui' -# -# Created: Fri Sep 21 15:39:09 2012 -# by: pyside-uic 0.2.13 running on PySide 1.1.0 -# -# WARNING! All changes made in this file will be lost! - -from PySide import QtCore, QtGui - -class Ui_Form(object): - def setupUi(self, Form): - Form.setObjectName("Form") - Form.resize(400, 300) - self.gridLayout = QtGui.QGridLayout(Form) - self.gridLayout.setObjectName("gridLayout") - self.sizeSpin = QtGui.QSpinBox(Form) - self.sizeSpin.setProperty("value", 10) - self.sizeSpin.setObjectName("sizeSpin") - self.gridLayout.addWidget(self.sizeSpin, 1, 1, 1, 1) - self.pixelModeCheck = QtGui.QCheckBox(Form) - self.pixelModeCheck.setObjectName("pixelModeCheck") - self.gridLayout.addWidget(self.pixelModeCheck, 1, 3, 1, 1) - self.label = QtGui.QLabel(Form) - self.label.setObjectName("label") - self.gridLayout.addWidget(self.label, 1, 0, 1, 1) - self.plot = PlotWidget(Form) - self.plot.setObjectName("plot") - self.gridLayout.addWidget(self.plot, 0, 0, 1, 4) - self.randCheck = QtGui.QCheckBox(Form) - self.randCheck.setObjectName("randCheck") - self.gridLayout.addWidget(self.randCheck, 1, 2, 1, 1) - - self.retranslateUi(Form) - QtCore.QMetaObject.connectSlotsByName(Form) - - def retranslateUi(self, Form): - Form.setWindowTitle(QtGui.QApplication.translate("Form", "PyQtGraph", None, QtGui.QApplication.UnicodeUTF8)) - self.pixelModeCheck.setText(QtGui.QApplication.translate("Form", "pixel mode", None, QtGui.QApplication.UnicodeUTF8)) - self.label.setText(QtGui.QApplication.translate("Form", "Size", None, QtGui.QApplication.UnicodeUTF8)) - self.randCheck.setText(QtGui.QApplication.translate("Form", "Randomize", None, QtGui.QApplication.UnicodeUTF8)) - -from pyqtgraph import PlotWidget diff --git a/examples/VideoTemplate_pyqt.py b/examples/VideoTemplate_pyqt.py deleted file mode 100644 index ecb69238..00000000 --- a/examples/VideoTemplate_pyqt.py +++ /dev/null @@ -1,216 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'examples/VideoTemplate.ui' -# -# Created by: PyQt4 UI code generator 4.11.4 -# -# WARNING! All changes made in this file will be lost! - -from PyQt4 import QtCore, QtGui - -try: - _fromUtf8 = QtCore.QString.fromUtf8 -except AttributeError: - def _fromUtf8(s): - return s - -try: - _encoding = QtGui.QApplication.UnicodeUTF8 - def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig, _encoding) -except AttributeError: - def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig) - -class Ui_MainWindow(object): - def setupUi(self, MainWindow): - MainWindow.setObjectName(_fromUtf8("MainWindow")) - MainWindow.resize(695, 798) - self.centralwidget = QtGui.QWidget(MainWindow) - self.centralwidget.setObjectName(_fromUtf8("centralwidget")) - self.gridLayout_2 = QtGui.QGridLayout(self.centralwidget) - self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2")) - self.cudaCheck = QtGui.QCheckBox(self.centralwidget) - self.cudaCheck.setObjectName(_fromUtf8("cudaCheck")) - self.gridLayout_2.addWidget(self.cudaCheck, 9, 0, 1, 2) - self.downsampleCheck = QtGui.QCheckBox(self.centralwidget) - self.downsampleCheck.setObjectName(_fromUtf8("downsampleCheck")) - self.gridLayout_2.addWidget(self.downsampleCheck, 8, 0, 1, 2) - self.scaleCheck = QtGui.QCheckBox(self.centralwidget) - self.scaleCheck.setObjectName(_fromUtf8("scaleCheck")) - self.gridLayout_2.addWidget(self.scaleCheck, 4, 0, 1, 1) - self.gridLayout = QtGui.QGridLayout() - self.gridLayout.setObjectName(_fromUtf8("gridLayout")) - self.rawRadio = QtGui.QRadioButton(self.centralwidget) - self.rawRadio.setObjectName(_fromUtf8("rawRadio")) - self.gridLayout.addWidget(self.rawRadio, 3, 0, 1, 1) - self.gfxRadio = QtGui.QRadioButton(self.centralwidget) - self.gfxRadio.setChecked(True) - self.gfxRadio.setObjectName(_fromUtf8("gfxRadio")) - self.gridLayout.addWidget(self.gfxRadio, 2, 0, 1, 1) - self.stack = QtGui.QStackedWidget(self.centralwidget) - self.stack.setObjectName(_fromUtf8("stack")) - self.page = QtGui.QWidget() - self.page.setObjectName(_fromUtf8("page")) - self.gridLayout_3 = QtGui.QGridLayout(self.page) - self.gridLayout_3.setObjectName(_fromUtf8("gridLayout_3")) - self.graphicsView = GraphicsView(self.page) - self.graphicsView.setObjectName(_fromUtf8("graphicsView")) - self.gridLayout_3.addWidget(self.graphicsView, 0, 0, 1, 1) - self.stack.addWidget(self.page) - self.page_2 = QtGui.QWidget() - self.page_2.setObjectName(_fromUtf8("page_2")) - self.gridLayout_4 = QtGui.QGridLayout(self.page_2) - self.gridLayout_4.setObjectName(_fromUtf8("gridLayout_4")) - self.rawImg = RawImageWidget(self.page_2) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.rawImg.sizePolicy().hasHeightForWidth()) - self.rawImg.setSizePolicy(sizePolicy) - self.rawImg.setObjectName(_fromUtf8("rawImg")) - self.gridLayout_4.addWidget(self.rawImg, 0, 0, 1, 1) - self.stack.addWidget(self.page_2) - self.gridLayout.addWidget(self.stack, 0, 0, 1, 1) - self.rawGLRadio = QtGui.QRadioButton(self.centralwidget) - self.rawGLRadio.setObjectName(_fromUtf8("rawGLRadio")) - self.gridLayout.addWidget(self.rawGLRadio, 4, 0, 1, 1) - self.gridLayout_2.addLayout(self.gridLayout, 1, 0, 1, 4) - self.dtypeCombo = QtGui.QComboBox(self.centralwidget) - self.dtypeCombo.setObjectName(_fromUtf8("dtypeCombo")) - self.dtypeCombo.addItem(_fromUtf8("")) - self.dtypeCombo.addItem(_fromUtf8("")) - self.dtypeCombo.addItem(_fromUtf8("")) - self.gridLayout_2.addWidget(self.dtypeCombo, 3, 2, 1, 1) - self.label = QtGui.QLabel(self.centralwidget) - self.label.setObjectName(_fromUtf8("label")) - self.gridLayout_2.addWidget(self.label, 3, 0, 1, 1) - self.rgbLevelsCheck = QtGui.QCheckBox(self.centralwidget) - self.rgbLevelsCheck.setObjectName(_fromUtf8("rgbLevelsCheck")) - self.gridLayout_2.addWidget(self.rgbLevelsCheck, 4, 1, 1, 1) - self.horizontalLayout_2 = QtGui.QHBoxLayout() - self.horizontalLayout_2.setObjectName(_fromUtf8("horizontalLayout_2")) - self.minSpin2 = SpinBox(self.centralwidget) - self.minSpin2.setEnabled(False) - self.minSpin2.setObjectName(_fromUtf8("minSpin2")) - self.horizontalLayout_2.addWidget(self.minSpin2) - self.label_3 = QtGui.QLabel(self.centralwidget) - self.label_3.setAlignment(QtCore.Qt.AlignCenter) - self.label_3.setObjectName(_fromUtf8("label_3")) - self.horizontalLayout_2.addWidget(self.label_3) - self.maxSpin2 = SpinBox(self.centralwidget) - self.maxSpin2.setEnabled(False) - self.maxSpin2.setObjectName(_fromUtf8("maxSpin2")) - self.horizontalLayout_2.addWidget(self.maxSpin2) - self.gridLayout_2.addLayout(self.horizontalLayout_2, 5, 2, 1, 1) - self.horizontalLayout = QtGui.QHBoxLayout() - self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout")) - self.minSpin1 = SpinBox(self.centralwidget) - self.minSpin1.setObjectName(_fromUtf8("minSpin1")) - self.horizontalLayout.addWidget(self.minSpin1) - self.label_2 = QtGui.QLabel(self.centralwidget) - self.label_2.setAlignment(QtCore.Qt.AlignCenter) - self.label_2.setObjectName(_fromUtf8("label_2")) - self.horizontalLayout.addWidget(self.label_2) - self.maxSpin1 = SpinBox(self.centralwidget) - self.maxSpin1.setObjectName(_fromUtf8("maxSpin1")) - self.horizontalLayout.addWidget(self.maxSpin1) - self.gridLayout_2.addLayout(self.horizontalLayout, 4, 2, 1, 1) - self.horizontalLayout_3 = QtGui.QHBoxLayout() - self.horizontalLayout_3.setObjectName(_fromUtf8("horizontalLayout_3")) - self.minSpin3 = SpinBox(self.centralwidget) - self.minSpin3.setEnabled(False) - self.minSpin3.setObjectName(_fromUtf8("minSpin3")) - self.horizontalLayout_3.addWidget(self.minSpin3) - self.label_4 = QtGui.QLabel(self.centralwidget) - self.label_4.setAlignment(QtCore.Qt.AlignCenter) - self.label_4.setObjectName(_fromUtf8("label_4")) - self.horizontalLayout_3.addWidget(self.label_4) - self.maxSpin3 = SpinBox(self.centralwidget) - self.maxSpin3.setEnabled(False) - self.maxSpin3.setObjectName(_fromUtf8("maxSpin3")) - self.horizontalLayout_3.addWidget(self.maxSpin3) - self.gridLayout_2.addLayout(self.horizontalLayout_3, 6, 2, 1, 1) - self.lutCheck = QtGui.QCheckBox(self.centralwidget) - self.lutCheck.setObjectName(_fromUtf8("lutCheck")) - self.gridLayout_2.addWidget(self.lutCheck, 7, 0, 1, 1) - self.alphaCheck = QtGui.QCheckBox(self.centralwidget) - self.alphaCheck.setObjectName(_fromUtf8("alphaCheck")) - self.gridLayout_2.addWidget(self.alphaCheck, 7, 1, 1, 1) - self.gradient = GradientWidget(self.centralwidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.gradient.sizePolicy().hasHeightForWidth()) - self.gradient.setSizePolicy(sizePolicy) - self.gradient.setObjectName(_fromUtf8("gradient")) - self.gridLayout_2.addWidget(self.gradient, 7, 2, 1, 2) - spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.gridLayout_2.addItem(spacerItem, 3, 3, 1, 1) - self.fpsLabel = QtGui.QLabel(self.centralwidget) - font = QtGui.QFont() - font.setPointSize(12) - self.fpsLabel.setFont(font) - self.fpsLabel.setAlignment(QtCore.Qt.AlignCenter) - self.fpsLabel.setObjectName(_fromUtf8("fpsLabel")) - self.gridLayout_2.addWidget(self.fpsLabel, 0, 0, 1, 4) - self.rgbCheck = QtGui.QCheckBox(self.centralwidget) - self.rgbCheck.setObjectName(_fromUtf8("rgbCheck")) - self.gridLayout_2.addWidget(self.rgbCheck, 3, 1, 1, 1) - self.label_5 = QtGui.QLabel(self.centralwidget) - self.label_5.setObjectName(_fromUtf8("label_5")) - self.gridLayout_2.addWidget(self.label_5, 2, 0, 1, 1) - self.horizontalLayout_4 = QtGui.QHBoxLayout() - self.horizontalLayout_4.setObjectName(_fromUtf8("horizontalLayout_4")) - self.framesSpin = QtGui.QSpinBox(self.centralwidget) - self.framesSpin.setButtonSymbols(QtGui.QAbstractSpinBox.NoButtons) - self.framesSpin.setProperty("value", 10) - self.framesSpin.setObjectName(_fromUtf8("framesSpin")) - self.horizontalLayout_4.addWidget(self.framesSpin) - self.widthSpin = QtGui.QSpinBox(self.centralwidget) - self.widthSpin.setButtonSymbols(QtGui.QAbstractSpinBox.PlusMinus) - self.widthSpin.setMaximum(10000) - self.widthSpin.setProperty("value", 512) - self.widthSpin.setObjectName(_fromUtf8("widthSpin")) - self.horizontalLayout_4.addWidget(self.widthSpin) - self.heightSpin = QtGui.QSpinBox(self.centralwidget) - self.heightSpin.setButtonSymbols(QtGui.QAbstractSpinBox.NoButtons) - self.heightSpin.setMaximum(10000) - self.heightSpin.setProperty("value", 512) - self.heightSpin.setObjectName(_fromUtf8("heightSpin")) - self.horizontalLayout_4.addWidget(self.heightSpin) - self.gridLayout_2.addLayout(self.horizontalLayout_4, 2, 1, 1, 2) - self.sizeLabel = QtGui.QLabel(self.centralwidget) - self.sizeLabel.setText(_fromUtf8("")) - self.sizeLabel.setObjectName(_fromUtf8("sizeLabel")) - self.gridLayout_2.addWidget(self.sizeLabel, 2, 3, 1, 1) - MainWindow.setCentralWidget(self.centralwidget) - - self.retranslateUi(MainWindow) - self.stack.setCurrentIndex(1) - QtCore.QMetaObject.connectSlotsByName(MainWindow) - - def retranslateUi(self, MainWindow): - MainWindow.setWindowTitle(_translate("MainWindow", "MainWindow", None)) - self.cudaCheck.setText(_translate("MainWindow", "Use CUDA (GPU) if available", None)) - self.downsampleCheck.setText(_translate("MainWindow", "Auto downsample", None)) - self.scaleCheck.setText(_translate("MainWindow", "Scale Data", None)) - self.rawRadio.setText(_translate("MainWindow", "RawImageWidget", None)) - self.gfxRadio.setText(_translate("MainWindow", "GraphicsView + ImageItem", None)) - self.rawGLRadio.setText(_translate("MainWindow", "RawGLImageWidget", None)) - self.dtypeCombo.setItemText(0, _translate("MainWindow", "uint8", None)) - self.dtypeCombo.setItemText(1, _translate("MainWindow", "uint16", None)) - self.dtypeCombo.setItemText(2, _translate("MainWindow", "float", None)) - self.label.setText(_translate("MainWindow", "Data type", None)) - self.rgbLevelsCheck.setText(_translate("MainWindow", "RGB", None)) - self.label_3.setText(_translate("MainWindow", "<--->", None)) - self.label_2.setText(_translate("MainWindow", "<--->", None)) - self.label_4.setText(_translate("MainWindow", "<--->", None)) - self.lutCheck.setText(_translate("MainWindow", "Use Lookup Table", None)) - self.alphaCheck.setText(_translate("MainWindow", "alpha", None)) - self.fpsLabel.setText(_translate("MainWindow", "FPS", None)) - self.rgbCheck.setText(_translate("MainWindow", "RGB", None)) - self.label_5.setText(_translate("MainWindow", "Image size", None)) - -from pyqtgraph import GradientWidget, GraphicsView, SpinBox -from pyqtgraph.widgets.RawImageWidget import RawImageWidget diff --git a/examples/VideoTemplate_pyside.py b/examples/VideoTemplate_pyside.py deleted file mode 100644 index 58617983..00000000 --- a/examples/VideoTemplate_pyside.py +++ /dev/null @@ -1,203 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'examples/VideoTemplate.ui' -# -# Created: Wed Oct 26 09:21:01 2016 -# by: pyside-uic 0.2.15 running on PySide 1.2.2 -# -# WARNING! All changes made in this file will be lost! - -from PySide import QtCore, QtGui - -class Ui_MainWindow(object): - def setupUi(self, MainWindow): - MainWindow.setObjectName("MainWindow") - MainWindow.resize(695, 798) - self.centralwidget = QtGui.QWidget(MainWindow) - self.centralwidget.setObjectName("centralwidget") - self.gridLayout_2 = QtGui.QGridLayout(self.centralwidget) - self.gridLayout_2.setObjectName("gridLayout_2") - self.cudaCheck = QtGui.QCheckBox(self.centralwidget) - self.cudaCheck.setObjectName("cudaCheck") - self.gridLayout_2.addWidget(self.cudaCheck, 9, 0, 1, 2) - self.downsampleCheck = QtGui.QCheckBox(self.centralwidget) - self.downsampleCheck.setObjectName("downsampleCheck") - self.gridLayout_2.addWidget(self.downsampleCheck, 8, 0, 1, 2) - self.scaleCheck = QtGui.QCheckBox(self.centralwidget) - self.scaleCheck.setObjectName("scaleCheck") - self.gridLayout_2.addWidget(self.scaleCheck, 4, 0, 1, 1) - self.gridLayout = QtGui.QGridLayout() - self.gridLayout.setObjectName("gridLayout") - self.rawRadio = QtGui.QRadioButton(self.centralwidget) - self.rawRadio.setObjectName("rawRadio") - self.gridLayout.addWidget(self.rawRadio, 3, 0, 1, 1) - self.gfxRadio = QtGui.QRadioButton(self.centralwidget) - self.gfxRadio.setChecked(True) - self.gfxRadio.setObjectName("gfxRadio") - self.gridLayout.addWidget(self.gfxRadio, 2, 0, 1, 1) - self.stack = QtGui.QStackedWidget(self.centralwidget) - self.stack.setObjectName("stack") - self.page = QtGui.QWidget() - self.page.setObjectName("page") - self.gridLayout_3 = QtGui.QGridLayout(self.page) - self.gridLayout_3.setObjectName("gridLayout_3") - self.graphicsView = GraphicsView(self.page) - self.graphicsView.setObjectName("graphicsView") - self.gridLayout_3.addWidget(self.graphicsView, 0, 0, 1, 1) - self.stack.addWidget(self.page) - self.page_2 = QtGui.QWidget() - self.page_2.setObjectName("page_2") - self.gridLayout_4 = QtGui.QGridLayout(self.page_2) - self.gridLayout_4.setObjectName("gridLayout_4") - self.rawImg = RawImageWidget(self.page_2) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.rawImg.sizePolicy().hasHeightForWidth()) - self.rawImg.setSizePolicy(sizePolicy) - self.rawImg.setObjectName("rawImg") - self.gridLayout_4.addWidget(self.rawImg, 0, 0, 1, 1) - self.stack.addWidget(self.page_2) - self.gridLayout.addWidget(self.stack, 0, 0, 1, 1) - self.rawGLRadio = QtGui.QRadioButton(self.centralwidget) - self.rawGLRadio.setObjectName("rawGLRadio") - self.gridLayout.addWidget(self.rawGLRadio, 4, 0, 1, 1) - self.gridLayout_2.addLayout(self.gridLayout, 1, 0, 1, 4) - self.dtypeCombo = QtGui.QComboBox(self.centralwidget) - self.dtypeCombo.setObjectName("dtypeCombo") - self.dtypeCombo.addItem("") - self.dtypeCombo.addItem("") - self.dtypeCombo.addItem("") - self.gridLayout_2.addWidget(self.dtypeCombo, 3, 2, 1, 1) - self.label = QtGui.QLabel(self.centralwidget) - self.label.setObjectName("label") - self.gridLayout_2.addWidget(self.label, 3, 0, 1, 1) - self.rgbLevelsCheck = QtGui.QCheckBox(self.centralwidget) - self.rgbLevelsCheck.setObjectName("rgbLevelsCheck") - self.gridLayout_2.addWidget(self.rgbLevelsCheck, 4, 1, 1, 1) - self.horizontalLayout_2 = QtGui.QHBoxLayout() - self.horizontalLayout_2.setObjectName("horizontalLayout_2") - self.minSpin2 = SpinBox(self.centralwidget) - self.minSpin2.setEnabled(False) - self.minSpin2.setObjectName("minSpin2") - self.horizontalLayout_2.addWidget(self.minSpin2) - self.label_3 = QtGui.QLabel(self.centralwidget) - self.label_3.setAlignment(QtCore.Qt.AlignCenter) - self.label_3.setObjectName("label_3") - self.horizontalLayout_2.addWidget(self.label_3) - self.maxSpin2 = SpinBox(self.centralwidget) - self.maxSpin2.setEnabled(False) - self.maxSpin2.setObjectName("maxSpin2") - self.horizontalLayout_2.addWidget(self.maxSpin2) - self.gridLayout_2.addLayout(self.horizontalLayout_2, 5, 2, 1, 1) - self.horizontalLayout = QtGui.QHBoxLayout() - self.horizontalLayout.setObjectName("horizontalLayout") - self.minSpin1 = SpinBox(self.centralwidget) - self.minSpin1.setObjectName("minSpin1") - self.horizontalLayout.addWidget(self.minSpin1) - self.label_2 = QtGui.QLabel(self.centralwidget) - self.label_2.setAlignment(QtCore.Qt.AlignCenter) - self.label_2.setObjectName("label_2") - self.horizontalLayout.addWidget(self.label_2) - self.maxSpin1 = SpinBox(self.centralwidget) - self.maxSpin1.setObjectName("maxSpin1") - self.horizontalLayout.addWidget(self.maxSpin1) - self.gridLayout_2.addLayout(self.horizontalLayout, 4, 2, 1, 1) - self.horizontalLayout_3 = QtGui.QHBoxLayout() - self.horizontalLayout_3.setObjectName("horizontalLayout_3") - self.minSpin3 = SpinBox(self.centralwidget) - self.minSpin3.setEnabled(False) - self.minSpin3.setObjectName("minSpin3") - self.horizontalLayout_3.addWidget(self.minSpin3) - self.label_4 = QtGui.QLabel(self.centralwidget) - self.label_4.setAlignment(QtCore.Qt.AlignCenter) - self.label_4.setObjectName("label_4") - self.horizontalLayout_3.addWidget(self.label_4) - self.maxSpin3 = SpinBox(self.centralwidget) - self.maxSpin3.setEnabled(False) - self.maxSpin3.setObjectName("maxSpin3") - self.horizontalLayout_3.addWidget(self.maxSpin3) - self.gridLayout_2.addLayout(self.horizontalLayout_3, 6, 2, 1, 1) - self.lutCheck = QtGui.QCheckBox(self.centralwidget) - self.lutCheck.setObjectName("lutCheck") - self.gridLayout_2.addWidget(self.lutCheck, 7, 0, 1, 1) - self.alphaCheck = QtGui.QCheckBox(self.centralwidget) - self.alphaCheck.setObjectName("alphaCheck") - self.gridLayout_2.addWidget(self.alphaCheck, 7, 1, 1, 1) - self.gradient = GradientWidget(self.centralwidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.gradient.sizePolicy().hasHeightForWidth()) - self.gradient.setSizePolicy(sizePolicy) - self.gradient.setObjectName("gradient") - self.gridLayout_2.addWidget(self.gradient, 7, 2, 1, 2) - spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.gridLayout_2.addItem(spacerItem, 3, 3, 1, 1) - self.fpsLabel = QtGui.QLabel(self.centralwidget) - font = QtGui.QFont() - font.setPointSize(12) - self.fpsLabel.setFont(font) - self.fpsLabel.setAlignment(QtCore.Qt.AlignCenter) - self.fpsLabel.setObjectName("fpsLabel") - self.gridLayout_2.addWidget(self.fpsLabel, 0, 0, 1, 4) - self.rgbCheck = QtGui.QCheckBox(self.centralwidget) - self.rgbCheck.setObjectName("rgbCheck") - self.gridLayout_2.addWidget(self.rgbCheck, 3, 1, 1, 1) - self.label_5 = QtGui.QLabel(self.centralwidget) - self.label_5.setObjectName("label_5") - self.gridLayout_2.addWidget(self.label_5, 2, 0, 1, 1) - self.horizontalLayout_4 = QtGui.QHBoxLayout() - self.horizontalLayout_4.setObjectName("horizontalLayout_4") - self.framesSpin = QtGui.QSpinBox(self.centralwidget) - self.framesSpin.setButtonSymbols(QtGui.QAbstractSpinBox.NoButtons) - self.framesSpin.setProperty("value", 10) - self.framesSpin.setObjectName("framesSpin") - self.horizontalLayout_4.addWidget(self.framesSpin) - self.widthSpin = QtGui.QSpinBox(self.centralwidget) - self.widthSpin.setButtonSymbols(QtGui.QAbstractSpinBox.PlusMinus) - self.widthSpin.setMaximum(10000) - self.widthSpin.setProperty("value", 512) - self.widthSpin.setObjectName("widthSpin") - self.horizontalLayout_4.addWidget(self.widthSpin) - self.heightSpin = QtGui.QSpinBox(self.centralwidget) - self.heightSpin.setButtonSymbols(QtGui.QAbstractSpinBox.NoButtons) - self.heightSpin.setMaximum(10000) - self.heightSpin.setProperty("value", 512) - self.heightSpin.setObjectName("heightSpin") - self.horizontalLayout_4.addWidget(self.heightSpin) - self.gridLayout_2.addLayout(self.horizontalLayout_4, 2, 1, 1, 2) - self.sizeLabel = QtGui.QLabel(self.centralwidget) - self.sizeLabel.setText("") - self.sizeLabel.setObjectName("sizeLabel") - self.gridLayout_2.addWidget(self.sizeLabel, 2, 3, 1, 1) - MainWindow.setCentralWidget(self.centralwidget) - - self.retranslateUi(MainWindow) - self.stack.setCurrentIndex(1) - QtCore.QMetaObject.connectSlotsByName(MainWindow) - - def retranslateUi(self, MainWindow): - MainWindow.setWindowTitle(QtGui.QApplication.translate("MainWindow", "MainWindow", None, QtGui.QApplication.UnicodeUTF8)) - self.cudaCheck.setText(QtGui.QApplication.translate("MainWindow", "Use CUDA (GPU) if available", None, QtGui.QApplication.UnicodeUTF8)) - self.downsampleCheck.setText(QtGui.QApplication.translate("MainWindow", "Auto downsample", None, QtGui.QApplication.UnicodeUTF8)) - self.scaleCheck.setText(QtGui.QApplication.translate("MainWindow", "Scale Data", None, QtGui.QApplication.UnicodeUTF8)) - self.rawRadio.setText(QtGui.QApplication.translate("MainWindow", "RawImageWidget", None, QtGui.QApplication.UnicodeUTF8)) - self.gfxRadio.setText(QtGui.QApplication.translate("MainWindow", "GraphicsView + ImageItem", None, QtGui.QApplication.UnicodeUTF8)) - self.rawGLRadio.setText(QtGui.QApplication.translate("MainWindow", "RawGLImageWidget", None, QtGui.QApplication.UnicodeUTF8)) - self.dtypeCombo.setItemText(0, QtGui.QApplication.translate("MainWindow", "uint8", None, QtGui.QApplication.UnicodeUTF8)) - self.dtypeCombo.setItemText(1, QtGui.QApplication.translate("MainWindow", "uint16", None, QtGui.QApplication.UnicodeUTF8)) - self.dtypeCombo.setItemText(2, QtGui.QApplication.translate("MainWindow", "float", None, QtGui.QApplication.UnicodeUTF8)) - self.label.setText(QtGui.QApplication.translate("MainWindow", "Data type", None, QtGui.QApplication.UnicodeUTF8)) - self.rgbLevelsCheck.setText(QtGui.QApplication.translate("MainWindow", "RGB", None, QtGui.QApplication.UnicodeUTF8)) - self.label_3.setText(QtGui.QApplication.translate("MainWindow", "<--->", None, QtGui.QApplication.UnicodeUTF8)) - self.label_2.setText(QtGui.QApplication.translate("MainWindow", "<--->", None, QtGui.QApplication.UnicodeUTF8)) - self.label_4.setText(QtGui.QApplication.translate("MainWindow", "<--->", None, QtGui.QApplication.UnicodeUTF8)) - self.lutCheck.setText(QtGui.QApplication.translate("MainWindow", "Use Lookup Table", None, QtGui.QApplication.UnicodeUTF8)) - self.alphaCheck.setText(QtGui.QApplication.translate("MainWindow", "alpha", None, QtGui.QApplication.UnicodeUTF8)) - self.fpsLabel.setText(QtGui.QApplication.translate("MainWindow", "FPS", None, QtGui.QApplication.UnicodeUTF8)) - self.rgbCheck.setText(QtGui.QApplication.translate("MainWindow", "RGB", None, QtGui.QApplication.UnicodeUTF8)) - self.label_5.setText(QtGui.QApplication.translate("MainWindow", "Image size", None, QtGui.QApplication.UnicodeUTF8)) - -from pyqtgraph.widgets.RawImageWidget import RawImageWidget -from pyqtgraph import SpinBox, GradientWidget, GraphicsView diff --git a/examples/exampleLoaderTemplate.ui b/examples/exampleLoaderTemplate.ui index 67ff5d5e..9d60ad4a 100644 --- a/examples/exampleLoaderTemplate.ui +++ b/examples/exampleLoaderTemplate.ui @@ -64,16 +64,6 @@ default - - - PyQt4 - - - - - PySide - - PyQt5 @@ -84,6 +74,16 @@ PySide2 + + + PySide6 + + + + + PyQt6 + + diff --git a/examples/exampleLoaderTemplate_pyqt.py b/examples/exampleLoaderTemplate_pyqt.py deleted file mode 100644 index c76d0f51..00000000 --- a/examples/exampleLoaderTemplate_pyqt.py +++ /dev/null @@ -1,105 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'examples/exampleLoaderTemplate.ui' -# -# Created by: PyQt4 UI code generator 4.11.4 -# -# WARNING! All changes made in this file will be lost! - -from PyQt4 import QtCore, QtGui - -try: - _fromUtf8 = QtCore.QString.fromUtf8 -except AttributeError: - def _fromUtf8(s): - return s - -try: - _encoding = QtGui.QApplication.UnicodeUTF8 - def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig, _encoding) -except AttributeError: - def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig) - -class Ui_Form(object): - def setupUi(self, Form): - Form.setObjectName(_fromUtf8("Form")) - Form.resize(846, 552) - self.gridLayout_2 = QtGui.QGridLayout(Form) - self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2")) - self.splitter = QtGui.QSplitter(Form) - self.splitter.setOrientation(QtCore.Qt.Horizontal) - self.splitter.setObjectName(_fromUtf8("splitter")) - self.widget = QtGui.QWidget(self.splitter) - self.widget.setObjectName(_fromUtf8("widget")) - self.gridLayout = QtGui.QGridLayout(self.widget) - self.gridLayout.setObjectName(_fromUtf8("gridLayout")) - self.exampleTree = QtGui.QTreeWidget(self.widget) - self.exampleTree.setObjectName(_fromUtf8("exampleTree")) - self.exampleTree.headerItem().setText(0, _fromUtf8("1")) - self.exampleTree.header().setVisible(False) - self.gridLayout.addWidget(self.exampleTree, 0, 0, 1, 2) - self.graphicsSystemCombo = QtGui.QComboBox(self.widget) - self.graphicsSystemCombo.setObjectName(_fromUtf8("graphicsSystemCombo")) - self.graphicsSystemCombo.addItem(_fromUtf8("")) - self.graphicsSystemCombo.addItem(_fromUtf8("")) - self.graphicsSystemCombo.addItem(_fromUtf8("")) - self.graphicsSystemCombo.addItem(_fromUtf8("")) - self.gridLayout.addWidget(self.graphicsSystemCombo, 2, 1, 1, 1) - self.qtLibCombo = QtGui.QComboBox(self.widget) - self.qtLibCombo.setObjectName(_fromUtf8("qtLibCombo")) - self.qtLibCombo.addItem(_fromUtf8("")) - self.qtLibCombo.addItem(_fromUtf8("")) - self.qtLibCombo.addItem(_fromUtf8("")) - self.qtLibCombo.addItem(_fromUtf8("")) - self.qtLibCombo.addItem(_fromUtf8("")) - self.gridLayout.addWidget(self.qtLibCombo, 1, 1, 1, 1) - self.label_2 = QtGui.QLabel(self.widget) - self.label_2.setObjectName(_fromUtf8("label_2")) - self.gridLayout.addWidget(self.label_2, 2, 0, 1, 1) - self.label = QtGui.QLabel(self.widget) - self.label.setObjectName(_fromUtf8("label")) - self.gridLayout.addWidget(self.label, 1, 0, 1, 1) - self.loadBtn = QtGui.QPushButton(self.widget) - self.loadBtn.setObjectName(_fromUtf8("loadBtn")) - self.gridLayout.addWidget(self.loadBtn, 3, 1, 1, 1) - self.widget1 = QtGui.QWidget(self.splitter) - self.widget1.setObjectName(_fromUtf8("widget1")) - self.verticalLayout = QtGui.QVBoxLayout(self.widget1) - self.verticalLayout.setObjectName(_fromUtf8("verticalLayout")) - self.loadedFileLabel = QtGui.QLabel(self.widget1) - font = QtGui.QFont() - font.setBold(True) - font.setWeight(75) - self.loadedFileLabel.setFont(font) - self.loadedFileLabel.setText(_fromUtf8("")) - self.loadedFileLabel.setAlignment(QtCore.Qt.AlignCenter) - self.loadedFileLabel.setObjectName(_fromUtf8("loadedFileLabel")) - self.verticalLayout.addWidget(self.loadedFileLabel) - self.codeView = QtGui.QPlainTextEdit(self.widget1) - font = QtGui.QFont() - font.setFamily(_fromUtf8("Courier New")) - self.codeView.setFont(font) - self.codeView.setObjectName(_fromUtf8("codeView")) - self.verticalLayout.addWidget(self.codeView) - self.gridLayout_2.addWidget(self.splitter, 0, 0, 1, 1) - - self.retranslateUi(Form) - QtCore.QMetaObject.connectSlotsByName(Form) - - def retranslateUi(self, Form): - Form.setWindowTitle(_translate("Form", "PyQtGraph", None)) - self.graphicsSystemCombo.setItemText(0, _translate("Form", "default", None)) - self.graphicsSystemCombo.setItemText(1, _translate("Form", "native", None)) - self.graphicsSystemCombo.setItemText(2, _translate("Form", "raster", None)) - self.graphicsSystemCombo.setItemText(3, _translate("Form", "opengl", None)) - self.qtLibCombo.setItemText(0, _translate("Form", "default", None)) - self.qtLibCombo.setItemText(1, _translate("Form", "PyQt4", None)) - self.qtLibCombo.setItemText(2, _translate("Form", "PySide", None)) - self.qtLibCombo.setItemText(3, _translate("Form", "PyQt5", None)) - self.qtLibCombo.setItemText(4, _translate("Form", "PySide2", None)) - self.label_2.setText(_translate("Form", "Graphics System:", None)) - self.label.setText(_translate("Form", "Qt Library:", None)) - self.loadBtn.setText(_translate("Form", "Run Example", None)) - diff --git a/examples/exampleLoaderTemplate_pyqt5.py b/examples/exampleLoaderTemplate_pyqt5.py index 669e1f34..22c0d2c4 100644 --- a/examples/exampleLoaderTemplate_pyqt5.py +++ b/examples/exampleLoaderTemplate_pyqt5.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'exampleLoaderTemplate.ui' # -# Created by: PyQt5 UI code generator 5.15.1 +# Created by: PyQt5 UI code generator 5.15.2 # # WARNING: Any manual changes made to this file will be lost when pyuic5 is # run again. Do not edit this file unless you know what you are doing. @@ -62,7 +62,6 @@ class Ui_Form(object): self.loadedFileLabel = QtWidgets.QLabel(self.widget1) font = QtGui.QFont() font.setBold(True) - font.setWeight(75) self.loadedFileLabel.setFont(font) self.loadedFileLabel.setText("") self.loadedFileLabel.setAlignment(QtCore.Qt.AlignCenter) @@ -87,10 +86,10 @@ class Ui_Form(object): self.graphicsSystemCombo.setItemText(2, _translate("Form", "raster")) self.graphicsSystemCombo.setItemText(3, _translate("Form", "opengl")) self.qtLibCombo.setItemText(0, _translate("Form", "default")) - self.qtLibCombo.setItemText(1, _translate("Form", "PyQt4")) - self.qtLibCombo.setItemText(2, _translate("Form", "PySide")) - self.qtLibCombo.setItemText(3, _translate("Form", "PyQt5")) - self.qtLibCombo.setItemText(4, _translate("Form", "PySide2")) + self.qtLibCombo.setItemText(1, _translate("Form", "PyQt5")) + self.qtLibCombo.setItemText(2, _translate("Form", "PySide2")) + self.qtLibCombo.setItemText(3, _translate("Form", "PySide6")) + self.qtLibCombo.setItemText(4, _translate("Form", "PyQt6")) self.label_2.setText(_translate("Form", "Graphics System:")) self.label.setText(_translate("Form", "Qt Library:")) self.loadBtn.setText(_translate("Form", "Run Example")) diff --git a/examples/exampleLoaderTemplate_pyqt6.py b/examples/exampleLoaderTemplate_pyqt6.py index dbfa5e08..f0b38e53 100644 --- a/examples/exampleLoaderTemplate_pyqt6.py +++ b/examples/exampleLoaderTemplate_pyqt6.py @@ -1,4 +1,4 @@ -# Form implementation generated from reading ui file 'examples\exampleLoaderTemplate.ui' +# Form implementation generated from reading ui file 'exampleLoaderTemplate.ui' # # Created by: PyQt6 UI code generator 6.0.0 # @@ -84,10 +84,10 @@ class Ui_Form(object): self.graphicsSystemCombo.setItemText(2, _translate("Form", "raster")) self.graphicsSystemCombo.setItemText(3, _translate("Form", "opengl")) self.qtLibCombo.setItemText(0, _translate("Form", "default")) - self.qtLibCombo.setItemText(1, _translate("Form", "PyQt4")) - self.qtLibCombo.setItemText(2, _translate("Form", "PySide")) - self.qtLibCombo.setItemText(3, _translate("Form", "PyQt5")) - self.qtLibCombo.setItemText(4, _translate("Form", "PySide2")) + self.qtLibCombo.setItemText(1, _translate("Form", "PyQt5")) + self.qtLibCombo.setItemText(2, _translate("Form", "PySide2")) + self.qtLibCombo.setItemText(3, _translate("Form", "PySide6")) + self.qtLibCombo.setItemText(4, _translate("Form", "PyQt6")) self.label_2.setText(_translate("Form", "Graphics System:")) self.label.setText(_translate("Form", "Qt Library:")) self.loadBtn.setText(_translate("Form", "Run Example")) diff --git a/examples/exampleLoaderTemplate_pyside.py b/examples/exampleLoaderTemplate_pyside.py deleted file mode 100644 index a8eb8529..00000000 --- a/examples/exampleLoaderTemplate_pyside.py +++ /dev/null @@ -1,94 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'exampleLoaderTemplate.ui' -# -# Created: Sun Oct 18 21:53:22 2020 -# by: pyside-uic 0.2.15 running on PySide 1.2.4 -# -# WARNING! All changes made in this file will be lost! - -from PySide import QtCore, QtGui - -class Ui_Form(object): - def setupUi(self, Form): - Form.setObjectName("Form") - Form.resize(846, 552) - self.gridLayout_2 = QtGui.QGridLayout(Form) - self.gridLayout_2.setObjectName("gridLayout_2") - self.splitter = QtGui.QSplitter(Form) - self.splitter.setOrientation(QtCore.Qt.Horizontal) - self.splitter.setObjectName("splitter") - self.widget = QtGui.QWidget(self.splitter) - self.widget.setObjectName("widget") - self.gridLayout = QtGui.QGridLayout(self.widget) - self.gridLayout.setContentsMargins(0, 0, 0, 0) - self.gridLayout.setObjectName("gridLayout") - self.exampleTree = QtGui.QTreeWidget(self.widget) - self.exampleTree.setObjectName("exampleTree") - self.exampleTree.headerItem().setText(0, "1") - self.exampleTree.header().setVisible(False) - self.gridLayout.addWidget(self.exampleTree, 0, 0, 1, 2) - self.graphicsSystemCombo = QtGui.QComboBox(self.widget) - self.graphicsSystemCombo.setObjectName("graphicsSystemCombo") - self.graphicsSystemCombo.addItem("") - self.graphicsSystemCombo.addItem("") - self.graphicsSystemCombo.addItem("") - self.graphicsSystemCombo.addItem("") - self.gridLayout.addWidget(self.graphicsSystemCombo, 2, 1, 1, 1) - self.qtLibCombo = QtGui.QComboBox(self.widget) - self.qtLibCombo.setObjectName("qtLibCombo") - self.qtLibCombo.addItem("") - self.qtLibCombo.addItem("") - self.qtLibCombo.addItem("") - self.qtLibCombo.addItem("") - self.qtLibCombo.addItem("") - self.gridLayout.addWidget(self.qtLibCombo, 1, 1, 1, 1) - self.label_2 = QtGui.QLabel(self.widget) - self.label_2.setObjectName("label_2") - self.gridLayout.addWidget(self.label_2, 2, 0, 1, 1) - self.label = QtGui.QLabel(self.widget) - self.label.setObjectName("label") - self.gridLayout.addWidget(self.label, 1, 0, 1, 1) - self.loadBtn = QtGui.QPushButton(self.widget) - self.loadBtn.setObjectName("loadBtn") - self.gridLayout.addWidget(self.loadBtn, 3, 1, 1, 1) - self.widget1 = QtGui.QWidget(self.splitter) - self.widget1.setObjectName("widget1") - self.verticalLayout = QtGui.QVBoxLayout(self.widget1) - self.verticalLayout.setContentsMargins(0, 0, 0, 0) - self.verticalLayout.setObjectName("verticalLayout") - self.loadedFileLabel = QtGui.QLabel(self.widget1) - font = QtGui.QFont() - font.setWeight(75) - font.setBold(True) - self.loadedFileLabel.setFont(font) - self.loadedFileLabel.setText("") - self.loadedFileLabel.setAlignment(QtCore.Qt.AlignCenter) - self.loadedFileLabel.setObjectName("loadedFileLabel") - self.verticalLayout.addWidget(self.loadedFileLabel) - self.codeView = QtGui.QPlainTextEdit(self.widget1) - font = QtGui.QFont() - font.setFamily("Courier New") - self.codeView.setFont(font) - self.codeView.setObjectName("codeView") - self.verticalLayout.addWidget(self.codeView) - self.gridLayout_2.addWidget(self.splitter, 0, 0, 1, 1) - - self.retranslateUi(Form) - QtCore.QMetaObject.connectSlotsByName(Form) - - def retranslateUi(self, Form): - Form.setWindowTitle(QtGui.QApplication.translate("Form", "PyQtGraph", None, QtGui.QApplication.UnicodeUTF8)) - self.graphicsSystemCombo.setItemText(0, QtGui.QApplication.translate("Form", "default", None, QtGui.QApplication.UnicodeUTF8)) - self.graphicsSystemCombo.setItemText(1, QtGui.QApplication.translate("Form", "native", None, QtGui.QApplication.UnicodeUTF8)) - self.graphicsSystemCombo.setItemText(2, QtGui.QApplication.translate("Form", "raster", None, QtGui.QApplication.UnicodeUTF8)) - self.graphicsSystemCombo.setItemText(3, QtGui.QApplication.translate("Form", "opengl", None, QtGui.QApplication.UnicodeUTF8)) - self.qtLibCombo.setItemText(0, QtGui.QApplication.translate("Form", "default", None, QtGui.QApplication.UnicodeUTF8)) - self.qtLibCombo.setItemText(1, QtGui.QApplication.translate("Form", "PyQt4", None, QtGui.QApplication.UnicodeUTF8)) - self.qtLibCombo.setItemText(2, QtGui.QApplication.translate("Form", "PySide", None, QtGui.QApplication.UnicodeUTF8)) - self.qtLibCombo.setItemText(3, QtGui.QApplication.translate("Form", "PyQt5", None, QtGui.QApplication.UnicodeUTF8)) - self.qtLibCombo.setItemText(4, QtGui.QApplication.translate("Form", "PySide2", None, QtGui.QApplication.UnicodeUTF8)) - self.label_2.setText(QtGui.QApplication.translate("Form", "Graphics System:", None, QtGui.QApplication.UnicodeUTF8)) - self.label.setText(QtGui.QApplication.translate("Form", "Qt Library:", None, QtGui.QApplication.UnicodeUTF8)) - self.loadBtn.setText(QtGui.QApplication.translate("Form", "Run Example", None, QtGui.QApplication.UnicodeUTF8)) - diff --git a/examples/exampleLoaderTemplate_pyside2.py b/examples/exampleLoaderTemplate_pyside2.py index a5a50f01..a3880681 100644 --- a/examples/exampleLoaderTemplate_pyside2.py +++ b/examples/exampleLoaderTemplate_pyside2.py @@ -3,16 +3,13 @@ ################################################################################ ## Form generated from reading UI file 'exampleLoaderTemplate.ui' ## -## Created by: Qt User Interface Compiler version 5.15.0 +## Created by: Qt User Interface Compiler version 5.15.2 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ -from PySide2.QtCore import (QCoreApplication, QDate, QDateTime, QMetaObject, - QObject, QPoint, QRect, QSize, QTime, QUrl, Qt) -from PySide2.QtGui import (QBrush, QColor, QConicalGradient, QCursor, QFont, - QFontDatabase, QIcon, QKeySequence, QLinearGradient, QPalette, QPainter, - QPixmap, QRadialGradient) +from PySide2.QtCore import * +from PySide2.QtGui import * from PySide2.QtWidgets import * @@ -84,7 +81,6 @@ class Ui_Form(object): self.loadedFileLabel.setObjectName(u"loadedFileLabel") font = QFont() font.setBold(True) - font.setWeight(75) self.loadedFileLabel.setFont(font) self.loadedFileLabel.setAlignment(Qt.AlignCenter) @@ -116,10 +112,10 @@ class Ui_Form(object): self.graphicsSystemCombo.setItemText(3, QCoreApplication.translate("Form", u"opengl", None)) self.qtLibCombo.setItemText(0, QCoreApplication.translate("Form", u"default", None)) - self.qtLibCombo.setItemText(1, QCoreApplication.translate("Form", u"PyQt4", None)) - self.qtLibCombo.setItemText(2, QCoreApplication.translate("Form", u"PySide", None)) - self.qtLibCombo.setItemText(3, QCoreApplication.translate("Form", u"PyQt5", None)) - self.qtLibCombo.setItemText(4, QCoreApplication.translate("Form", u"PySide2", None)) + self.qtLibCombo.setItemText(1, QCoreApplication.translate("Form", u"PyQt5", None)) + self.qtLibCombo.setItemText(2, QCoreApplication.translate("Form", u"PySide2", None)) + self.qtLibCombo.setItemText(3, QCoreApplication.translate("Form", u"PySide6", None)) + self.qtLibCombo.setItemText(4, QCoreApplication.translate("Form", u"PyQt6", None)) self.label_2.setText(QCoreApplication.translate("Form", u"Graphics System:", None)) self.label.setText(QCoreApplication.translate("Form", u"Qt Library:", None)) diff --git a/examples/exampleLoaderTemplate_pyside6.py b/examples/exampleLoaderTemplate_pyside6.py index ae31ebc0..5a24c659 100644 --- a/examples/exampleLoaderTemplate_pyside6.py +++ b/examples/exampleLoaderTemplate_pyside6.py @@ -112,10 +112,10 @@ class Ui_Form(object): self.graphicsSystemCombo.setItemText(3, QCoreApplication.translate("Form", u"opengl", None)) self.qtLibCombo.setItemText(0, QCoreApplication.translate("Form", u"default", None)) - self.qtLibCombo.setItemText(1, QCoreApplication.translate("Form", u"PyQt4", None)) - self.qtLibCombo.setItemText(2, QCoreApplication.translate("Form", u"PySide", None)) - self.qtLibCombo.setItemText(3, QCoreApplication.translate("Form", u"PyQt5", None)) - self.qtLibCombo.setItemText(4, QCoreApplication.translate("Form", u"PySide2", None)) + self.qtLibCombo.setItemText(1, QCoreApplication.translate("Form", u"PyQt5", None)) + self.qtLibCombo.setItemText(2, QCoreApplication.translate("Form", u"PySide2", None)) + self.qtLibCombo.setItemText(3, QCoreApplication.translate("Form", u"PySide6", None)) + self.qtLibCombo.setItemText(4, QCoreApplication.translate("Form", u"PyQt6", None)) self.label_2.setText(QCoreApplication.translate("Form", u"Graphics System:", None)) self.label.setText(QCoreApplication.translate("Form", u"Qt Library:", None)) diff --git a/test.py b/test.py index d2aeff5c..ab892457 100644 --- a/test.py +++ b/test.py @@ -6,18 +6,18 @@ import sys import pytest args = sys.argv[1:] -if '--pyside' in args: - args.remove('--pyside') - import PySide -elif '--pyqt4' in args: - args.remove('--pyqt4') - import PyQt4 -elif '--pyqt5' in args: +if '--pyqt5' in args: args.remove('--pyqt5') import PyQt5 elif '--pyside2' in args: args.remove('--pyside2') import PySide2 +elif '--pyside6' in args: + args.remove('--pyside6') + import PySide6 +elif '--pyqt6' in args: + args.remove('--pyqt6') + import PyQt6 import pyqtgraph as pg pg.systemInfo()