Skip to content

Commit 4805252

Browse files
committed
OWNomogram: PyQt4 compat way to query screeen avail geometry
1 parent 45d8402 commit 4805252

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

Orange/widgets/visualize/ownomogram.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
QGraphicsView, QGraphicsScene, QGraphicsItem, QGraphicsSimpleTextItem,
99
QGraphicsTextItem, QGraphicsLineItem, QGraphicsWidget, QGraphicsRectItem,
1010
QGraphicsEllipseItem, QGraphicsLinearLayout, QGridLayout, QLabel, QFrame,
11-
QSizePolicy, QApplication,
11+
QSizePolicy, QApplication, QDesktopWidget,
1212
)
1313
from AnyQt.QtGui import QColor, QPainter, QFont, QPen, QBrush
1414
from AnyQt.QtCore import Qt, QRectF, QSize
@@ -50,7 +50,7 @@ def show(self, pos, text, change_y=True):
5050
self.adjustSize()
5151

5252
x, y = pos.x(), (pos.y() + 15 if change_y else self.y())
53-
avail = QApplication.focusWindow().screen().availableGeometry()
53+
avail = QDesktopWidget().availableGeometry(self)
5454
if x + self.width() > avail.right():
5555
x -= self.width()
5656
if y + self.height() > avail.bottom():
@@ -113,7 +113,7 @@ def __init__(self, radius, scale, offset, min_x, max_x, title,
113113
self.setBrush(QColor(150, 150, 150, 255))
114114
self.setPen(QPen(QBrush(QColor(75, 75, 75, 255)), 2))
115115

116-
def move_to_sum(self, invisible_sum: float=None):
116+
def move_to_sum(self, invisible_sum: float = None):
117117
total = sum(item.value for item in self.movable_dot_items)
118118

119119
if invisible_sum is not None:

Orange/widgets/visualize/tests/test_ownomogram.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,16 @@
22
# pylint: disable=missing-docstring
33
import numpy as np
44

5+
from AnyQt.QtCore import QPoint
6+
57
from Orange.data import Table, Domain, ContinuousVariable, DiscreteVariable
68
from Orange.classification import (
79
NaiveBayesLearner, LogisticRegressionLearner, MajorityLearner
810
)
911
from Orange.widgets.tests.base import WidgetTest
1012
from Orange.widgets.visualize.ownomogram import (
11-
OWNomogram, DiscreteFeatureItem, ContinuousFeatureItem, ProbabilitiesDotItem
13+
OWNomogram, DiscreteFeatureItem, ContinuousFeatureItem, ProbabilitiesDotItem,
14+
MovableToolTip
1215
)
1316

1417

@@ -201,3 +204,8 @@ def _test_sort(self, names):
201204
ordered = [self.widget.nomogram_main.layout().itemAt(i).childItems()[0].toPlainText()
202205
for i in range(self.widget.nomogram_main.layout().count())]
203206
self.assertListEqual(names[i], ordered)
207+
208+
def test_tooltip(self):
209+
# had problems on PyQt4
210+
m = MovableToolTip()
211+
m.show(QPoint(0, 0), "Some text.")

0 commit comments

Comments
 (0)