Added support for PyQt6

Author: PierreRaybaut

CHANGELOG.md

@@ -1,8 +1,12 @@
 # PythonQwt Releases
 
+## Version 0.10.1
+
+- Added support for PyQt6.
+
 ## Version 0.10.0
 
-- Added support for QtPy 2, PyQt6 and PySide6.
+- Added support for QtPy 2 and PySide6.
 - Dropped support for Python 2.
 
 ## Version 0.9.2
@@ -12,18 +16,18 @@
 ## Version 0.9.1
 
 - Added load test showing a large number of plots (eventually highlights performance issues).
-- Fixed event management in `QwtPlot` and removed unnecessary `QEvent.LayoutRequest` 
+- Fixed event management in `QwtPlot` and removed unnecessary `QEvent.LayoutRequest`
   emission in `QwtScaleWidget` (caused high CPU usage with `guiqwt.ImageWidget`).
 - `QwtScaleDiv`: fixed ticks initialization when passing all arguments to constructor.
 - tests/image.py: fixed overriden `updateLegend` signature.
 
 ## Version 0.9.0
 
-- `QwtPlot`: set the `autoReplot` option at False by default, to avoid time consuming 
+- `QwtPlot`: set the `autoReplot` option at False by default, to avoid time consuming
   implicit plot updates.
