|
|
7eda981 |
From 0aa77e876028017c8b3eb9e512960a807b4b0545 Mon Sep 17 00:00:00 2001
|
|
|
7eda981 |
From: Wilbert Berendsen <wbsoft@xs4all.nl>
|
|
|
7eda981 |
Date: Mon, 8 Nov 2021 09:27:44 +0100
|
|
|
7eda981 |
Subject: [PATCH] fix implicit conversions from float to int, those become
|
|
|
7eda981 |
unsupported in Python 3.10
|
|
|
7eda981 |
|
|
|
7eda981 |
---
|
|
|
7eda981 |
qpageview/magnifier.py | 4 ++--
|
|
|
7eda981 |
qpageview/page.py | 4 ++--
|
|
|
7eda981 |
qpageview/poppler.py | 6 +++---
|
|
|
7eda981 |
qpageview/render.py | 4 ++--
|
|
|
7eda981 |
qpageview/rubberband.py | 2 +-
|
|
|
7eda981 |
qpageview/scrollarea.py | 14 +++++++-------
|
|
|
7eda981 |
qpageview/shadow.py | 8 ++++----
|
|
|
7eda981 |
7 files changed, 21 insertions(+), 21 deletions(-)
|
|
|
7eda981 |
|
|
|
7eda981 |
diff --git frescobaldi_app/qpageview/magnifier.py frescobaldi_app/qpageview/magnifier.py
|
|
|
7eda981 |
index 31db533..532f0b6 100644
|
|
|
7eda981 |
--- frescobaldi_app/qpageview/magnifier.py
|
|
|
7eda981 |
+++ frescobaldi_app/qpageview/magnifier.py
|
|
|
7eda981 |
@@ -247,8 +247,8 @@ def wheelEvent(self, ev):
|
|
|
7eda981 |
factor = 1.1 ** (ev.angleDelta().y() / 120)
|
|
|
7eda981 |
g = self.geometry()
|
|
|
7eda981 |
c = g.center()
|
|
|
7eda981 |
- g.setWidth(min(max(g.width() * factor, self.MIN_SIZE), self.MAX_SIZE))
|
|
|
7eda981 |
- g.setHeight(min(max(g.height() * factor, self.MIN_SIZE), self.MAX_SIZE))
|
|
|
7eda981 |
+ g.setWidth(int(min(max(g.width() * factor, self.MIN_SIZE), self.MAX_SIZE)))
|
|
|
7eda981 |
+ g.setHeight(int(min(max(g.height() * factor, self.MIN_SIZE), self.MAX_SIZE)))
|
|
|
7eda981 |
g.moveCenter(c)
|
|
|
7eda981 |
self.setGeometry(g)
|
|
|
7eda981 |
else:
|
|
|
7eda981 |
diff --git frescobaldi_app/qpageview/page.py frescobaldi_app/qpageview/page.py
|
|
|
7eda981 |
index 6d26577..a2314fa 100644
|
|
|
7eda981 |
--- frescobaldi_app/qpageview/page.py
|
|
|
7eda981 |
+++ frescobaldi_app/qpageview/page.py
|
|
|
7eda981 |
@@ -300,7 +300,7 @@ def pdf(self, filename, rect=None, resolution=72.0, paperColor=None):
|
|
|
7eda981 |
|
|
|
7eda981 |
pdf = QPdfWriter(filename)
|
|
|
7eda981 |
pdf.setCreator("qpageview")
|
|
|
7eda981 |
- pdf.setResolution(resolution)
|
|
|
7eda981 |
+ pdf.setResolution(int(resolution))
|
|
|
7eda981 |
|
|
|
7eda981 |
layout = pdf.pageLayout()
|
|
|
7eda981 |
layout.setMode(layout.FullPageMode)
|
|
|
7eda981 |
@@ -364,7 +364,7 @@ def svg(self, filename, rect=None, resolution=72.0, paperColor=None):
|
|
|
7eda981 |
svg.setFileName(filename)
|
|
|
7eda981 |
else:
|
|
|
7eda981 |
svg.setOutputDevice(filename)
|
|
|
7eda981 |
- svg.setResolution(resolution)
|
|
|
7eda981 |
+ svg.setResolution(int(resolution))
|
|
|
7eda981 |
svg.setSize(targetSize.toSize())
|
|
|
7eda981 |
svg.setViewBox(QRectF(0, 0, targetSize.width(), targetSize.height()))
|
|
|
7eda981 |
return self.output(svg, source, paperColor)
|
|
|
7eda981 |
diff --git frescobaldi_app/qpageview/poppler.py frescobaldi_app/qpageview/poppler.py
|
|
|
7eda981 |
index 827ceb3..29122a9 100644
|
|
|
7eda981 |
--- frescobaldi_app/qpageview/poppler.py
|
|
|
7eda981 |
+++ frescobaldi_app/qpageview/poppler.py
|
|
|
7eda981 |
@@ -208,8 +208,8 @@ def render(self, page, key, tile, paperColor=None):
|
|
|
7eda981 |
key.rotation, paperColor)
|
|
|
7eda981 |
if multiplier == 2:
|
|
|
7eda981 |
image = image.scaledToWidth(tile.w, Qt.SmoothTransformation)
|
|
|
7eda981 |
- image.setDotsPerMeterX(xres * 39.37)
|
|
|
7eda981 |
- image.setDotsPerMeterY(yres * 39.37)
|
|
|
7eda981 |
+ image.setDotsPerMeterX(int(xres * 39.37))
|
|
|
7eda981 |
+ image.setDotsPerMeterY(int(yres * 39.37))
|
|
|
7eda981 |
return image
|
|
|
7eda981 |
|
|
|
7eda981 |
def setRenderHints(self, doc):
|
|
|
7eda981 |
@@ -262,7 +262,7 @@ def draw(self, page, painter, key, tile, paperColor=None):
|
|
|
7eda981 |
(See AbstractPage.print().)
|
|
|
7eda981 |
|
|
|
7eda981 |
"""
|
|
|
7eda981 |
- source = self.map(key, page.pageRect()).mapRect(QRectF(*tile))
|
|
|
7eda981 |
+ source = self.map(key, page.pageRect()).mapRect(QRectF(*tile)).toRect() # rounded
|
|
|
7eda981 |
target = QRectF(0, 0, tile.w, tile.h)
|
|
|
7eda981 |
if key.rotation & 1:
|
|
|
7eda981 |
target.setSize(target.size().transposed())
|
|
|
7eda981 |
diff --git frescobaldi_app/qpageview/render.py frescobaldi_app/qpageview/render.py
|
|
|
7eda981 |
index 935387b..e58a8ae 100644
|
|
|
7eda981 |
--- frescobaldi_app/qpageview/render.py
|
|
|
7eda981 |
+++ frescobaldi_app/qpageview/render.py
|
|
|
7eda981 |
@@ -250,7 +250,7 @@ def info(self, page, device, rect):
|
|
|
7eda981 |
key = self.key(page, ratio)
|
|
|
7eda981 |
|
|
|
7eda981 |
# paint rect in tile coordinates
|
|
|
7eda981 |
- target = QRect(rect.x() * ratio, rect.y() * ratio, rect.width() * ratio, rect.height() * ratio)
|
|
|
7eda981 |
+ target = QRect(int(rect.x() * ratio), int(rect.y() * ratio), int(rect.width() * ratio), int(rect.height() * ratio))
|
|
|
7eda981 |
|
|
|
7eda981 |
# tiles to paint
|
|
|
7eda981 |
tiles = [t for t in self.tiles(key.width, key.height) if QRect(*t) & target]
|
|
|
7eda981 |
@@ -327,7 +327,7 @@ def paint(self, page, painter, rect, callback=None):
|
|
|
7eda981 |
vscale = key.height / height
|
|
|
7eda981 |
for t in tileset:
|
|
|
7eda981 |
# scale to our image size
|
|
|
7eda981 |
- r = QRect(t.x * hscale, t.y * vscale, t.w * hscale, t.h * vscale) & target
|
|
|
7eda981 |
+ r = QRect(int(t.x * hscale), int(t.y * vscale), int(t.w * hscale), int(t.h * vscale)) & target
|
|
|
7eda981 |
if r and QRegion(r).subtracted(region):
|
|
|
7eda981 |
# we have an image that can be drawn in rect r
|
|
|
7eda981 |
source = QRectF(r.x() / hscale - t.x, r.y() / vscale - t.y,
|
|
|
7eda981 |
diff --git frescobaldi_app/qpageview/rubberband.py frescobaldi_app/qpageview/rubberband.py
|
|
|
7eda981 |
index e73b3e7..0677566 100644
|
|
|
7eda981 |
--- frescobaldi_app/qpageview/rubberband.py
|
|
|
7eda981 |
+++ frescobaldi_app/qpageview/rubberband.py
|
|
|
7eda981 |
@@ -97,7 +97,7 @@ def paintEvent(self, ev):
|
|
|
7eda981 |
color.setAlpha(150)
|
|
|
7eda981 |
painter.setPen(color)
|
|
|
7eda981 |
# XXX can this adjustment be done smarter?
|
|
|
7eda981 |
- adjust = -1 / self.devicePixelRatio()
|
|
|
7eda981 |
+ adjust = int(-1 / self.devicePixelRatio())
|
|
|
7eda981 |
painter.drawRect(self.rect().adjusted(0, 0, adjust, adjust))
|
|
|
7eda981 |
|
|
|
7eda981 |
# Pseudo-handles at the corners and sides
|
|
|
7eda981 |
diff --git frescobaldi_app/qpageview/scrollarea.py frescobaldi_app/qpageview/scrollarea.py
|
|
|
7eda981 |
index 7cbef83..be6d591 100644
|
|
|
7eda981 |
--- frescobaldi_app/qpageview/scrollarea.py
|
|
|
7eda981 |
+++ frescobaldi_app/qpageview/scrollarea.py
|
|
|
7eda981 |
@@ -253,7 +253,7 @@ def startScrolling(self, scroller):
|
|
|
7eda981 |
"""Begin a scrolling operation using the specified scroller."""
|
|
|
7eda981 |
self._scroller = scroller
|
|
|
7eda981 |
if self._scrollTimer is None:
|
|
|
7eda981 |
- self._scrollTimer = self.startTimer(1000 / self.scrollupdatespersec)
|
|
|
7eda981 |
+ self._scrollTimer = self.startTimer(int(1000 // self.scrollupdatespersec))
|
|
|
7eda981 |
|
|
|
7eda981 |
def stopScrolling(self):
|
|
|
7eda981 |
"""Stop scrolling."""
|
|
|
7eda981 |
@@ -323,9 +323,9 @@ def mouseReleaseEvent(self, ev):
|
|
|
7eda981 |
speed = speed * 1000 / self.scrollupdatespersec / time
|
|
|
7eda981 |
# compute diff to scroll
|
|
|
7eda981 |
sx = abs(speed.x())
|
|
|
7eda981 |
- diffx = sx * (sx + 1) / 2
|
|
|
7eda981 |
+ diffx = int(sx * (sx + 1) / 2)
|
|
|
7eda981 |
sy = abs(speed.y())
|
|
|
7eda981 |
- diffy = sy * (sy + 1) / 2
|
|
|
7eda981 |
+ diffy = int(sy * (sy + 1) / 2)
|
|
|
7eda981 |
if speed.x() < 0: diffx = -diffx
|
|
|
7eda981 |
if speed.y() < 0: diffy = -diffy
|
|
|
7eda981 |
self.kineticScrollBy(QPoint(diffx, diffy))
|
|
|
7eda981 |
@@ -438,8 +438,8 @@ def scrollBy(self, diff):
|
|
|
7eda981 |
dy = diff.y()
|
|
|
7eda981 |
|
|
|
7eda981 |
# solve speed*(speed+1)/2 = delta to ensure 1+2+3+...+speed is as close as possible under delta..
|
|
|
7eda981 |
- sx = (math.sqrt(1 + 8 * abs(dx)) - 1) // 2
|
|
|
7eda981 |
- sy = (math.sqrt(1 + 8 * abs(dy)) - 1) // 2
|
|
|
7eda981 |
+ sx = int(math.sqrt(1 + 8 * abs(dx)) - 1) // 2
|
|
|
7eda981 |
+ sy = int(math.sqrt(1 + 8 * abs(dy)) - 1) // 2
|
|
|
7eda981 |
|
|
|
7eda981 |
# compute the amount of displacement still needed because we're dealing with integer values.
|
|
|
7eda981 |
# Since this function is called for exact moves (not free scrolling)
|
|
|
7eda981 |
diff --git frescobaldi_app/qpageview/shadow.py frescobaldi_app/qpageview/shadow.py
|
|
|
7eda981 |
index 253fdd2..6e6e497 100644
|
|
|
7eda981 |
--- frescobaldi_app/qpageview/shadow.py
|
|
|
7eda981 |
+++ frescobaldi_app/qpageview/shadow.py
|
|
|
7eda981 |
@@ -39,10 +39,10 @@ class ShadowViewMixin:
|
|
|
7eda981 |
|
|
|
7eda981 |
def paintEvent(self, ev):
|
|
|
7eda981 |
if self.dropShadowEnabled:
|
|
|
7eda981 |
- width = self._pageLayout.spacing / 2
|
|
|
7eda981 |
+ width = round(self._pageLayout.spacing / 2.0)
|
|
|
7eda981 |
# make the rect slightly larger, so we "see" shadow of pages that
|
|
|
7eda981 |
# would be outside view normally.
|
|
|
7eda981 |
- rect = ev.rect().adjusted(-width, -width, width / 2, width / 2)
|
|
|
7eda981 |
+ rect = ev.rect().adjusted(-width, -width, int(width // 2), int(width // 2))
|
|
|
7eda981 |
painter = QPainter(self.viewport())
|
|
|
7eda981 |
for page, rect in self.pagesToPaint(rect, painter):
|
|
|
7eda981 |
self.drawDropShadow(page, painter, width)
|
|
|
7eda981 |
--- frescobaldi_app/qpageview/scrollarea.py~ 2022-01-05 13:01:08.498518802 -0600
|
|
|
7eda981 |
+++ frescobaldi_app/qpageview/scrollarea.py 2022-01-05 13:33:04.403443412 -0600
|
|
|
7eda981 |
@@ -186,9 +186,9 @@
|
|
|
7eda981 |
else:
|
|
|
7eda981 |
viewport = self.viewport()
|
|
|
7eda981 |
vbar.setRange(0, h - viewport.height())
|
|
|
7eda981 |
- vbar.setPageStep(viewport.height() * .9)
|
|
|
7eda981 |
+ vbar.setPageStep(int(viewport.height() * .9))
|
|
|
7eda981 |
hbar.setRange(0, w - viewport.width())
|
|
|
7eda981 |
- hbar.setPageStep(viewport.width() * .9)
|
|
|
7eda981 |
+ hbar.setPageStep(int(viewport.width() * .9))
|
|
|
7eda981 |
|
|
|
7eda981 |
def scrollOffset(self):
|
|
|
7eda981 |
"""Return the current scroll offset."""
|
|
|
7eda981 |
--- frescobaldi_app/qpageview/shadow.py~ 2022-01-05 13:01:08.498518802 -0600
|
|
|
7eda981 |
+++ frescobaldi_app/qpageview/shadow.py 2022-01-05 13:35:41.721596442 -0600
|
|
|
7eda981 |
@@ -53,14 +53,14 @@
|
|
|
7eda981 |
|
|
|
7eda981 |
"""
|
|
|
7eda981 |
width = round(width)
|
|
|
7eda981 |
- rect = page.rect().adjusted(width / 2, width / 2, 0, 0)
|
|
|
7eda981 |
+ rect = page.rect().adjusted(int(width // 2), int(width // 2), 0, 0)
|
|
|
7eda981 |
color = QColor(Qt.black)
|
|
|
7eda981 |
pen = QPen()
|
|
|
7eda981 |
pen.setWidth(1)
|
|
|
7eda981 |
pen.setJoinStyle(Qt.MiterJoin)
|
|
|
7eda981 |
for i in range(width):
|
|
|
7eda981 |
f = (width-i)/width
|
|
|
7eda981 |
- color.setAlpha(200**f + 55*f)
|
|
|
7eda981 |
+ color.setAlpha(int(200**f + 55*f))
|
|
|
7eda981 |
pen.setColor(color)
|
|
|
7eda981 |
painter.setPen(pen)
|
|
|
7eda981 |
painter.drawRect(rect.adjusted(-i, -i, i, i))
|