Merge pull request #1139 from nstelter-slac/pyside6_upgrade_pt_1

Pyside6/Qt6 Upgrade Pt 1

pydm/about_pydm/about.py

@@ -1,12 +1,22 @@
 from qtpy.QtWidgets import QWidget, QTableWidgetItem
-from qtpy.QtCore import Qt, PYQT_VERSION_STR, qVersion
+from qtpy.QtCore import Qt, qVersion
 from .about_ui import Ui_Form
 from numpy import __version__ as numpyver
 from pyqtgraph import __version__ as pyqtgraphver
 import pydm
 import sys
 from os import path
 import inspect
+import qtpy
+
+# get Qt binding and version
+PYQT_VERSION = ""
+if "PyQt" in qtpy.API_NAME:
+    PYQT_VERSION = qtpy.QtCore.PYQT_VERSION_STR
+elif "PySide" in qtpy.API_NAME:
+    PYQT_VERSION = qtpy.QtCore.__version__
+else:
+    PYQT_VERSION = "Unknown version"
 
 
 class AboutWindow(QWidget):
@@ -18,7 +28,7 @@ def __init__(self, parent=None):
         pyver = ".".join([str(v) for v in sys.version_info[0:3]])
         self.ui.modulesVersionLabel.setText(
             str(self.ui.modulesVersionLabel.text()).format(
-                pyver=pyver, numpyver=numpyver, pyqtgraphver=pyqtgraphver, pyqtver=PYQT_VERSION_STR, qtver=qVersion()
+                pyver=pyver, numpyver=numpyver, pyqtgraphver=pyqtgraphver, pyqtver=PYQT_VERSION, qtver=qVersion()
             )
         )
         self.populate_external_tools_list()

pydm/connection_inspector/connection_table_model.py

@@ -1,4 +1,4 @@
-from qtpy.QtCore import QAbstractTableModel, Qt, QVariant, QTimer, Slot
+from qtpy.QtCore import QAbstractTableModel, Qt, QTimer, Slot
 from operator import attrgetter
 
 
@@ -47,17 +47,17 @@ def columnCount(self, parent=None):
 
     def data(self, index, role=Qt.DisplayRole):
         if not index.isValid():
-            return QVariant()
+            return None
         if index.row() >= self.rowCount():
-            return QVariant()
+            return None
         if index.column() >= self.columnCount():
-            return QVariant()
+            return None
         column_name = self._column_names[index.column()]
         conn = self.connections[index.row()]
         if role == Qt.DisplayRole or role == Qt.EditRole:
             return str(getattr(conn, column_name))
         else:
-            return QVariant()
+            return None
 
     def headerData(self, section, orientation, role=Qt.DisplayRole):
         if role != Qt.DisplayRole:

pydm/utilities/iconfont.py

@@ -9,7 +9,7 @@
 from typing import Optional
 
 from qtpy import QtGui, QtWidgets
-from qtpy.QtCore import QPoint, QRect, Qt, qRound
+from qtpy.QtCore import QPoint, QRect, Qt
 from qtpy.QtGui import QColor, QFont, QFontDatabase, QIcon, QIconEngine, QPainter, QPixmap
 
 if sys.version_info[0] == 3:
@@ -182,7 +182,7 @@ def paint(self, painter, rect, mode, state):
             color = self._base_color
         painter.setPen(color)
         scale_factor = 1.0
-        draw_size = 0.875 * qRound(rect.height() * scale_factor)
+        draw_size = 0.875 * round(rect.height() * scale_factor)
         painter.setFont(self.icon_font.font(draw_size))
         painter.setOpacity(1.0)
         painter.drawText(rect, int(Qt.AlignCenter | Qt.AlignVCenter), self.char)

pydm/widgets/axis_table_model.py

@@ -1,4 +1,4 @@
-from qtpy.QtCore import QAbstractTableModel, Qt, QModelIndex, QVariant
+from qtpy.QtCore import QAbstractTableModel, Qt, QModelIndex
 from .baseplot import BasePlotAxisItem
 
 
@@ -83,7 +83,7 @@ def setData(self, index, value, role=Qt.EditRole):
         column_name = self._column_names[index.column()]
         axis = self.plot._axes[index.row()]
         if role == Qt.EditRole:
-            if isinstance(value, QVariant):
+            if value is not None:
                 value = value.toString()
             if not self.set_data(column_name, axis, value):
                 return False

pydm/widgets/baseplot_table_model.py

@@ -1,4 +1,4 @@
-from qtpy.QtCore import QAbstractTableModel, Qt, QVariant, QModelIndex
+from qtpy.QtCore import QAbstractTableModel, Qt, QModelIndex
 from qtpy.QtGui import QBrush
 from .baseplot import BasePlotCurveItem
 
