pikers
/
piker
3
0
Fork 0
Code Issues 5 Pull Requests 7 Packages Projects Releases Wiki Activity

Don't delete pp lines or markers 

Bit of a face palm but obviously `LevelLine.delete()` also removes any
`._marker` from the view which makes it disappear permanently when
moving from non-zero to zero to non-zero positions.. We don't really
need to delete the line since it can be re-used so just remove that
code.

Further this patch removes marker style setting logic from within the
`pp_line()` factory and instead expects the caller to set the correct
"direction" (for long / short) afterward.
history_view
Tyler Goodlet 2022-09-19 13:11:08 -04:00
parent cf11e8d7d8
commit 5d65c86c84
1 changed files with 80 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
piker/ui/_position.py
View File

@ -68,7 +68,8 @@ async def update_pnl_from_feed(
tracker: PositionTracker, tracker: PositionTracker,
) -> None: ) -> None:
'''Real-time display the current pp's PnL in the appropriate label. '''
Real-time display the current pp's PnL in the appropriate label.
``ValueError`` if this task is spawned where there is a net-zero pp. ``ValueError`` if this task is spawned where there is a net-zero pp.
@ -412,9 +413,9 @@ def pp_line(
size: float, size: float,
level: float, level: float,
color: str, color: str,
marker: LevelMarker,
orient_v: str = 'bottom', orient_v: str = 'bottom',
marker: Optional[LevelMarker] = None,
) -> LevelLine: ) -> LevelLine:
''' '''
@ -445,16 +446,7 @@ def pp_line(
show_markers=False, show_markers=False,
) )
if marker: # TODO: use `LevelLine.add_marker()`` for this instead?
# configure marker to position data
if size > 0: # long
style = '|<' # point "up to" the line
elif size < 0: # short
style = '>|' # point "down to" the line
marker.style = style
# set marker color to same as line # set marker color to same as line
marker.setPen(line.currentPen) marker.setPen(line.currentPen)
marker.setBrush(fn.mkBrush(line.currentPen.color())) marker.setBrush(fn.mkBrush(line.currentPen.color()))
@ -469,8 +461,6 @@ def pp_line(
vb = line.getViewBox() vb = line.getViewBox()
vb.sigRangeChanged.connect(marker.position_in_view) vb.sigRangeChanged.connect(marker.position_in_view)
line.set_level(level)
return line return line
@ -497,16 +487,9 @@ def mk_level_marker(
# scale marker size with dpi-aware font size # scale marker size with dpi-aware font size
font_size = _font.font.pixelSize() font_size = _font.font.pixelSize()
arrow_size = floor(1.375 * font_size) arrow_size = floor(1.375 * font_size)
if size > 0:
style = '|<'
elif size < 0:
style = '>|'
arrow = LevelMarker( arrow = LevelMarker(
chart=chart, chart=chart,
style=style, style='|<', # actual style is set by caller based on size
get_level=level, get_level=level,
size=arrow_size, size=arrow_size,
on_paint=on_paint, on_paint=on_paint,
@ -562,10 +545,7 @@ class Nav(Struct):
self.lines[key] = line self.lines[key] = line
# modify existing indicator line # modify existing indicator line
else:
line.set_level(price) line.set_level(price)
level_marker.level = price
level_marker.update()
# update LHS sizing label # update LHS sizing label
line.update_labels({ line.update_labels({
@ -579,16 +559,29 @@ class Nav(Struct):
}) })
line.show() line.show()
# always show arrow-marker when a non-zero
# pos size.
level_marker.show()
# configure marker to position data
if size > 0: # long
# point "up to" the line
level_marker.style = '|<'
elif size < 0: # short
# point "down to" the line
level_marker.style = '>|'
# remove line from view for a net-zero pos # remove line from view for a net-zero pos
elif line: else:
line.delete() self.hide()
self.lines[key] = None
# label updates # label updates
size_label = self.size_labels[key] size_label = self.size_labels[key]
size_label.fields['slots_used'] = slots_used size_label.fields['slots_used'] = slots_used
size_label.render() size_label.render()
# set arrow marker to correct level
level_marker.level = price level_marker.level = price
# these updates are critical to avoid lag on view/scene changes # these updates are critical to avoid lag on view/scene changes
@ -646,6 +639,7 @@ class Nav(Struct):
# which itself eventually calls `.getAxis.pos().x()` and # which itself eventually calls `.getAxis.pos().x()` and
# it's THIS that needs to be called **AFTER** the sidepane # it's THIS that needs to be called **AFTER** the sidepane
# has been added.. # has been added..
level_marker.show()
level_marker.position_in_view() level_marker.position_in_view()
# labels # labels
@ -686,6 +680,7 @@ class Nav(Struct):
line, line,
level_marker, level_marker,
) in self.iter_ui_elements(): ) in self.iter_ui_elements():
pp_label.update() pp_label.update()
size_label.update() size_label.update()
@ -703,6 +698,7 @@ class Nav(Struct):
line, line,
level_marker, level_marker,
) in self.iter_ui_elements(): ) in self.iter_ui_elements():
size_label.hide() size_label.hide()
if line: if line:
line.hide_labels() line.hide_labels()
@ -710,8 +706,8 @@ class Nav(Struct):
class PositionTracker: class PositionTracker:
''' '''
Track and display real-time positions for a single symbol Track and display real-time positions for a single asset-symbol
over multiple accounts on a single chart. held in a single account, normally shown on a single chart.
Graphically composed of a level line and marker as well as labels Graphically composed of a level line and marker as well as labels
for indcating current position information. Updates are made to the for indcating current position information. Updates are made to the
@ -741,41 +737,6 @@ class PositionTracker:
for key, chart in nav.charts.items(): for key, chart in nav.charts.items():
view = chart.getViewBox() view = chart.getViewBox()
# literally the 'pp' (pee pee) "position price" label that's
# always in view
pp_label = Label(
view=view,
fmt_str='pp',
color=nav.color,
update_on_range_change=False,
)
# if nav._level_marker:
# nav._level_marker.delete()
pp_label.render()
nav.pp_labels[key] = pp_label
size_label = Label(
view=view,
color=self.nav.color,
# this is "static" label
# update_on_range_change=False,
fmt_str='\n'.join((
':{slots_used:.1f}x',
)),
fields={
'slots_used': 0,
},
)
size_label.render()
size_label.scene_anchor = partial(
pp_tight_and_right,
label=pp_label,
)
nav.size_labels[key] = size_label
arrow = mk_level_marker( arrow = mk_level_marker(
chart=chart, chart=chart,
size=1, size=1,
@ -804,6 +765,38 @@ class PositionTracker:
arrow.hide() # never show on startup arrow.hide() # never show on startup
nav.level_markers[key] = arrow nav.level_markers[key] = arrow
# literally the 'pp' (pee pee) "position price" label that's
# always in view
pp_label = Label(
view=view,
fmt_str='pp',
color=nav.color,
update_on_range_change=False,
)
pp_label.render()
nav.pp_labels[key] = pp_label
size_label = Label(
view=view,
color=self.nav.color,
# this is "static" label
# update_on_range_change=False,
fmt_str='\n'.join((
':{slots_used:.1f}x',
)),
fields={
'slots_used': 0,
},
)
size_label.render()
size_label.scene_anchor = partial(
pp_tight_and_right,
label=pp_label,
)
nav.size_labels[key] = size_label
pp_label.scene_anchor = partial( pp_label.scene_anchor = partial(
gpath_pin, gpath_pin,
gpath=arrow, gpath=arrow,
@ -879,13 +872,15 @@ class PositionTracker:
round(alloc.slots_used(pp), ndigits=1), # slots used round(alloc.slots_used(pp), ndigits=1), # slots used
) )
if pp.size == 0:
self.nav.hide()
else:
if self.live_pp.size: if self.live_pp.size:
# print("SHOWING NAV")
self.nav.show() self.nav.show()
# if pp.size == 0:
else:
# print("HIDING NAV")
self.nav.hide()
# don't show side and status widgets unless # don't show side and status widgets unless
# order mode is "engaged" (which done via input controls) # order mode is "engaged" (which done via input controls)
self.nav.hide_info() self.nav.hide_info()