Skip to content

Commit

Permalink
Merge pull request #338 from pikers/update_last_datums_in_view
Browse files Browse the repository at this point in the history 
Fix: update last datums in view by `uppx` indexing
  • Loading branch information
@goodboy
goodboy authored Jun 10, 2022
2 parents 633fa7c + 8eb4a42 commit 7ddebf6
Show file tree
Hide file tree
Showing 3 changed files with 170 additions and 113 deletions.
22 changes: 11 additions & 11 deletions piker/ui/_curve.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -379,17 +379,17 @@ def draw_last_datum(

) -> None:
# default line draw last call
with self.reset_cache():
x = render_data['index']
y = render_data[array_key]

# draw the "current" step graphic segment so it
# lines up with the "middle" of the current
# (OHLC) sample.
self._last_line = QLineF(
x[-2], y[-2],
x[-1], y[-1],
)
# with self.reset_cache():
x = render_data['index']
y = render_data[array_key]

# draw the "current" step graphic segment so it
# lines up with the "middle" of the current
# (OHLC) sample.
self._last_line = QLineF(
x[-2], y[-2],
x[-1], y[-1],
)

return x, y

Expand Down
191 changes: 106 additions & 85 deletions piker/ui/_display.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,71 +426,6 @@ def graphics_update_cycle(

profiler('view incremented')

if vlm_chart:
# always update y-label
ds.vlm_sticky.update_from_data(
*array[-1][['index', 'volume']]
)

if (
(
do_rt_update
or do_append
and liv
)
or trigger_all
):
# TODO: make it so this doesn't have to be called
# once the $vlm is up?
vlm_chart.update_graphics_from_flow(
'volume',
# UGGGh, see ``maxmin()`` impl in `._fsp` for
# the overlayed plotitems... we need a better
# bay to invoke a maxmin per overlay..
render=False,
# XXX: ^^^^ THIS IS SUPER IMPORTANT! ^^^^
# without this, since we disable the
# 'volume' (units) chart after the $vlm starts
# up we need to be sure to enable this
# auto-ranging otherwise there will be no handler
# connected to update accompanying overlay
# graphics..
)
profiler('`vlm_chart.update_graphics_from_flow()`')

if (
mx_vlm_in_view != vars['last_mx_vlm']
):
yrange = (0, mx_vlm_in_view * 1.375)
vlm_chart.view._set_yrange(
yrange=yrange,
)
profiler('`vlm_chart.view._set_yrange()`')
# print(f'mx vlm: {last_mx_vlm} -> {mx_vlm_in_view}')
vars['last_mx_vlm'] = mx_vlm_in_view

for curve_name, flow in vlm_chart._flows.items():

if not flow.render:
continue

update_fsp_chart(
vlm_chart,
flow,
curve_name,
array_key=curve_name,
# do_append=uppx < update_uppx,
do_append=do_append,
)
# is this even doing anything?
# (pretty sure it's the real-time
# resizing from last quote?)
fvb = flow.plot.vb
fvb._set_yrange(
# autoscale_linked_plots=False,
name=curve_name,
)

ticks_frame = quote.get('ticks', ())

frames_by_type: dict[str, dict] = {}
Expand Down Expand Up @@ -540,15 +475,16 @@ def graphics_update_cycle(
or do_append
or trigger_all
):
# TODO: we should always update the "last" datum
# since the current range should at least be updated
# to it's max/min on the last pixel.
chart.update_graphics_from_flow(
chart.name,
# do_append=uppx < update_uppx,
do_append=do_append,
)

# NOTE: we always update the "last" datum
# since the current range should at least be updated
# to it's max/min on the last pixel.

# iterate in FIFO order per tick-frame
for typ, tick in lasts.items():

Expand Down Expand Up @@ -653,31 +589,116 @@ def graphics_update_cycle(
vars['last_mx'], vars['last_mn'] = mx, mn

# run synchronous update on all linked flows
# TODO: should the "main" (aka source) flow be special?
for curve_name, flow in chart._flows.items():
# update any overlayed fsp flows
if curve_name != chart.data_key:
update_fsp_chart(
chart,
flow,
curve_name,
array_key=curve_name,
)

# even if we're downsampled bigly
# draw the last datum in the final
# px column to give the user the mx/mn
# range of that set.
if (
not (do_rt_update or do_append)
not do_append
# and not do_rt_update
and liv
# even if we're downsampled bigly
# draw the last datum in the final
# px column to give the user the mx/mn
# range of that set.
):
# always update the last datum-element
# graphic for all flows
flow.draw_last(array_key=curve_name)

# TODO: should the "main" (aka source) flow be special?
if curve_name == chart.data_key:
continue
flow.draw_last(
array_key=curve_name,
only_last_uppx=True,
)

update_fsp_chart(
chart,
flow,
curve_name,
array_key=curve_name,
# volume chart logic..
# TODO: can we unify this with the above loop?
if vlm_chart:
# always update y-label
ds.vlm_sticky.update_from_data(
*array[-1][['index', 'volume']]
)

if (
(
do_rt_update
or do_append
and liv
)
or trigger_all
):
# TODO: make it so this doesn't have to be called
# once the $vlm is up?
vlm_chart.update_graphics_from_flow(
'volume',
# UGGGh, see ``maxmin()`` impl in `._fsp` for
# the overlayed plotitems... we need a better
# bay to invoke a maxmin per overlay..
render=False,
# XXX: ^^^^ THIS IS SUPER IMPORTANT! ^^^^
# without this, since we disable the
# 'volume' (units) chart after the $vlm starts
# up we need to be sure to enable this
# auto-ranging otherwise there will be no handler
# connected to update accompanying overlay
# graphics..
)
profiler('`vlm_chart.update_graphics_from_flow()`')

if (
mx_vlm_in_view != vars['last_mx_vlm']
):
yrange = (0, mx_vlm_in_view * 1.375)
vlm_chart.view._set_yrange(
yrange=yrange,
)
profiler('`vlm_chart.view._set_yrange()`')
# print(f'mx vlm: {last_mx_vlm} -> {mx_vlm_in_view}')
vars['last_mx_vlm'] = mx_vlm_in_view

for curve_name, flow in vlm_chart._flows.items():

if (
curve_name != 'volume' and
flow.render and (
liv and
do_rt_update or do_append
)
):
update_fsp_chart(
vlm_chart,
flow,
curve_name,
array_key=curve_name,
# do_append=uppx < update_uppx,
do_append=do_append,
)
# is this even doing anything?
# (pretty sure it's the real-time
# resizing from last quote?)
fvb = flow.plot.vb
fvb._set_yrange(
name=curve_name,
)

elif (
curve_name != 'volume'
and not do_append
and liv
and uppx >= 1
# even if we're downsampled bigly
# draw the last datum in the final
# px column to give the user the mx/mn
# range of that set.
):
# always update the last datum-element
# graphic for all flows
# print(f'drawing last {flow.name}')
flow.draw_last(array_key=curve_name)


async def display_symbol_data(
godwidget: GodWidget,
Expand Down
Loading

0 comments on commit 7ddebf6

Please sign in to comment.