@@ -113,7 +113,7 @@ def setData(self, index, value, role=Qt.EditRole):
         column_name = self._column_names[index.column()]
         curve = self.plot._curves[index.row()]
         if role == Qt.EditRole:
-            if isinstance(value, QVariant):
+            if value is not None:
                 value = value.toString()
             if not self.set_data(column_name, curve, value):
                 return False

pydm/widgets/enum_combo_box.py

@@ -59,7 +59,7 @@ def addItem(self, text, userData=None):
         ----------
         text : str
             Title of the item
-        userData : QVariant
+        userData : object
             Arbitrary user data that is stored in the Qt.UserRole
         """
         super(PyDMEnumComboBox, self).addItem(text, userData)

pydm/widgets/eventplot_curve_editor.py

@@ -1,4 +1,4 @@
-from qtpy.QtCore import QModelIndex, QVariant
+from qtpy.QtCore import QModelIndex
 from .baseplot_table_model import BasePlotCurvesModel
 from .baseplot_curve_editor import BasePlotCurveEditorDialog, PlotStyleColumnDelegate
 
@@ -17,15 +17,15 @@ def __init__(self, plot, parent=None):
     def get_data(self, column_name, curve):
         if column_name == "Channel":
             if curve.address is None:
-                return QVariant()
+                return None
             return str(curve.address)
         elif column_name == "Y Index":
             if curve.y_idx is None:
-                return QVariant()
+                return None
             return curve.y_idx
         elif column_name == "X Index":
             if curve.x_idx is None:
-                return QVariant()
+                return None
             return curve.x_idx
         elif column_name == "Buffer Size":
             return curve.getBufferSize()

pydm/widgets/nt_table.py

@@ -53,19 +53,19 @@ def columnCount(self, parent=None):
 
     def data(self, index, role=QtCore.Qt.DisplayRole):
         if not index.isValid():
-            return QtCore.QVariant()
+            return None
         if index.row() >= self.rowCount():
-            return QtCore.QVariant()
+            return None
         if index.column() >= self.columnCount():
-            return QtCore.QVariant()
+            return None
         if role == QtCore.Qt.DisplayRole:
             try:
                 item = str(self._list[index.row()][index.column()])
             except IndexError:
                 item = ""
             return item
         else:
-            return QtCore.QVariant()
+            return None
 
     def setData(self, index, value, role=QtCore.Qt.EditRole):
         if self.edit_method is None:

pydm/widgets/scatterplot_curve_editor.py

@@ -1,4 +1,4 @@
-from qtpy.QtCore import QModelIndex, QVariant
+from qtpy.QtCore import QModelIndex
 from .baseplot_table_model import BasePlotCurvesModel
 from .baseplot_curve_editor import BasePlotCurveEditorDialog, PlotStyleColumnDelegate, RedrawModeColumnDelegate
 
@@ -17,11 +17,11 @@ def __init__(self, plot, parent=None):
     def get_data(self, column_name, curve):
         if column_name == "Y Channel":
             if curve.y_address is None:
-                return QVariant()
+                return None
             return str(curve.y_address)
         elif column_name == "X Channel":
             if curve.x_address is None:
-                return QVariant()
+                return None
             return str(curve.x_address)
         elif column_name == "Redraw Mode":
             return curve.redraw_mode

pydm/widgets/timeplot_curve_editor.py

@@ -1,4 +1,4 @@
-from qtpy.QtCore import QModelIndex, QObject, QVariant
+from qtpy.QtCore import QModelIndex, QObject
 from typing import Optional
 from .baseplot_table_model import BasePlotCurvesModel
 from .baseplot_curve_editor import BasePlotCurveEditorDialog, ColorColumnDelegate, PlotStyleColumnDelegate
@@ -13,7 +13,7 @@ def __init__(self, plot, parent=None):
     def get_data(self, column_name, curve):
         if column_name == "Channel":
             if curve.address is None:
-                return QVariant()
+                return None
             return str(curve.address)
         elif column_name == "Style":
             return curve.plot_style

pydm/widgets/waveformplot_curve_editor.py

@@ -1,4 +1,4 @@
-from qtpy.QtCore import QModelIndex, QObject, QVariant
+from qtpy.QtCore import QModelIndex, QObject
 from .baseplot_table_model import BasePlotCurvesModel
 from .baseplot_curve_editor import (
     BasePlotCurveEditorDialog,
@@ -23,11 +23,11 @@ def __init__(self, plot, parent=None):
     def get_data(self, column_name, curve):
         if column_name == "Y Channel":
             if curve.y_address is None:
-                return QVariant()
+                return None
             return str(curve.y_address)
         elif column_name == "X Channel":
             if curve.x_address is None:
-                return QVariant()
+                return None
             return str(curve.x_address)
         elif column_name == "Style":
             return curve.plot_style