AaronFiore/electrum
1
0
Fork 0
Code Activity

python 3.10: fix some deprecation warnings and compat with 3.10

Browse Source
This commit is contained in:
SomberNight
2021-11-09 01:02:57 +01:00
parent ed0dd6eb22
commit 88a1c1a618
9 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum/gui/qt/qrreader/qtmultimedia/camera_dialog.py
View File

@@ -213,8 +213,8 @@ class QrReaderCameraDialog(Logger, MessageBoxMixin, QDialog):
"""
Returns a QRect that is scan_size x scan_size in the middle of the resolution
"""
scan_pos_x = (resolution.width() - scan_size) / 2
scan_pos_y = (resolution.height() - scan_size) / 2
scan_pos_x = (resolution.width() - scan_size) // 2
scan_pos_y = (resolution.height() - scan_size) // 2
return QRect(scan_pos_x, scan_pos_y, scan_size, scan_size)
@staticmethod

2
electrum/gui/qt/qrreader/qtmultimedia/video_overlay.py
View File

@@ -63,7 +63,7 @@ class QrReaderVideoOverlay(QWidget):
self.bg_rect_pen = QPen()
self.bg_rect_pen.setColor(Qt.black)
self.bg_rect_pen.setStyle(Qt.DotLine)
self.bg_rect_fill = QColor(255, 255, 255, 255 * self.BG_RECT_OPACITY)
self.bg_rect_fill = QColor(255, 255, 255, int(255 * self.BG_RECT_OPACITY))
def set_results(self, results: List[QrCodeResult], flip_x: bool,
validator_results: QrReaderValidatorResult):

2
electrum/gui/qt/qrreader/qtmultimedia/video_surface.py
View File

@@ -60,7 +60,7 @@ class QrReaderVideoSurface(QAbstractVideoSurface):
return False
try:
img = QImage(frame.bits(), frame.width(), frame.height(), image_format)
img = QImage(int(frame.bits()), frame.width(), frame.height(), image_format)
# Check whether we need to flip the image on any axis
surface_format = self.surfaceFormat()

16
electrum/gui/qt/util.py
View File

@@ -1175,8 +1175,8 @@ class FixedAspectRatioLayout(QLayout):
c_aratio = 1
s_aratio = self.aspect_ratio
item_rect = QRect(QPoint(0, 0), QSize(
contents.width() if c_aratio < s_aratio else contents.height() * s_aratio,
contents.height() if c_aratio > s_aratio else contents.width() / s_aratio
contents.width() if c_aratio < s_aratio else int(contents.height() * s_aratio),
contents.height() if c_aratio > s_aratio else int(contents.width() / s_aratio)
))
content_margins = self.contentsMargins()
@@ -1187,7 +1187,7 @@ class FixedAspectRatioLayout(QLayout):
if item.alignment() & Qt.AlignRight:
item_rect.moveRight(contents.width() + content_margins.right())
else:
item_rect.moveLeft(content_margins.left() + (free_space.width() / 2))
item_rect.moveLeft(content_margins.left() + (free_space.width() // 2))
else:
item_rect.moveLeft(content_margins.left())
@@ -1195,7 +1195,7 @@ class FixedAspectRatioLayout(QLayout):
if item.alignment() & Qt.AlignBottom:
item_rect.moveBottom(contents.height() + content_margins.bottom())
else:
item_rect.moveTop(content_margins.top() + (free_space.height() / 2))
item_rect.moveTop(content_margins.top() + (free_space.height() // 2))
else:
item_rect.moveTop(content_margins.top())
@@ -1224,10 +1224,10 @@ def QColorLerp(a: QColor, b: QColor, t: float):
t = max(min(t, 1.0), 0.0)
i_t = 1.0 - t
return QColor(
(a.red() * i_t) + (b.red() * t),
(a.green() * i_t) + (b.green() * t),
(a.blue() * i_t) + (b.blue() * t),
(a.alpha() * i_t) + (b.alpha() * t),
int((a.red() * i_t) + (b.red() * t)),
int((a.green() * i_t) + (b.green() * t)),
int((a.blue() * i_t) + (b.blue() * t)),
int((a.alpha() * i_t) + (b.alpha() * t)),
)