You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gentoo-overlay/dev-python/pyqtgraph/files/pyqtgraph-0.12.2-fix-py3.10...

47 lines
1.7 KiB

From db8180d88ed37425467d030bebf7792c86691b83 Mon Sep 17 00:00:00 2001
From: Scott Talbert <swt@techie.net>
Date: Sun, 11 Jul 2021 22:04:00 -0400
Subject: [PATCH] Fix GLTextItem with Python 3.10
drawText() expects int arguments and Python 3.10 does not allow for
implicit rounding.
--- a/pyqtgraph/opengl/items/GLTextItem.py
+++ b/pyqtgraph/opengl/items/GLTextItem.py
@@ -68,15 +68,15 @@ def paint(self):
viewport = glGetIntegerv(GL_VIEWPORT)
text_pos = self.__project(self.pos, modelview, projection, viewport)
- text_pos[1] = viewport[3] - text_pos[1]
+ text_pos.setY(viewport[3] - text_pos.y())
text_pos /= self.view().devicePixelRatio()
painter = QtGui.QPainter(self.view())
painter.setPen(self.color)
painter.setFont(self.font)
painter.setRenderHints(QtGui.QPainter.RenderHint.Antialiasing | QtGui.QPainter.RenderHint.TextAntialiasing)
- painter.drawText(text_pos[0], text_pos[1], self.text)
+ painter.drawText(text_pos, self.text)
painter.end()
def __project(self, obj_pos, modelview, projection, viewport):
@@ -86,12 +86,11 @@ def __project(self, obj_pos, modelview, projection, viewport):
proj_vec = np.matmul(projection.T, view_vec)
if proj_vec[3] == 0.0:
- return
+ return QtCore.QPointF(0, 0)
proj_vec[0:3] /= proj_vec[3]
- return np.array([
- viewport[0] + (1.0 + proj_vec[0]) * viewport[2] / 2.0,
- viewport[1] + (1.0 + proj_vec[1]) * viewport[3] / 2.0,
- (1.0 + proj_vec[2]) / 2.0
- ])
+ return QtCore.QPointF(
+ viewport[0] + (1.0 + proj_vec[0]) * viewport[2] / 2,
+ viewport[1] + (1.0 + proj_vec[1]) * viewport[3] / 2
+ )