-- Added `QwtPlotItem.setIcon` and `QwtPlotItem.icon` method for setting and getting the 
-  icon associated to the plot item (as of today, this feature is not strictly needed in 
-  PythonQwt: this has been implemented for several use cases in higher level libraries 
+- Added `QwtPlotItem.setIcon` and `QwtPlotItem.icon` method for setting and getting the
+  icon associated to the plot item (as of today, this feature is not strictly needed in
+  PythonQwt: this has been implemented for several use cases in higher level libraries
   (see PR #61).
 - Removed unused `QwtPlotItem.defaultIcon` method.
 - Added various minor optimizations for axes/ticks drawing features.
@@ -53,7 +57,7 @@
 
 - Added PySide2 support: PythonQwt is now compatible with Python 2.7, Python 3.4+,
   PyQt4, PyQt5 and PySide2!
-  
+
 ## Version 0.7.1
 
 - Changed QwtPlotItem.detachItems signature: removed unnecessary "autoDelete" argument,

doc/installation.rst

@@ -5,7 +5,7 @@ Dependencies
 ------------
 
 Requirements:
-    * Python 3.x (x>=4)
+    * Python 3.x (x>=6)
     * PyQt4 4.x (x>=4), PyQt5 5.x (x>=5), PyQt6 or PySide6
     * QtPy >= 1.3
     * NumPy 1.x (x>=5)

qwt/column_symbol.py

@@ -8,18 +8,18 @@
 from qwt.interval import QwtInterval
 
 from qtpy.QtGui import QPolygonF, QPalette
-from qtpy.QtCore import QRectF, Qt
+from qtpy.QtCore import QRectF, Qt, QLineF
 
 
 def qwtDrawBox(p, rect, pal, lw):
     if lw > 0.0:
         if rect.width() == 0.0:
             p.setPen(pal.dark().color())
-            p.drawLine(rect.topLeft(), rect.bottomLeft())
+            p.drawLine(QLineF(rect.topLeft(), rect.bottomLeft()))
             return
         if rect.height() == 0.0:
             p.setPen(pal.dark().color())
-            p.drawLine(rect.topLeft(), rect.topRight())
+            p.drawLine(QLineF(rect.topLeft(), rect.topRight()))
             return
         lw = min([lw, rect.height() / 2.0 - 1.0])
         lw = min([lw, rect.width() / 2.0 - 1.0])
@@ -40,11 +40,11 @@ def qwtDrawPanel(painter, rect, pal, lw):
     if lw > 0.0:
         if rect.width() == 0.0:
             painter.setPen(pal.window().color())
-            painter.drawLine(rect.topLeft(), rect.bottomLeft())
+            painter.drawLine(QLineF(rect.topLeft(), rect.bottomLeft()))
             return
         if rect.height() == 0.0:
             painter.setPen(pal.window().color())
-            painter.drawLine(rect.topLeft(), rect.topRight())
+            painter.drawLine(QLineF(rect.topLeft(), rect.topRight()))
             return
         lw = min([lw, rect.height() / 2.0 - 1.0])
         lw = min([lw, rect.width() / 2.0 - 1.0])

qwt/dyngrid_layout.py

@@ -25,7 +25,7 @@ def __init__(self):
         self.maxColumns = 0
         self.numRows = 0
         self.numColumns = 0
-        self.expanding = Qt.Orientations()
+        self.expanding = Qt.Horizontal
         self.itemSizeHints = []
         self.itemList = []
 
@@ -220,8 +220,8 @@ def layoutItems(self, rect, numColumns):
         rowHeight = [0] * numRows
         colWidth = [0] * numColumns
         self.layoutGrid(numColumns, rowHeight, colWidth)
-        expandH = self.expandingDirections() & Qt.Horizontal
-        expandV = self.expandingDirections() & Qt.Vertical
+        expandH = self.expandingDirections() == Qt.Horizontal
+        expandV = self.expandingDirections() == Qt.Vertical
         if expandH or expandV:
             self.stretchGrid(rect, numColumns, rowHeight, colWidth)
         maxColumns = self.__data.maxColumns
@@ -299,27 +299,26 @@ def stretchGrid(self, rect, numColumns, rowHeight, colWidth):
             return
         expandH = self.expandingDirections() & Qt.Horizontal
         expandV = self.expandingDirections() & Qt.Vertical
+        mleft, mtop, mright, mbottom = self.getContentsMargins()
         if expandH:
-            xDelta = (
-                rect.width() - 2 * self.margin() - (numColumns - 1) * self.spacing()
-            )
+            xDelta = rect.width() - (mleft + mright) - (numColumns - 1) * self.spacing()
             for col in range(numColumns):
                 xDelta -= colWidth[col]
             if xDelta > 0:
                 for col in range(numColumns):
-                    space = xDelta / (numColumns - col)
+                    space = xDelta // (numColumns - col)
                     colWidth[col] += space
                     xDelta -= space
         if expandV:
             numRows = self.itemCount() / numColumns
             if self.itemCount() % numColumns:
                 numRows += 1
-            yDelta = rect.height() - 2 * self.margin() - (numRows - 1) * self.spacing()
+            yDelta = rect.height() - (mtop + mbottom) - (numRows - 1) * self.spacing()
             for row in range(numRows):
                 yDelta -= rowHeight[row]
             if yDelta > 0:
                 for row in range(numRows):
-                    space = yDelta / (numRows - row)
+                    space = yDelta // (numRows - row)
                     rowHeight[row] += space
                     yDelta -= space
 

qwt/graphic.py

@@ -13,6 +13,7 @@
    :members:
 """
 
+import math
 from qwt.null_paintdevice import QwtNullPaintDevice
 from qwt.painter_command import QwtPainterCommand
 
@@ -26,8 +27,6 @@
 )
 from qtpy.QtCore import Qt, QRectF, QSizeF, QSize, QPointF, QRect
 
-import numpy as np
-
 
 def qwtHasScalablePen(painter):
     pen = painter.pen()
@@ -115,8 +114,6 @@ def qwtExecCommand(painter, cmd, renderHints, transform, initialTransform):
                 QPainter.Antialiasing,
                 QPainter.TextAntialiasing,
                 QPainter.SmoothPixmapTransform,
-                QPainter.HighQualityAntialiasing,
-                QPainter.NonCosmeticDefaultPen,
             ):
                 painter.setRenderHint(hint, bool(data.renderHints & hint))
         if data.flags & QPaintEngine.DirtyCompositionMode:
@@ -383,7 +380,7 @@ def scaledBoundingRect(self, sx, sy):
     def sizeMetrics(self):
         """Return Ceiled :py:meth:`defaultSize()`"""
         sz = self.defaultSize()
-        return QSize(np.ceil(sz.width()), np.ceil(sz.height()))
+        return QSize(math.ceil(sz.width()), math.ceil(sz.height()))
 
     def setDefaultSize(self, size):
         """
@@ -579,8 +576,8 @@ def toPixmap(self, *args):
             if self.isNull():
                 return QPixmap()
             sz = self.defaultSize()
-            w = np.ceil(sz.width())
-            h = np.ceil(sz.height())
+            w = math.ceil(sz.width())
+            h = math.ceil(sz.height())
             pixmap = QPixmap(w, h)
             pixmap.fill(Qt.transparent)
             r = QRectF(0.0, 0.0, sz.width(), sz.height())
@@ -640,8 +637,8 @@ def toImage(self, *args):
             if self.isNull():
                 return QImage()
             sz = self.defaultSize()
-            w = np.ceil(sz.width())
-            h = np.ceil(sz.height())
+            w = math.ceil(sz.width())
+            h = math.ceil(sz.height())
             image = QImage(w, h, QImage.Format_ARGB32)
             image.fill(0)
             r = QRect(0, 0, sz.width(), sz.height())

qwt/legend.py

@@ -308,7 +308,8 @@ def setSpacing(self, spacing):
         spacing = max([spacing, 0])
         if spacing != self.__data.spacing:
             self.__data.spacing = spacing
-            indent = self.margin() + self.__data.spacing
+            margin = max(self.getContentsMargins())
+            indent = margin + self.__data.spacing
             if self.__data.icon.width() > 0:
                 indent += self.__data.icon.width() + self.__data.spacing
             self.setIndent(indent)
@@ -948,8 +949,9 @@ def renderItem(self, painter, widget, rect, fillBackground):
         if label is not None:
             icon = label.data().icon()
             sz = icon.defaultSize()
+            margin = max(label.getContentsMargins())
             iconRect = QRectF(
-                rect.x() + label.margin(),
+                rect.x() + margin,
                 rect.center().y() - 0.5 * sz.height(),
                 sz.width(),
                 sz.height(),

qwt/painter.py

@@ -29,7 +29,7 @@
     QColor,
 )
 from qtpy.QtWidgets import QFrame, QStyle, QStyleOptionFocusRect, QStyleOption
-from qtpy.QtCore import Qt, QRect, QPoint, QRectF
+from qtpy.QtCore import Qt, QRect, QPoint, QRectF, QLineF
 from qtpy import QtCore as QC
 
 QT_MAJOR_VERSION = int(QC.__version__.split(".")[0])
@@ -384,7 +384,7 @@ def drawColorBar(self, painter, colorMap, interval, scaleMap, orientation, rect)
                 else:
                     c = colorTable[colorMap.colorIndex(interval, value)]
                 pmPainter.setPen(c)
-                pmPainter.drawLine(x, devRect.top(), x, devRect.bottom())
+                pmPainter.drawLine(QLineF(x, devRect.top(), x, devRect.bottom()))
         else:
             sMap = QwtScaleMap(scaleMap)
             sMap.setPaintInterval(rect.bottom(), rect.top())
@@ -395,7 +395,7 @@ def drawColorBar(self, painter, colorMap, interval, scaleMap, orientation, rect)
                 else:
                     c = colorTable[colorMap.colorIndex(interval, value)]
                 pmPainter.setPen(c)
-                pmPainter.drawLine(devRect.left(), y, devRect.right(), y)
+                pmPainter.drawLine(QLineF(devRect.left(), y, devRect.right(), y))
         pmPainter.end()
         self.drawPixmap(painter, rect, pixmap)
 

qwt/plot.py

@@ -19,6 +19,8 @@
    :members:
 """
 
+import math
+
 from qtpy.QtWidgets import (
     QWidget,
     QSizePolicy,
@@ -1388,7 +1390,7 @@ def updateCanvasMargins(self):
 
         for axisId in self.AXES:
             if margins[axisId] >= 0.0:
-                m = np.ceil(margins[axisId])
+                m = math.ceil(margins[axisId])
                 self.plotLayout().setCanvasMargin(m, axisId)
                 doUpdate = True
 
@@ -1520,7 +1522,7 @@ def canvasBackground(self):
 
             :py:meth:`setCanvasBackground()`
         """
-        return self.canvas().palette().brush(QPalette.Normal, QPalette.Window)
+        return self.canvas().palette().brush(QPalette.Active, QPalette.Window)
 
     def axisValid(self, axis_id):
         """

qwt/plot_canvas.py

@@ -133,15 +133,6 @@ def alignCornerRects(self, rect):
                 r.setBottom(rect.bottom())
 
 
-def _rects_conv_PyQt5(rects):
-    # PyQt5 compatibility: the conversion from QRect to QRectF should not
-    # be necessary but it seems to be anyway... PyQt5 bug?
-    if QT_API == "pyqt5":
-        return [QRectF(rect) for rect in rects]
-    else:
-        return rects
-
-
 def qwtDrawBackground(painter, canvas):
     painter.save()
     borderClip = canvas.borderPath(canvas.rect())
@@ -157,12 +148,7 @@ def qwtDrawBackground(painter, canvas):
         if brush.gradient().coordinateMode() == QGradient.ObjectBoundingMode:
             rects += [canvas.rect()]
         else:
-            clipregion = painter.clipRegion()
-            try:
-                rects += [clipregion.rects()]
-            except AttributeError:
-                # Qt6: no equivalent to 'rects' method...
-                rects += [clipregion.begin()]
+            rects += [painter.clipRegion().boundingRect()]
         useRaster = False
         if painter.paintEngine().type() == QPaintEngine.X11:
             useRaster = True
@@ -174,26 +160,22 @@ def qwtDrawBackground(painter, canvas):
                     format_ = QImage.Format_ARGB32
                     break
             image = QImage(canvas.size(), format_)
-            p = QPainter(image)
-            p.setPen(Qt.NoPen)
-            p.setBrush(brush)
-            p.drawRects(_rects_conv_PyQt5(rects))
-            p.end()
+            pntr = QPainter(image)
+            pntr.setPen(Qt.NoPen)
+            pntr.setBrush(brush)
+            for rect in rects:
+                pntr.drawRect(rect)
+            pntr.end()
             painter.drawImage(0, 0, image)
         else:
             painter.setPen(Qt.NoPen)
             painter.setBrush(brush)
-            painter.drawRects(_rects_conv_PyQt5(rects))
+            for rect in rects:
+                painter.drawRect(rect)
     else:
         painter.setPen(Qt.NoPen)
         painter.setBrush(brush)
-        clipregion = painter.clipRegion()
-        try:
-            rects = clipregion.rects()
-        except AttributeError:
-            # Qt6: no equivalent to 'rects' method...
-            rects = [clipregion.begin()]
-        painter.drawRects(_rects_conv_PyQt5(rects))
+        painter.drawRect(painter.clipRegion().boundingRect())
 
     painter.restore()
 
@@ -754,8 +736,14 @@ def drawBorder(self, painter):
         else:
             opt = QStyleOptionFrame()
             opt.initFrom(self)
-            frameShape = self.frameStyle() & QFrame.Shape_Mask
-            frameShadow = self.frameStyle() & QFrame.Shadow_Mask
+            try:
+                shape_mask = QFrame.Shape_Mask.value
+                shadow_mask = QFrame.Shadow_Mask.value
+            except AttributeError:
+                shape_mask = QFrame.Shape_Mask
+                shadow_mask = QFrame.Shadow_Mask
+            frameShape = self.frameStyle() & shape_mask
+            frameShadow = self.frameStyle() & shadow_mask
             opt.frameShape = QFrame.Shape(int(opt.frameShape) | frameShape)
             if frameShape in (
                 QFrame.Box,