Skip to content

[FIX] wrong handling of border.rectList with PySide6 backend #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jul 14, 2025
Merged

[FIX] wrong handling of border.rectList with PySide6 backend #103

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
44d9005
[FIX] wrong handling of border.rectList with PySide6 backend
martinschwinzerl Jul 11, 2025
0531934
[FIX] missing generator expression for all(isinstance) check
martinschwinzerl Jul 11, 2025
ab18915
[FIX] missing generator expression for all(isinstance) check
martinschwinzerl Jul 11, 2025
93b3c28
Merge remote-tracking branch 'origin/fix/102_test_stylesheet_fail_pys…
martinschwinzerl Jul 12, 2025
21333e9
Update plot_canvas.py
PierreRaybaut Jul 12, 2025
80ec6ce
[UPDATE] fix wrong attribute name
martinschwinzerl Jul 13, 2025
bdb7e43
[REFINE] improve drawRects method to handle QRect and sequence types
PierreRaybaut Jul 13, 2025
9d5ae0f
Remove unused `os` import
PierreRaybaut Jul 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions qwt/plot_canvas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
:members:
"""

import os
from collections.abc import Sequence

from qtpy.QtCore import QEvent, QObject, QPoint, QPointF, QRect, QRectF, QSize, Qt
from qtpy.QtGui import (
Expand All @@ -34,8 +34,6 @@
from qwt.null_paintdevice import QwtNullPaintDevice
from qwt.painter import QwtPainter

QT_API = os.environ["QT_API"]


class Border(object):
def __init__(self):
Expand Down Expand Up @@ -71,17 +69,15 @@ def updateState(self, state):
self.__origin = state.brushOrigin()

def drawRects(self, rects, count):
if QT_API.startswith("pyside"):
# Pyside
if isinstance(rects, (QRect, QRectF)):
self.border.list = [rects]
else:
for i in range(count):
self.border.rectList += [rects.getRect().index(i)]
if isinstance(rects, (QRect, QRectF)):
self.border.rectList = [QRectF(rects)]
elif isinstance(rects, Sequence):
self.border.rectList.extend(QRectF(rects[i]) for i in range(count))
else:
# PyQt
for i in range(count):
self.border.rectList += [rects[i]]
raise TypeError(
"drawRects() expects a QRect, QRectF or a sequence of them, "
f"but got {type(rects).__name__}"
)

def drawPath(self, path):
rect = QRectF(QPointF(0.0, 0.0), self.__size)
Expand Down