Skip to content

[FIX] Fix an error when using latest pyqtgraph develop snapshot #1662

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
lanzagar merged 2 commits into from
Oct 14, 2016
Merged

[FIX] Fix an error when using latest pyqtgraph develop snapshot #1662

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac4f269
owlinearprojection: Fix compatibility with development pyqtgraph
ales-erjavec Sep 20, 2016
461b846
owlinearprojection: Lock aspect ratio on the plot
ales-erjavec Oct 13, 2016
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
15 changes: 12 additions & 3 deletions Orange/widgets/visualize/owlinearprojection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,15 @@ def paint(self, painter, option, widget=None):
super().paint(painter, option, widget)


class TextItem(pg.TextItem):
if not hasattr(pg.TextItem, "setAnchor"):
# Compatibility with pyqtgraph <= 0.9.10; in (as of yet unreleased)
# 0.9.11 the TextItem has a `setAnchor`, but not `updateText`
def setAnchor(self, anchor):
self.anchor = pg.Point(anchor)
self.updateText()


class AxisItem(pg.GraphicsObject):
def __init__(self, parent=None, line=None, label=None, *args):
super().__init__(parent, *args)
Expand All @@ -119,7 +128,7 @@ def __init__(self, parent=None, line=None, label=None, *args):
self._arrow = pg.ArrowItem(parent=self, angle=180 - angle)
self._arrow.setPos(self._spine.line().p2())

self._label = pg.TextItem(text=label, color=(10, 10, 10))
self._label = TextItem(text=label, color=(10, 10, 10))
self._label.setParentItem(self)
self._label.setPos(self._spine.line().p2())

Expand Down Expand Up @@ -165,8 +174,7 @@ def __updateLabelPos(self):

pos = T.map(label_pos)
self._label.setPos(pos)
self._label.anchor = pg.Point(*anchor)
self._label.updateText()
self._label.setAnchor(pg.Point(*anchor))
self._label.setRotation(angle if left_quad else angle - 180)


Expand Down Expand Up @@ -400,6 +408,7 @@ def __init__(self):
self.view.setRenderHint(QtGui.QPainter.Antialiasing, True)
self.view.setFrameStyle(QtGui.QFrame.StyledPanel)
self.viewbox = pg.ViewBox(enableMouse=True, enableMenu=False)
self.viewbox.setAspectLocked(True)
self.viewbox.grabGesture(Qt.PinchGesture)
self.view.setCentralItem(self.viewbox)

Expand Down