small TargetItem fixes (#1715)
* angle is just an int, not a method * more TargetItem use in the example * offset is needed before super sometimes * use setLabel, too
This commit is contained in:
parent
dfa225f56f
commit
a465f93d9b
|
@ -32,33 +32,29 @@ p1.addItem(inf1)
|
||||||
p1.addItem(inf2)
|
p1.addItem(inf2)
|
||||||
p1.addItem(inf3)
|
p1.addItem(inf3)
|
||||||
|
|
||||||
targetItem1 = pg.TargetItem(
|
targetItem1 = pg.TargetItem()
|
||||||
label=True,
|
|
||||||
symbol="crosshair",
|
|
||||||
labelOpts={
|
|
||||||
"angle": 0
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
targetItem2 = pg.TargetItem(
|
targetItem2 = pg.TargetItem(
|
||||||
pos=(30, 5),
|
pos=(30, 5),
|
||||||
size=20,
|
size=20,
|
||||||
label="vert={1:0.2f}",
|
|
||||||
symbol="star",
|
symbol="star",
|
||||||
pen="#F4511E",
|
pen="#F4511E",
|
||||||
|
label="vert={1:0.2f}",
|
||||||
labelOpts={
|
labelOpts={
|
||||||
"angle": 45,
|
|
||||||
"offset": QtCore.QPoint(15, 15)
|
"offset": QtCore.QPoint(15, 15)
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
targetItem2.label().setAngle(45)
|
||||||
|
|
||||||
targetItem3 = pg.TargetItem(
|
targetItem3 = pg.TargetItem(
|
||||||
pos=(10, 10),
|
pos=(10, 10),
|
||||||
size=10,
|
size=10,
|
||||||
label="Third Label",
|
symbol="x",
|
||||||
symbol="x",
|
|
||||||
pen="#00ACC1",
|
pen="#00ACC1",
|
||||||
labelOpts={
|
)
|
||||||
|
targetItem3.setLabel(
|
||||||
|
"Third Label",
|
||||||
|
{
|
||||||
"anchor": QtCore.QPointF(0.5, 0.5),
|
"anchor": QtCore.QPointF(0.5, 0.5),
|
||||||
"offset": QtCore.QPointF(30, 0),
|
"offset": QtCore.QPointF(30, 0),
|
||||||
"color": "#558B2F",
|
"color": "#558B2F",
|
||||||
|
@ -66,6 +62,7 @@ targetItem3 = pg.TargetItem(
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def callableFunction(x, y):
|
def callableFunction(x, y):
|
||||||
return f"Square Values: ({x**2:.4f}, {y**2:.4f})"
|
return f"Square Values: ({x**2:.4f}, {y**2:.4f})"
|
||||||
|
|
||||||
|
|
|
@ -354,7 +354,7 @@ class TargetItem(UIGraphicsItem):
|
||||||
DeprecationWarning,
|
DeprecationWarning,
|
||||||
stacklevel=2,
|
stacklevel=2,
|
||||||
)
|
)
|
||||||
if self.label() is not None and angle != self.label().angle():
|
if self.label() is not None and angle != self.label().angle:
|
||||||
self.label().setAngle(angle)
|
self.label().setAngle(angle)
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
@ -393,11 +393,6 @@ class TargetLabel(TextItem):
|
||||||
anchor=(0, 0.5),
|
anchor=(0, 0.5),
|
||||||
**kwargs,
|
**kwargs,
|
||||||
):
|
):
|
||||||
super().__init__(anchor=anchor, **kwargs)
|
|
||||||
self.setParentItem(target)
|
|
||||||
self.target = target
|
|
||||||
self.setFormat(text)
|
|
||||||
|
|
||||||
if isinstance(offset, Point):
|
if isinstance(offset, Point):
|
||||||
self.offset = offset
|
self.offset = offset
|
||||||
elif isinstance(offset, (tuple, list)):
|
elif isinstance(offset, (tuple, list)):
|
||||||
|
@ -406,6 +401,12 @@ class TargetLabel(TextItem):
|
||||||
self.offset = Point(offset.x(), offset.y())
|
self.offset = Point(offset.x(), offset.y())
|
||||||
else:
|
else:
|
||||||
raise TypeError("Offset parameter is the wrong data type")
|
raise TypeError("Offset parameter is the wrong data type")
|
||||||
|
|
||||||
|
super().__init__(anchor=anchor, **kwargs)
|
||||||
|
self.setParentItem(target)
|
||||||
|
self.target = target
|
||||||
|
self.setFormat(text)
|
||||||
|
|
||||||
self.target.sigPositionChanged.connect(self.valueChanged)
|
self.target.sigPositionChanged.connect(self.valueChanged)
|
||||||
self.valueChanged()
|
self.valueChanged()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue